From 04a48e44b25d1c42dc26f837586a7503bb74b749 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2023 17:08:01 -0600
Subject: 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

---
 spaghetti-monster/fsm-channels.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'spaghetti-monster/fsm-channels.h')

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
-- 
cgit v1.2.3