Skip to content

Commit

Permalink
Move pin macros
Browse files Browse the repository at this point in the history 
Was not accessable when placed inside ARDUINO_MAIN
  • Loading branch information
@MCUdude
MCUdude committed Apr 17, 2020
1 parent 7714ac9 commit 7e1a09f
Show file tree
Hide file tree
Showing 5 changed files with 179 additions and 180 deletions.
50 changes: 25 additions & 25 deletions megaavr/variants/28pin-standard/pins_arduino.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,31 @@ static const uint8_t A5 = PIN_A5;
static const uint8_t A6 = PIN_A6;
static const uint8_t A7 = PIN_A7;

#define PINS_COUNT (27u)
#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PC0 8
#define PIN_PC1 9
#define PIN_PC2 10
#define PIN_PC3 11
#define PIN_PD0 12
#define PIN_PD1 13
#define PIN_PD2 14
#define PIN_PD3 15
#define PIN_PD4 16
#define PIN_PD5 17
#define PIN_PD6 18
#define PIN_PD7 19
#define PIN_PF0 20
#define PIN_PF1 21
#define PIN_PF6 22

#define PINS_COUNT (23u)

#ifdef ARDUINO_MAIN

Expand Down Expand Up @@ -220,30 +244,6 @@ const uint8_t digital_pin_to_bit_mask[] = {
PIN6_bm // 22 PF6 RESET
};

#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PC0 8
#define PIN_PC1 9
#define PIN_PC2 10
#define PIN_PC3 11
#define PIN_PD0 12
#define PIN_PD1 13
#define PIN_PD2 14
#define PIN_PD3 15
#define PIN_PD4 16
#define PIN_PD5 17
#define PIN_PD6 18
#define PIN_PD7 19
#define PIN_PF0 20
#define PIN_PF1 21
#define PIN_PF6 22

const uint8_t digital_pin_to_timer[] = {
NOT_ON_TIMER, // 0 PA0/USART0_Tx/CLKIN
NOT_ON_TIMER, // 1 PA1/USART0_Rx
Expand Down
56 changes: 28 additions & 28 deletions megaavr/variants/32pin-standard/pins_arduino.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,34 @@ static const uint8_t A13 = PIN_A13;
static const uint8_t A14 = PIN_A14;
static const uint8_t A15 = PIN_A15;

#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PC0 8
#define PIN_PC1 9
#define PIN_PC2 10
#define PIN_PC3 11
#define PIN_PD0 12
#define PIN_PD1 13
#define PIN_PD2 14
#define PIN_PD3 15
#define PIN_PD4 16
#define PIN_PD5 17
#define PIN_PD6 18
#define PIN_PD7 19
#define PIN_PF0 20
#define PIN_PF1 21
#define PIN_PF2 22
#define PIN_PF3 23
#define PIN_PF4 24
#define PIN_PF5 25
#define PIN_PF6 26

#define PINS_COUNT (27u)

#ifdef ARDUINO_MAIN
Expand Down Expand Up @@ -247,34 +275,6 @@ const uint8_t digital_pin_to_bit_mask[] = {
PIN6_bm // 26 PF6 RESET
};

#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PC0 8
#define PIN_PC1 9
#define PIN_PC2 10
#define PIN_PC3 11
#define PIN_PD0 12
#define PIN_PD1 13
#define PIN_PD2 14
#define PIN_PD3 15
#define PIN_PD4 16
#define PIN_PD5 17
#define PIN_PD6 18
#define PIN_PD7 19
#define PIN_PF0 20
#define PIN_PF1 21
#define PIN_PF2 22
#define PIN_PF3 23
#define PIN_PF4 24
#define PIN_PF5 25
#define PIN_PF6 26

const uint8_t digital_pin_to_timer[] = {
NOT_ON_TIMER, // 0 PA0/USART0_Tx/CLKIN
NOT_ON_TIMER, // 1 PA1/USART0_Rx
Expand Down
84 changes: 42 additions & 42 deletions megaavr/variants/48pin-standard/pins_arduino.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,48 @@ static const uint8_t A13 = PIN_A13;
static const uint8_t A14 = PIN_A14;
static const uint8_t A15 = PIN_A15;

#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PB0 8
#define PIN_PB1 9
#define PIN_PB2 10
#define PIN_PB3 11
#define PIN_PB4 12
#define PIN_PB5 13
#define PIN_PC0 14
#define PIN_PC1 15
#define PIN_PC2 16
#define PIN_PC3 17
#define PIN_PC4 18
#define PIN_PC5 19
#define PIN_PC6 20
#define PIN_PC7 21
#define PIN_PD0 22
#define PIN_PD1 23
#define PIN_PD2 24
#define PIN_PD3 25
#define PIN_PD4 26
#define PIN_PD5 27
#define PIN_PD6 28
#define PIN_PD7 29
#define PIN_PE0 30
#define PIN_PE1 31
#define PIN_PE2 32
#define PIN_PE3 33
#define PIN_PF0 34
#define PIN_PF1 35
#define PIN_PF2 36
#define PIN_PF3 37
#define PIN_PF4 38
#define PIN_PF5 39
#define PIN_PF6 40

#define PINS_COUNT (41u)


Expand Down Expand Up @@ -321,48 +363,6 @@ const uint8_t digital_pin_to_bit_mask[] = {
PIN6_bm // 40 PF6 RESET
};

#define PIN_PA0 0
#define PIN_PA1 1
#define PIN_PA2 2
#define PIN_PA3 3
#define PIN_PA4 4
#define PIN_PA5 5
#define PIN_PA6 6
#define PIN_PA7 7
#define PIN_PB0 8
#define PIN_PB1 9
#define PIN_PB2 10
#define PIN_PB3 11
#define PIN_PB4 12
#define PIN_PB5 13
#define PIN_PC0 14
#define PIN_PC1 15
#define PIN_PC2 16
#define PIN_PC3 17
#define PIN_PC4 18
#define PIN_PC5 19
#define PIN_PC6 20
#define PIN_PC7 21
#define PIN_PD0 22
#define PIN_PD1 23
#define PIN_PD2 24
#define PIN_PD3 25
#define PIN_PD4 26
#define PIN_PD5 27
#define PIN_PD6 28
#define PIN_PD7 29
#define PIN_PE0 30
#define PIN_PE1 31
#define PIN_PE2 32
#define PIN_PE3 33
#define PIN_PF0 34
#define PIN_PF1 35
#define PIN_PF2 36
#define PIN_PF3 37
#define PIN_PF4 38
#define PIN_PF5 39
#define PIN_PF6 40

const uint8_t digital_pin_to_timer[] = {
NOT_ON_TIMER, // 0 PA0/USART0_Tx/CLKIN
NOT_ON_TIMER, // 1 PA1/USART0_Rx
Expand Down
84 changes: 42 additions & 42 deletions megaavr/variants/nano-every/pins_arduino.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,48 @@ static const uint8_t A13 = PIN_A13;
static const uint8_t A14 = PIN_A14;
static const uint8_t A15 = PIN_A15;

#define PIN_PC5 0
#define PIN_PC4 1
#define PIN_PA0 2
#define PIN_PF5 3
#define PIN_PC6 4
#define PIN_PB2 5
#define PIN_PF4 6
#define PIN_PA1 7
#define PIN_PE3 8
#define PIN_PB0 9
#define PIN_PB1 10
#define PIN_PE0 11
#define PIN_PE1 12
#define PIN_PE2 13
#define PIN_PD3 14
#define PIN_PD2 15
#define PIN_PD1 16
#define PIN_PD0 17
#define PIN_PF2 18
#define PIN_PF3 19
#define PIN_PD4 20
#define PIN_PD5 21
#define PIN_PA2 22
#define PIN_PA3 23
#define PIN_PB5 24
#define PIN_PB4 25
#define PIN_PC3 26
#define PIN_PA5 27
#define PIN_PA4 28
#define PIN_PD6 29
#define PIN_PA6 30
#define PIN_PA7 31
#define PIN_PB3 32
#define PIN_PC7 33
#define PIN_PC0 34
#define PIN_PC1 35
#define PIN_PC2 36
#define PIN_PF0 37
#define PIN_PF1 38
#define PIN_PD7 39
#define PIN_PF6 40

#define PINS_COUNT (41u)

#ifdef ARDUINO_MAIN
Expand Down Expand Up @@ -293,48 +335,6 @@ const uint8_t digital_pin_to_bit_mask[] = {
PIN6_bm, // 40 PF6/RESET
};

#define PIN_PC5 0
#define PIN_PC4 1
#define PIN_PA0 2
#define PIN_PF5 3
#define PIN_PC6 4
#define PIN_PB2 5
#define PIN_PF4 6
#define PIN_PA1 7
#define PIN_PE3 8
#define PIN_PB0 9
#define PIN_PB1 10
#define PIN_PE0 11
#define PIN_PE1 12
#define PIN_PE2 13
#define PIN_PD3 14
#define PIN_PD2 15
#define PIN_PD1 16
#define PIN_PD0 17
#define PIN_PF2 18
#define PIN_PF3 19
#define PIN_PD4 20
#define PIN_PD5 21
#define PIN_PA2 22
#define PIN_PA3 23
#define PIN_PB5 24
#define PIN_PB4 25
#define PIN_PC3 26
#define PIN_PA5 27
#define PIN_PA4 28
#define PIN_PD6 29
#define PIN_PA6 30
#define PIN_PA7 31
#define PIN_PB3 32
#define PIN_PC7 33
#define PIN_PC0 34
#define PIN_PC1 35
#define PIN_PC2 36
#define PIN_PF0 37
#define PIN_PF1 38
#define PIN_PD7 39
#define PIN_PF6 40

const uint8_t digital_pin_to_timer[] = {
NOT_ON_TIMER, // 0 PC5/USART1_Rx_alt
NOT_ON_TIMER, // 1 PC4/USART1_Tx_alt
Expand Down
Loading

0 comments on commit 7e1a09f

Please sign in to comment.