diff options
| author | Selene ToyKeeper | 2024-03-28 08:10:18 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2024-03-28 08:10:18 -0600 |
| commit | a9aa19f96ab999cdbde9cc842e5cd3b86c639245 (patch) | |
| tree | cd133926be51bb45322ed55dd60e78a7c1323ffa | |
| parent | Merge branch 'pr49-SiteRelEnby-tactical-mode-3c-fix' into trunk (diff) | |
| parent | Bugfix: Tactical mode has a dependency on momentary mode (diff) | |
| download | anduril-a9aa19f96ab999cdbde9cc842e5cd3b86c639245.tar.gz anduril-a9aa19f96ab999cdbde9cc842e5cd3b86c639245.tar.bz2 anduril-a9aa19f96ab999cdbde9cc842e5cd3b86c639245.zip | |
Merge branch 'bugfix-tacmode-without-momentary' of github.com:SiteRelEnby/anduril into pr46-SiteRelEnby-bugfix-tacmode-without-momentary
* 'bugfix-tacmode-without-momentary' of github.com:SiteRelEnby/anduril:
Bugfix: Tactical mode has a dependency on momentary mode
| -rw-r--r-- | ui/anduril/anduril.c | 4 | ||||
| -rw-r--r-- | ui/anduril/strobe-modes.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/anduril/anduril.c b/ui/anduril/anduril.c index 1cdb8d0..7557bf7 100644 --- a/ui/anduril/anduril.c +++ b/ui/anduril/anduril.c @@ -121,7 +121,7 @@ #include "anduril/lockout-mode.h" #endif -#ifdef USE_MOMENTARY_MODE +#if (defined(USE_MOMENTARY_MODE) || defined(USE_TACTICAL_MODE)) #include "anduril/momentary-mode.h" #endif @@ -189,7 +189,7 @@ #include "anduril/lockout-mode.c" #endif -#ifdef USE_MOMENTARY_MODE +#if (defined(USE_MOMENTARY_MODE) || defined(USE_TACTICAL_MODE)) #include "anduril/momentary-mode.c" #endif diff --git a/ui/anduril/strobe-modes.c b/ui/anduril/strobe-modes.c index ccc4aa0..38e4dca 100644 --- a/ui/anduril/strobe-modes.c +++ b/ui/anduril/strobe-modes.c @@ -13,7 +13,7 @@ uint8_t strobe_state(Event event, uint16_t arg) { // 'st' reduces ROM size slightly strobe_mode_te st = current_strobe_type; - #ifdef USE_MOMENTARY_MODE + #if defined(USE_MOMENTARY_MODE) || defined(USE_TACTICAL_MODE) momentary_mode = 1; // 0 = ramping, 1 = strobes #endif |