forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ADC2 and ADC3 channels do not exist on the U4 series USB AVRs.

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent 5d5e359076
commit 857381185d
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

16
LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
Unescape View File

@ -116,11 +116,19 @@
/** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */ /** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
#define ADC_CHANNEL1 0x01 #define ADC_CHANNEL1 0x01
/** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */ #if !(defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))
#define ADC_CHANNEL2 0x02 /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.
*
* \note Note available on all AVR models.
*/
#define ADC_CHANNEL2 0x02
/** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */ /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.
#define ADC_CHANNEL3 0x03 *
* \note Note available on all AVR models.
*/
#define ADC_CHANNEL3 0x03
#endif
/** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */ /** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
#define ADC_CHANNEL4 0x04 #define ADC_CHANNEL4 0x04

20
Projects/AVRISP-MKII/AVRISP.txt
Unescape View File

@ -123,7 +123,7 @@
* <td><b>PDI 6 Pin Layout:</b></td> * <td><b>PDI 6 Pin Layout:</b></td>
* </tr> * </tr>
* <tr> * <tr>
* <td>MISO</td> * <td>MISO <b><sup>2</sup></b></td>
* <td>DATA</td> * <td>DATA</td>
* <td>1</td> * <td>1</td>
* </tr> * </tr>
@ -143,7 +143,7 @@
* <td>4</td> * <td>4</td>
* </tr> * </tr>
* <tr> * <tr>
* <td>PORTx.y <b><sup>2</sup></b></td> * <td>PORTx.y <b><sup>2, 3</sup></b></td>
* <td>CLOCK</td> * <td>CLOCK</td>
* <td>5</td> * <td>5</td>
* </tr> * </tr>
@ -154,9 +154,10 @@
* </tr> * </tr>
* </table> * </table>
* *
* <b><sup>1</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together * <b><sup>1</sup></b> <i>Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only</i> \n
* <b><sup>2</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i> \n * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i> \n
* <b><sup>2</sup></b> <i>See AUX line related tokens in the \ref SSec_Options section</i> * <b><sup>3</sup></b> <i>See AUX line related tokens in the \ref SSec_Options section</i>
* *
* \section Sec_TPI TPI Connections * \section Sec_TPI TPI Connections
* Connections to the device for TPI programming<b><sup>1</sup></b> (when enabled): * Connections to the device for TPI programming<b><sup>1</sup></b> (when enabled):
@ -168,7 +169,7 @@
* <td><b>TPI 6 Pin Layout:</b></td> * <td><b>TPI 6 Pin Layout:</b></td>
* </tr> * </tr>
* <tr> * <tr>
* <td>MISO</td> * <td>MISO <b><sup>2</sup></b></td>
* <td>DATA</td> * <td>DATA</td>
* <td>1</td> * <td>1</td>
* </tr> * </tr>
@ -178,7 +179,7 @@
* <td>2</td> * <td>2</td>
* </tr> * </tr>
* <tr> * <tr>
* <td>SCLK</td> * <td>SCLK <b><sup>2</sup></b></td>
* <td>CLOCK</td> * <td>CLOCK</td>
* <td>3</td> * <td>3</td>
* </tr> * </tr>
@ -188,7 +189,7 @@
* <td>4</td> * <td>4</td>
* </tr> * </tr>
* <tr> * <tr>
* <td>PORTx.y <b><sup>2</sup></b></td> * <td>PORTx.y <b><sup>3</sup></b></td>
* <td>/RESET</td> * <td>/RESET</td>
* <td>5</td> * <td>5</td>
* </tr> * </tr>
@ -199,9 +200,10 @@
* </tr> * </tr>
* </table> * </table>
* *
* <b><sup>1</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together * <b><sup>1</sup></b> <i>Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only</i> \n
* <b><sup>2</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i> \n * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i> \n
* <b><sup>2</sup></b> <i>See AUX line related tokens in the \ref SSec_Options section</i> * <b><sup>3</sup></b> <i>See AUX line related tokens in the \ref SSec_Options section</i>
* *
* \section SSec_Options Project Options * \section SSec_Options Project Options
* *

Write Preview
Loading…
Cancel
Save