diff options
| -rw-r--r-- | src/avr/hard_pwm.c | 3 | ||||
| -rw-r--r-- | src/avr/i2c.c | 4 | ||||
| -rw-r--r-- | src/avr/spi.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/avr/hard_pwm.c b/src/avr/hard_pwm.c index 57f2763f..a6609313 100644 --- a/src/avr/hard_pwm.c +++ b/src/avr/hard_pwm.c @@ -40,7 +40,8 @@ static const struct gpio_pwm_info pwm_regs[] PROGMEM = { { GPIO('B', 6), &OCR3A, &TCCR3A, &TCCR3B, 1<<COM3A1, 0 }, { GPIO('B', 7), &OCR3B, &TCCR3A, &TCCR3B, 1<<COM3B1, 0 }, # endif -#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 || CONFIG_MACH_atmega32u4 +#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 \ + || CONFIG_MACH_atmega32u4 { GPIO('B', 7), &OCR0A, &TCCR0A, &TCCR0B, 1<<COM0A1, GP_8BIT }, { GPIO('D', 0), &OCR0B, &TCCR0A, &TCCR0B, 1<<COM0B1, GP_8BIT }, { GPIO('B', 5), &OCR1A, &TCCR1A, &TCCR1B, 1<<COM1A1, 0 }, diff --git a/src/avr/i2c.c b/src/avr/i2c.c index d068a2fa..9aada47d 100644 --- a/src/avr/i2c.c +++ b/src/avr/i2c.c @@ -16,7 +16,9 @@ static const uint8_t SCL = GPIO('C', 5), SDA = GPIO('C', 4); #elif CONFIG_MACH_atmega644p || CONFIG_MACH_atmega1284p static const uint8_t SCL = GPIO('C', 0), SDA = GPIO('C', 1); -#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 || CONFIG_MACH_atmega32u4 || CONFIG_MACH_atmega1280 || CONFIG_MACH_atmega2560 +#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 \ + || CONFIG_MACH_atmega32u4 || CONFIG_MACH_atmega1280 \ + || CONFIG_MACH_atmega2560 static const uint8_t SCL = GPIO('D', 0), SDA = GPIO('D', 1); #endif diff --git a/src/avr/spi.c b/src/avr/spi.c index 1216ad1b..495e8330 100644 --- a/src/avr/spi.c +++ b/src/avr/spi.c @@ -17,7 +17,9 @@ static const uint8_t MOSI = GPIO('B', 3), MISO = GPIO('B', 4); #elif CONFIG_MACH_atmega644p || CONFIG_MACH_atmega1284p static const uint8_t SS = GPIO('B', 4), SCK = GPIO('B', 7); static const uint8_t MOSI = GPIO('B', 5), MISO = GPIO('B', 6); -#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 || CONFIG_MACH_atmega32u4 || CONFIG_MACH_atmega1280 || CONFIG_MACH_atmega2560 +#elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 \ + || CONFIG_MACH_atmega32u4 || CONFIG_MACH_atmega1280 \ + || CONFIG_MACH_atmega2560 static const uint8_t SS = GPIO('B', 0), SCK = GPIO('B', 1); static const uint8_t MOSI = GPIO('B', 2), MISO = GPIO('B', 3); #endif |