pins_arduino.h: Added remaining testpoint-bound pins to arrays, fixed NUM_TOTAL_PINS and added NUM_TOTAL_FREE_PINS

Author: Roy, Elizabeth

variants/uno2018/pins_arduino.h

@@ -27,9 +27,10 @@
 
 #define NUM_DIGITAL_PINS            20
 #define NUM_ANALOG_INPUTS           6
-#define NUM_TESTPOINT_PINS			0	
-//#define NUM_TOTAL_PINS				(NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS + NUM_TESTPOINT_PINS)	
-#define NUM_TOTAL_PINS				41
+#define NUM_TESTPOINT_PINS			9	
+#define NUM_OCCUPIED_PINS			6 // (TOSC1/2, VREF, RESET, DEBUG USART Rx/Tx)
+#define NUM_TOTAL_FREE_PINS			(NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS + NUM_TESTPOINT_PINS)	
+#define NUM_TOTAL_PINS				(NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS + NUM_TESTPOINT_PINS + NUM_OCCUPIED_PINS)
 #define analogInputToDigitalPin(p)  ((p < 6) ? (p) + 14 : NOT_A_PIN)
 
 #define digitalPinHasPWM(p)         ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
@@ -161,8 +162,21 @@ const uint8_t PROGMEM digital_pin_to_interrupt[] = {
 	5, //24 USART0_Tx PA4
 	28, //25 LED_BUILTIN PD6
 	13, //26 USART3_Rx PB5
-	12 //27 USART3_Tx PB4
-};
+	12, //27 USART3_Tx PB4
+	6, // 28 PA6
+	7, // 29 PA7
+	11, // 30 PB3
+	21, // 31 PC7
+	30, // 32 PE0
+	31, // 33 PE1
+	32, // 34 PE2
+	35, // 35 PF2
+	36, // 36 PF3
+	34, // 37 PF0 TOSC 1
+	35, // 38 PF1 TOSC 2
+	29, // 39 PD7 VREF
+	40 // 40 PF6 RESET
+	};
 
 const uint8_t PROGMEM port_interrupt_offset[] = {
 	0, //PA
@@ -201,70 +215,109 @@ const uint8_t PROGMEM digital_pin_to_port[] = {
 	PA, //24 USART0_Tx PA4
 	PD, //25 LED_BUILTIN PD6
 	PB, //26 USART3_Rx PB5
-	PB //27 USART3_Tx PB4
+	PB, //27 USART3_Tx PB4
+	PA,	// 28 PA6
+	PA,	// 29 PA7
+	PB,	// 30 PB3
+	PC,	// 31 PC7
+	PE,	// 32 PE0
+	PE,	// 33 PE1
+	PE,	// 34 PE2
+	PF,	// 35 PF2
+	PF,	// 36 PF3
+	PF,	// 37 PF0 TOSC 1
+	PF,	// 38 PF1 TOSC 2
+	PD,	// 39 PD7 VREF
+	PF	// 40 PF6 RESET
 };
 
 /* Use this for accessing PINnCTRL register */
 const uint8_t PROGMEM digital_pin_to_bit_position[] = {
-	PIN5_bp, //0 USART1_Tx PC5
-	PIN4_bp, //1 USART1_Tx PC4
-	PIN0_bp, //2 PA0
-	PIN5_bp, //3 PF5
-	PIN6_bp, //4 PC6
-	PIN2_bp, //5 PB2
-	PIN4_bp, //6 PF4
-	PIN1_bp, //7 PA1
-	PIN3_bp, //8 PE3
-	PIN0_bp, //9 PB0
-	PIN1_bp, //10 PB1
-	PIN0_bp, //11 PC0
-	PIN1_bp, //12 PC1
-	PIN2_bp, //13 PC2
-	PIN0_bp, //14 AI0 PD0
-	PIN1_bp, //15 AI1 PD1
-	PIN2_bp, //16 AI2 PD2
-	PIN3_bp, //17 AI3 PD3
-	PIN4_bp, //18 AI4 PD4
-	PIN5_bp, //19 AI5 PD5
-	PIN2_bp, //20 TWI_SDA PA2
-	PIN3_bp, //21 TWI_SCL PA3
-	PIN3_bp, //22 SPI SS PC3
-	PIN4_bp, //23 USART0_Rx PA5
-	PIN5_bp, //24 USART0_Tx PA4
-	PIN6_bp, //25 LED_BUILTIN PD6
-	PIN5_bp, //26 USART3_Rx PB5
-	PIN4_bp //27 USART3_Tx PB4
+	PIN5_bp,	//0 USART1_Tx PC5
+	PIN4_bp,	//1 USART1_Tx PC4
+	PIN0_bp,	//2 PA0
+	PIN5_bp,	//3 PF5
+	PIN6_bp,	//4 PC6
+	PIN2_bp,	//5 PB2
+	PIN4_bp,	//6 PF4
+	PIN1_bp,	//7 PA1
+	PIN3_bp,	//8 PE3
+	PIN0_bp,	//9 PB0
+	PIN1_bp,	//10 PB1
+	PIN0_bp,	//11 PC0
+	PIN1_bp,	//12 PC1
+	PIN2_bp,	//13 PC2
+	PIN0_bp,	//14 AI0 PD0
+	PIN1_bp,	//15 AI1 PD1
+	PIN2_bp,	//16 AI2 PD2
+	PIN3_bp,	//17 AI3 PD3
+	PIN4_bp,	//18 AI4 PD4
+	PIN5_bp,	//19 AI5 PD5
+	PIN2_bp,	//20 TWI_SDA PA2
+	PIN3_bp,	//21 TWI_SCL PA3
+	PIN3_bp,	//22 SPI SS PC3
+	PIN4_bp,	//23 USART0_Rx PA5
+	PIN5_bp,	//24 USART0_Tx PA4
+	PIN6_bp,	//25 LED_BUILTIN PD6
+	PIN5_bp,	//26 USART3_Rx PB5
+	PIN4_bp,	//27 USART3_Tx PB4
+	PIN6_bp,	// 28 PA6
+	PIN7_bp,	// 29 PA7
+	PIN3_bp,	// 30 PB3
+	PIN7_bp,	// 31 PC7
+	PIN0_bp,	// 32 PE0
+	PIN1_bp,	// 33 PE1
+	PIN2_bp,	// 34 PE2
+	PIN2_bp,	// 35 PF2
+	PIN3_bp,	// 36 PF3
+	PIN0_bp,	// 37 PF0 TOSC 1
+	PIN1_bp,	// 38 PF1 TOSC 2
+	PIN7_bp,	// 39 PD7 VREF
+	PIN6_bp 	// 40 PF6 RESET
 };
 
 const uint8_t PROGMEM digital_pin_to_timer[] = {
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	TIMERB1,		// TCB1 WO
-	NOT_ON_TIMER,
-	TIMERA0,		// TCA0 WO2
-	TIMERB0,		// TCB0 WO
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	TIMERA0,		// TCA0 WO0
-	TIMERA0,		// TCA0 WO1
-	TIMERB2,		// TCB2 WO2
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER	
+	NOT_ON_TIMER,	//0 USART1_Tx PC5
+	NOT_ON_TIMER,	//1 USART1_Tx PC4
+	NOT_ON_TIMER,	//2 PA0
+	TIMERB1,		//3 PF5	// TCB1 WO
+	NOT_ON_TIMER,	//4 PC6
+	TIMERA0,		//5 PB2	// TCA0 WO2
+	TIMERB0,		//6 PF4	// TCB0 WO
+	NOT_ON_TIMER,	//7 PA1
+	NOT_ON_TIMER,	//8 PE3
+	TIMERA0,		//9 PB0		// TCA0 WO0
+	TIMERA0,		//10 PB1	// TCA0 WO1
+	TIMERB2,		//11 PC0	// TCB2 WO2
+	NOT_ON_TIMER,	//12 PC1
+	NOT_ON_TIMER,	//13 PC2
+	NOT_ON_TIMER,	//14 AI0 PD0
+	NOT_ON_TIMER,	//15 AI1 PD1
+	NOT_ON_TIMER,	//16 AI2 PD2
+	NOT_ON_TIMER,	//17 AI3 PD3
+	NOT_ON_TIMER,	//18 AI4 PD4
+	NOT_ON_TIMER,	//19 AI5 PD5
+	NOT_ON_TIMER,	//20 TWI_SDA PA2
+	NOT_ON_TIMER,	//21 TWI_SCL PA3
+	NOT_ON_TIMER,	//22 SPI SS PC3
+	NOT_ON_TIMER,	//23 USART0_Rx PA5
+	NOT_ON_TIMER,	//24 USART0_Tx PA4
+	NOT_ON_TIMER,	//25 LED_BUILTIN PD6
+	NOT_ON_TIMER,	//26 USART3_Rx PB5
+	NOT_ON_TIMER,	//27 USART3_Tx PB4
+	NOT_ON_TIMER,	// 28 PA6
+	NOT_ON_TIMER,	// 29 PA7
+	NOT_ON_TIMER,	// 30 PB3
+	NOT_ON_TIMER,	// 31 PC7
+	NOT_ON_TIMER,	// 32 PE0
+	NOT_ON_TIMER,	// 33 PE1
+	NOT_ON_TIMER,	// 34 PE2
+	NOT_ON_TIMER,	// 35 PF2
+	NOT_ON_TIMER,	// 36 PF3
+	NOT_ON_TIMER,	// 37 PF0 TOSC 1
+	NOT_ON_TIMER,	// 38 PF1 TOSC 2
+	NOT_ON_TIMER,	// 39 PD7 VREF
+	NOT_ON_TIMER,	// 40 PF6 RESET
 };