diff options
Diffstat (limited to '')
| -rw-r--r-- | ui/anduril/anduril.c | 92 | ||||
| -rw-r--r-- | ui/anduril/aux-leds.c | 2 | ||||
| -rw-r--r-- | ui/anduril/battcheck-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/beacon-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/candle-mode.c | 4 | ||||
| -rw-r--r-- | ui/anduril/channel-modes.c | 2 | ||||
| -rw-r--r-- | ui/anduril/config-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/factory-reset.c | 2 | ||||
| -rw-r--r-- | ui/anduril/ff-strobe-modes.c | 2 | ||||
| -rw-r--r-- | ui/anduril/load-save-config.c | 4 | ||||
| -rw-r--r-- | ui/anduril/lockout-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/misc.c | 2 | ||||
| -rw-r--r-- | ui/anduril/momentary-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/off-mode.c | 4 | ||||
| -rw-r--r-- | ui/anduril/ramp-mode.c | 6 | ||||
| -rw-r--r-- | ui/anduril/smooth-steps.c | 2 | ||||
| -rw-r--r-- | ui/anduril/sos-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/strobe-modes.c | 6 | ||||
| -rw-r--r-- | ui/anduril/strobe-modes.h | 4 | ||||
| -rw-r--r-- | ui/anduril/sunset-timer.c | 2 | ||||
| -rw-r--r-- | ui/anduril/tactical-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/tempcheck-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/tint-ramping.c | 2 | ||||
| -rw-r--r-- | ui/anduril/version-check-mode.c | 2 | ||||
| -rw-r--r-- | ui/anduril/version-check-mode.h | 2 |
25 files changed, 78 insertions, 78 deletions
diff --git a/ui/anduril/anduril.c b/ui/anduril/anduril.c index e46eeaf..92b878c 100644 --- a/ui/anduril/anduril.c +++ b/ui/anduril/anduril.c @@ -35,7 +35,7 @@ */ /********* User-configurable options *********/ -#include "config-default.h" +#include "anduril/config-default.h" /********* specific settings for known driver types *********/ // Anduril config file name (set it here or define it at the gcc command line) @@ -48,33 +48,33 @@ /********* Include headers which need to be before FSM *********/ // enable FSM features needed by basic ramping functions -#include "ramp-mode-fsm.h" +#include "anduril/ramp-mode-fsm.h" #ifdef USE_FACTORY_RESET -#include "factory-reset-fsm.h" +#include "anduril/factory-reset-fsm.h" #endif #ifdef USE_BATTCHECK_MODE -#include "battcheck-mode-fsm.h" +#include "anduril/battcheck-mode-fsm.h" #endif #ifdef USE_LOCKOUT_MODE -#include "lockout-mode-fsm.h" +#include "anduril/lockout-mode-fsm.h" #endif // enable FSM features needed by strobe modes -#include "strobe-modes-fsm.h" +#include "anduril/strobe-modes-fsm.h" // figure out how many bytes of eeprom are needed, // based on which UI features are enabled // (include this one last) -#include "load-save-config-fsm.h" +#include "anduril/load-save-config-fsm.h" /********* bring in FSM / SpaghettiMonster *********/ #define USE_IDLE_MODE // reduce power use while awake and no tasks are pending -#include "spaghetti-monster.h" +#include "fsm/spaghetti-monster.h" /********* does this build target have special code to include? *********/ #ifdef HWDEF_C_FILE @@ -87,130 +87,130 @@ /********* Include all the regular app headers *********/ -#include "off-mode.h" -#include "ramp-mode.h" -#include "config-mode.h" -#include "aux-leds.h" -#include "misc.h" +#include "anduril/off-mode.h" +#include "anduril/ramp-mode.h" +#include "anduril/config-mode.h" +#include "anduril/aux-leds.h" +#include "anduril/misc.h" #ifdef USE_SUNSET_TIMER -#include "sunset-timer.h" +#include "anduril/sunset-timer.h" #endif #ifdef USE_VERSION_CHECK -#include "version-check-mode.h" +#include "anduril/version-check-mode.h" #endif #ifdef USE_BATTCHECK_MODE -#include "battcheck-mode.h" +#include "anduril/battcheck-mode.h" #endif #ifdef USE_BEACON_MODE -#include "beacon-mode.h" +#include "anduril/beacon-mode.h" #endif #ifdef USE_THERMAL_REGULATION -#include "tempcheck-mode.h" +#include "anduril/tempcheck-mode.h" #endif #ifdef USE_LOCKOUT_MODE -#include "lockout-mode.h" +#include "anduril/lockout-mode.h" #endif #ifdef USE_MOMENTARY_MODE -#include "momentary-mode.h" +#include "anduril/momentary-mode.h" #endif #ifdef USE_TACTICAL_MODE -#include "tactical-mode.h" +#include "anduril/tactical-mode.h" #endif // allow the channel mode handler even when only 1 mode // (so a tint ramp light could still use 3H even if there's no other mode) #if defined(USE_CHANNEL_MODES) -#include "channel-modes.h" +#include "anduril/channel-modes.h" #endif #ifdef USE_FACTORY_RESET -#include "factory-reset.h" +#include "anduril/factory-reset.h" #endif // this one detects its own enable/disable settings -#include "strobe-modes.h" +#include "anduril/strobe-modes.h" #ifdef USE_SOS_MODE -#include "sos-mode.h" +#include "anduril/sos-mode.h" #endif #ifdef USE_SMOOTH_STEPS -#include "smooth-steps.h" +#include "anduril/smooth-steps.h" #endif // this should be last, so other headers have a chance to declare values -#include "load-save-config.h" +#include "anduril/load-save-config.h" /********* Include all the app logic source files *********/ // (is a bit weird to do things this way, // but it saves a lot of space by letting us use the -fwhole-program flag) -#include "off-mode.c" -#include "ramp-mode.c" -#include "load-save-config.c" -#include "config-mode.c" -#include "aux-leds.c" -#include "misc.c" +#include "anduril/off-mode.c" +#include "anduril/ramp-mode.c" +#include "anduril/load-save-config.c" +#include "anduril/config-mode.c" +#include "anduril/aux-leds.c" +#include "anduril/misc.c" #ifdef USE_SUNSET_TIMER -#include "sunset-timer.c" +#include "anduril/sunset-timer.c" #endif #ifdef USE_VERSION_CHECK -#include "version-check-mode.c" +#include "anduril/version-check-mode.c" #endif #ifdef USE_BATTCHECK_MODE -#include "battcheck-mode.c" +#include "anduril/battcheck-mode.c" #endif #ifdef USE_BEACON_MODE -#include "beacon-mode.c" +#include "anduril/beacon-mode.c" #endif #ifdef USE_THERMAL_REGULATION -#include "tempcheck-mode.c" +#include "anduril/tempcheck-mode.c" #endif #ifdef USE_LOCKOUT_MODE -#include "lockout-mode.c" +#include "anduril/lockout-mode.c" #endif #ifdef USE_MOMENTARY_MODE -#include "momentary-mode.c" +#include "anduril/momentary-mode.c" #endif #ifdef USE_TACTICAL_MODE -#include "tactical-mode.c" +#include "anduril/tactical-mode.c" #endif #if defined(USE_CHANNEL_MODES) -#include "channel-modes.c" +#include "anduril/channel-modes.c" #endif #ifdef USE_FACTORY_RESET -#include "factory-reset.c" +#include "anduril/factory-reset.c" #endif #ifdef USE_STROBE_STATE -#include "strobe-modes.c" +#include "anduril/strobe-modes.c" #endif #ifdef USE_SOS_MODE -#include "sos-mode.c" +#include "anduril/sos-mode.c" #endif #ifdef USE_SMOOTH_STEPS -#include "smooth-steps.c" +#include "anduril/smooth-steps.c" #endif diff --git a/ui/anduril/aux-leds.c b/ui/anduril/aux-leds.c index af59aa6..1b30d34 100644 --- a/ui/anduril/aux-leds.c +++ b/ui/anduril/aux-leds.c @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "aux-leds.h" +#include "anduril/aux-leds.h" #if defined(USE_INDICATOR_LED) diff --git a/ui/anduril/battcheck-mode.c b/ui/anduril/battcheck-mode.c index 462540e..c7c80dd 100644 --- a/ui/anduril/battcheck-mode.c +++ b/ui/anduril/battcheck-mode.c @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "battcheck-mode.h" +#include "anduril/battcheck-mode.h" uint8_t battcheck_state(Event event, uint16_t arg) { ////////// Every action below here is blocked in the simple UI ////////// diff --git a/ui/anduril/beacon-mode.c b/ui/anduril/beacon-mode.c index 5aff508..b42272c 100644 --- a/ui/anduril/beacon-mode.c +++ b/ui/anduril/beacon-mode.c @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "beacon-mode.h" +#include "anduril/beacon-mode.h" inline void beacon_mode_iter() { // one iteration of main loop() diff --git a/ui/anduril/candle-mode.c b/ui/anduril/candle-mode.c index ab47c34..39ec6f2 100644 --- a/ui/anduril/candle-mode.c +++ b/ui/anduril/candle-mode.c @@ -3,10 +3,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "candle-mode.h" +#include "anduril/candle-mode.h" #ifdef USE_SUNSET_TIMER -#include "sunset-timer.h" +#include "anduril/sunset-timer.h" #endif uint8_t candle_mode_state(Event event, uint16_t arg) { diff --git a/ui/anduril/channel-modes.c b/ui/anduril/channel-modes.c index b2fc8d1..ccac58c 100644 --- a/ui/anduril/channel-modes.c +++ b/ui/anduril/channel-modes.c @@ -4,7 +4,7 @@ #pragma once -#include "channel-modes.h" +#include "anduril/channel-modes.h" uint8_t channel_mode_state(Event event, uint16_t arg) { #ifdef USE_CHANNEL_MODE_ARGS diff --git a/ui/anduril/config-mode.c b/ui/anduril/config-mode.c index 71b0d69..bdee4f6 100644 --- a/ui/anduril/config-mode.c +++ b/ui/anduril/config-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "config-mode.h" +#include "anduril/config-mode.h" // general helper function for config modes uint8_t number_entry_state(Event event, uint16_t arg); diff --git a/ui/anduril/factory-reset.c b/ui/anduril/factory-reset.c index f9fb472..a315c5b 100644 --- a/ui/anduril/factory-reset.c +++ b/ui/anduril/factory-reset.c @@ -4,7 +4,7 @@ #pragma once -#include "factory-reset.h" +#include "anduril/factory-reset.h" // allows setting channel mode per animation stage, // so it can ramp up in red then explode in white (as one example) diff --git a/ui/anduril/ff-strobe-modes.c b/ui/anduril/ff-strobe-modes.c index b7a7303..97bcc87 100644 --- a/ui/anduril/ff-strobe-modes.c +++ b/ui/anduril/ff-strobe-modes.c @@ -4,7 +4,7 @@ #pragma once -#include "ff-strobe-modes.h" +#include "anduril/ff-strobe-modes.h" uint8_t boring_strobe_state(Event event, uint16_t arg) { // police strobe and SOS, meh diff --git a/ui/anduril/load-save-config.c b/ui/anduril/load-save-config.c index aa772e1..41e972c 100644 --- a/ui/anduril/load-save-config.c +++ b/ui/anduril/load-save-config.c @@ -4,8 +4,8 @@ #pragma once -#include "load-save-config-fsm.h" -#include "load-save-config.h" +#include "anduril/load-save-config-fsm.h" +#include "anduril/load-save-config.h" void load_config() { eeprom = (uint8_t *)&cfg; diff --git a/ui/anduril/lockout-mode.c b/ui/anduril/lockout-mode.c index 422d081..0e7b673 100644 --- a/ui/anduril/lockout-mode.c +++ b/ui/anduril/lockout-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "lockout-mode.h" +#include "anduril/lockout-mode.h" uint8_t lockout_state(Event event, uint16_t arg) { #ifdef USE_MOON_DURING_LOCKOUT_MODE diff --git a/ui/anduril/misc.c b/ui/anduril/misc.c index 1b92d6f..3715f34 100644 --- a/ui/anduril/misc.c +++ b/ui/anduril/misc.c @@ -4,7 +4,7 @@ #pragma once -#include "misc.h" +#include "anduril/misc.h" /* no longer used void blink_confirm(uint8_t num) { diff --git a/ui/anduril/momentary-mode.c b/ui/anduril/momentary-mode.c index a765142..94f6bc2 100644 --- a/ui/anduril/momentary-mode.c +++ b/ui/anduril/momentary-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "momentary-mode.h" +#include "anduril/momentary-mode.h" uint8_t momentary_state(Event event, uint16_t arg) { // init strobe mode, if relevant diff --git a/ui/anduril/off-mode.c b/ui/anduril/off-mode.c index 0a381b7..97c546e 100644 --- a/ui/anduril/off-mode.c +++ b/ui/anduril/off-mode.c @@ -4,10 +4,10 @@ #pragma once -#include "off-mode.h" +#include "anduril/off-mode.h" #ifdef USE_SUNSET_TIMER -#include "sunset-timer.h" +#include "anduril/sunset-timer.h" #endif // set level smooth maybe diff --git a/ui/anduril/ramp-mode.c b/ui/anduril/ramp-mode.c index 4611b4f..aff7be7 100644 --- a/ui/anduril/ramp-mode.c +++ b/ui/anduril/ramp-mode.c @@ -4,14 +4,14 @@ #pragma once -#include "ramp-mode.h" +#include "anduril/ramp-mode.h" #ifdef USE_SUNSET_TIMER -#include "sunset-timer.h" +#include "anduril/sunset-timer.h" #endif #ifdef USE_SMOOTH_STEPS -#include "smooth-steps.h" +#include "anduril/smooth-steps.h" #endif diff --git a/ui/anduril/smooth-steps.c b/ui/anduril/smooth-steps.c index 9631e41..9924a4e 100644 --- a/ui/anduril/smooth-steps.c +++ b/ui/anduril/smooth-steps.c @@ -4,7 +4,7 @@ #pragma once -#include "smooth-steps.h" +#include "anduril/smooth-steps.h" #ifdef USE_SMOOTH_STEPS diff --git a/ui/anduril/sos-mode.c b/ui/anduril/sos-mode.c index 2a4e97c..45a6fc0 100644 --- a/ui/anduril/sos-mode.c +++ b/ui/anduril/sos-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "sos-mode.h" +#include "anduril/sos-mode.h" #ifdef USE_SOS_MODE_IN_BLINKY_GROUP uint8_t sos_state(Event event, uint16_t arg) { diff --git a/ui/anduril/strobe-modes.c b/ui/anduril/strobe-modes.c index ad17964..ccc4aa0 100644 --- a/ui/anduril/strobe-modes.c +++ b/ui/anduril/strobe-modes.c @@ -4,7 +4,7 @@ #pragma once -#include "strobe-modes.h" +#include "anduril/strobe-modes.h" #ifdef USE_STROBE_STATE uint8_t strobe_state(Event event, uint16_t arg) { @@ -322,11 +322,11 @@ inline void bike_flasher_iter() { #endif #ifdef USE_CANDLE_MODE -#include "candle-mode.c" +#include "anduril/candle-mode.c" #endif #ifdef USE_BORING_STROBE_STATE -#include "ff-strobe-modes.c" +#include "anduril/ff-strobe-modes.c" #endif diff --git a/ui/anduril/strobe-modes.h b/ui/anduril/strobe-modes.h index 7dc1df4..058cea5 100644 --- a/ui/anduril/strobe-modes.h +++ b/ui/anduril/strobe-modes.h @@ -60,12 +60,12 @@ inline void bike_flasher_iter(); #endif #ifdef USE_CANDLE_MODE -#include "candle-mode.h" +#include "anduril/candle-mode.h" #endif #if defined(USE_POLICE_STROBE_MODE) || defined(USE_SOS_MODE_IN_FF_GROUP) #define USE_BORING_STROBE_STATE -#include "ff-strobe-modes.h" +#include "anduril/ff-strobe-modes.h" #endif diff --git a/ui/anduril/sunset-timer.c b/ui/anduril/sunset-timer.c index e4fc512..1c3b194 100644 --- a/ui/anduril/sunset-timer.c +++ b/ui/anduril/sunset-timer.c @@ -4,7 +4,7 @@ #pragma once -#include "sunset-timer.h" +#include "anduril/sunset-timer.h" uint8_t sunset_timer_state(Event event, uint16_t arg) { diff --git a/ui/anduril/tactical-mode.c b/ui/anduril/tactical-mode.c index 0035496..5acd902 100644 --- a/ui/anduril/tactical-mode.c +++ b/ui/anduril/tactical-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "tactical-mode.h" +#include "anduril/tactical-mode.h" uint8_t tactical_state(Event event, uint16_t arg) { diff --git a/ui/anduril/tempcheck-mode.c b/ui/anduril/tempcheck-mode.c index 5d160bd..3563f45 100644 --- a/ui/anduril/tempcheck-mode.c +++ b/ui/anduril/tempcheck-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "tempcheck-mode.h" +#include "anduril/tempcheck-mode.h" uint8_t tempcheck_state(Event event, uint16_t arg) { // 1 click: off diff --git a/ui/anduril/tint-ramping.c b/ui/anduril/tint-ramping.c index 9418113..1918072 100644 --- a/ui/anduril/tint-ramping.c +++ b/ui/anduril/tint-ramping.c @@ -4,7 +4,7 @@ #pragma once -#include "tint-ramping.h" +#include "anduril/tint-ramping.h" uint8_t tint_ramping_state(Event event, uint16_t arg) { static int8_t tint_ramp_direction = 1; diff --git a/ui/anduril/version-check-mode.c b/ui/anduril/version-check-mode.c index a47706f..eebe59b 100644 --- a/ui/anduril/version-check-mode.c +++ b/ui/anduril/version-check-mode.c @@ -4,7 +4,7 @@ #pragma once -#include "version-check-mode.h" +#include "anduril/version-check-mode.h" // empty state; logic is handled in FSM loop() instead uint8_t version_check_state(Event event, uint16_t arg) { diff --git a/ui/anduril/version-check-mode.h b/ui/anduril/version-check-mode.h index 72bad3f..4d92dfe 100644 --- a/ui/anduril/version-check-mode.h +++ b/ui/anduril/version-check-mode.h @@ -12,7 +12,7 @@ #error MODEL_NUMBER undefined #endif -#include "version.h" +#include "anduril/version.h" const PROGMEM uint8_t version_number[] = MODEL_NUMBER "." VERSION_NUMBER; uint8_t version_check_state(Event event, uint16_t arg); inline void version_check_iter(); |
