From cf3c7cd99afccdb20b7b015a3e8b80555d4986ad Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 24 Sep 2019 09:52:28 -0400 Subject: [PATCH] avr: Rename the analog-only PE0/PE1 pins on atmega168/328 to PE2/PE3 The atmega328pb has officially named these pins as PE2 and PE3, so use that naming scheme instead of the previous Klipper invented names. Signed-off-by: Kevin O'Connor --- config/sample-aliases.cfg | 2 +- docs/Config_Changes.md | 3 +++ klippy/pins.py | 2 +- src/avr/adc.c | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/sample-aliases.cfg b/config/sample-aliases.cfg index 6545e8a3..4af79d42 100644 --- a/config/sample-aliases.cfg +++ b/config/sample-aliases.cfg @@ -11,7 +11,7 @@ aliases: ar10=PB2, ar11=PB3, ar12=PB4, ar13=PB5, ar14=PC0, ar15=PC1, ar16=PC2, ar17=PC3, ar18=PC4, ar19=PC5, analog0=PC0, analog1=PC1, analog2=PC2, analog3=PC3, analog4=PC4, - analog5=PC5, analog6=PE0, analog7=PE1 + analog5=PC5, analog6=PE2, analog7=PE3 # Arduino aliases for atmega2560/1280 (Arduino mega) boards [board_pins arduino-mega] diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md index 9aa9cbf5..e4a74c6c 100644 --- a/docs/Config_Changes.md +++ b/docs/Config_Changes.md @@ -8,6 +8,9 @@ All dates in this document are approximate. ## Changes +20210814: The analog only pseudo-pins on the atmega168 and atmega328 +have been renamed from PE0/PE1 to PE2/PE3. + 20210720: A controller_fan section now monitors all stepper motors by default (not just the kinematic stepper motors). If the previous behavior is desired, see the `stepper` config option in the diff --git a/klippy/pins.py b/klippy/pins.py index a160c78b..2ac9856c 100644 --- a/klippy/pins.py +++ b/klippy/pins.py @@ -18,7 +18,7 @@ Arduino_standard = [ "PB2", "PB3", "PB4", "PB5", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", ] Arduino_analog_standard = [ - "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PE0", "PE1", + "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PE2", "PE3", ] Arduino_mega = [ diff --git a/src/avr/adc.c b/src/avr/adc.c index 111c006d..25b979e0 100644 --- a/src/avr/adc.c +++ b/src/avr/adc.c @@ -14,7 +14,7 @@ static const uint8_t adc_pins[] PROGMEM = { #if CONFIG_MACH_atmega168 || CONFIG_MACH_atmega328 || CONFIG_MACH_atmega328p GPIO('C', 0), GPIO('C', 1), GPIO('C', 2), GPIO('C', 3), - GPIO('C', 4), GPIO('C', 5), GPIO('E', 0), GPIO('E', 1), + GPIO('C', 4), GPIO('C', 5), GPIO('E', 2), GPIO('E', 3), #elif CONFIG_MACH_atmega644p || CONFIG_MACH_atmega1284p GPIO('A', 0), GPIO('A', 1), GPIO('A', 2), GPIO('A', 3), GPIO('A', 4), GPIO('A', 5), GPIO('A', 6), GPIO('A', 7), @@ -35,7 +35,7 @@ static const uint8_t adc_pins[] PROGMEM = { // The atmega168/328 have two analog only pins #if CONFIG_MACH_atmega168 || CONFIG_MACH_atmega328 || CONFIG_MACH_atmega328p -DECL_ENUMERATION_RANGE("pin", "PE0", GPIO('E', 0), 2); +DECL_ENUMERATION_RANGE("pin", "PE2", GPIO('E', 2), 2); #endif enum { ADMUX_DEFAULT = 0x40 };