diff options
| author | Selene ToyKeeper | 2020-10-14 21:49:42 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2020-10-14 21:49:42 -0600 |
| commit | 176144c74eb41b09c508ad338a16217a019165bc (patch) | |
| tree | d1d886f3167a644e400e05d88f4d09631a2727ef | |
| parent | copied KR4 hwdef to K9.3 (diff) | |
| download | anduril-176144c74eb41b09c508ad338a16217a019165bc.tar.gz anduril-176144c74eb41b09c508ad338a16217a019165bc.tar.bz2 anduril-176144c74eb41b09c508ad338a16217a019165bc.zip | |
renamed LED_ENABLE2_* to LED2_ENABLE_*
| -rw-r--r-- | hwdef-Noctigon_K1-12V.h | 6 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-eeprom.c | 8 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-ramping.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/hwdef-Noctigon_K1-12V.h b/hwdef-Noctigon_K1-12V.h index 8781d8e..b17aad0 100644 --- a/hwdef-Noctigon_K1-12V.h +++ b/hwdef-Noctigon_K1-12V.h @@ -56,8 +56,8 @@ #define LED_ENABLE_PIN PB0 // pin 19, Opamp power #define LED_ENABLE_PORT PORTB // control port for PB0 -#define LED_ENABLE2_PIN PC0 // pin 15, boost PMIC enable -#define LED_ENABLE2_PORT PORTC // control port for PC0 +#define LED2_ENABLE_PIN PC0 // pin 15, boost PMIC enable +#define LED2_ENABLE_PORT PORTC // control port for PC0 #define USE_VOLTAGE_DIVIDER // use a dedicated pin, not VCC, because VCC input is flattened @@ -103,7 +103,7 @@ inline void hwdef_setup() { // enable output ports // boost PMIC on/off - DDRC = (1 << LED_ENABLE2_PIN); + DDRC = (1 << LED2_ENABLE_PIN); // Opamp level and Opamp on/off DDRB = (1 << PWM1_PIN) | (1 << LED_ENABLE_PIN); diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c index 0de7e05..4c734a2 100644 --- a/spaghetti-monster/fsm-eeprom.c +++ b/spaghetti-monster/fsm-eeprom.c @@ -30,7 +30,7 @@ uint8_t eeprom[EEPROM_BYTES]; #endif uint8_t load_eeprom() { - #ifdef LED_ENABLE_PIN + #if defined(LED_ENABLE_PIN) || defined(LED2_ENABLE_PIN) delay_4ms(2); // wait for power to stabilize #endif @@ -48,7 +48,7 @@ uint8_t load_eeprom() { } void save_eeprom() { - #ifdef LED_ENABLE_PIN + #if defined(LED_ENABLE_PIN) || defined(LED2_ENABLE_PIN) delay_4ms(2); // wait for power to stabilize #endif @@ -70,7 +70,7 @@ uint8_t eeprom_wl[EEPROM_WL_BYTES]; uint8_t * eep_wl_prev_offset; uint8_t load_eeprom_wl() { - #ifdef LED_ENABLE_PIN + #if defined(LED_ENABLE_PIN) || defined(LED2_ENABLE_PIN) delay_4ms(2); // wait for power to stabilize #endif @@ -99,7 +99,7 @@ uint8_t load_eeprom_wl() { } void save_eeprom_wl() { - #ifdef LED_ENABLE_PIN + #if defined(LED_ENABLE_PIN) || defined(LED2_ENABLE_PIN) delay_4ms(2); // wait for power to stabilize #endif diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c index 6c6d0cb..5ea4a47 100644 --- a/spaghetti-monster/fsm-ramping.c +++ b/spaghetti-monster/fsm-ramping.c @@ -72,8 +72,8 @@ void set_level(uint8_t level) { #ifdef LED_ENABLE_PIN LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN); #endif - #ifdef LED_ENABLE2_PIN - LED_ENABLE2_PORT &= ~(1 << LED_ENABLE2_PIN); + #ifdef LED2_ENABLE_PIN + LED2_ENABLE_PORT &= ~(1 << LED2_ENABLE_PIN); #endif } else { level --; @@ -82,8 +82,8 @@ void set_level(uint8_t level) { #ifdef LED_ENABLE_PIN LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN); #endif - #ifdef LED_ENABLE2_PIN - LED_ENABLE2_PORT |= (1 << LED_ENABLE2_PIN); + #ifdef LED2_ENABLE_PIN + LED2_ENABLE_PORT |= (1 << LED2_ENABLE_PIN); #endif #ifdef USE_TINT_RAMPING |