aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/fsm-channels.h
diff options
context:
space:
mode:
authorSelene ToyKeeper2023-08-24 17:08:01 -0600
committerSelene ToyKeeper2023-08-24 17:08:01 -0600
commit04a48e44b25d1c42dc26f837586a7503bb74b749 (patch)
treefb4b0536ef8d9b05fa606d5ab082a30addf08781 /spaghetti-monster/fsm-channels.h
parentfixed issue where tactical mode overrode strobe group memory (diff)
downloadanduril-04a48e44b25d1c42dc26f837586a7503bb74b749.tar.gz
anduril-04a48e44b25d1c42dc26f837586a7503bb74b749.tar.bz2
anduril-04a48e44b25d1c42dc26f837586a7503bb74b749.zip
added channel mode per strobe mode, and made FSM channel mode more flexible,
and fixed issue in tactical mode where strobes wouldn't stop on button release
Diffstat (limited to '')
-rw-r--r--spaghetti-monster/fsm-channels.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/spaghetti-monster/fsm-channels.h b/spaghetti-monster/fsm-channels.h
index ba2d3fa..55fc826 100644
--- a/spaghetti-monster/fsm-channels.h
+++ b/spaghetti-monster/fsm-channels.h
@@ -38,17 +38,10 @@ Channel channels[]; // values are defined in the hwdef-*.c
// TODO: size-optimize the case with only 1 channel mode?
// (the arrays and stuff shouldn't be needed)
-#if defined(USE_CFG) && (NUM_CHANNEL_MODES > 1)
- #define CH_MODE cfg.channel_mode
-#else
+#if NUM_CHANNEL_MODES > 1
+ #define USE_CHANNEL_MODES
// current multi-channel mode
uint8_t channel_mode = DEFAULT_CHANNEL_MODE;
- #define CH_MODE channel_mode
-#endif
-
-// FIXME: remove this?
-#if NUM_CHANNEL_MODES > 1
-#define USE_CHANNEL_MODES
#endif
#ifdef USE_CUSTOM_CHANNEL_3H_MODES