From 55541be4a505da3df7d1a2b8bf3b5295b0af58f7 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 13 Apr 2023 20:38:25 -0600
Subject: refactor progress checkpoint ... got Sofirn LT1S Pro and Emisar D4v2
 working with the new channel mode system ... but there's a lot more left to
 do

---
 spaghetti-monster/fsm-misc.h | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 66d31ba..17ed66f 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -53,6 +53,11 @@ void indicator_led(uint8_t lvl);
 void button_led_set(uint8_t lvl);
 #endif
 
+// if any type of aux LEDs exist, define a shorthand flag for it
+#if defined(USE_INDICATOR_LED) || defined(USE_AUX_RGB_LEDS) || defined(USE_BUTTON_LED)
+#define HAS_AUX_LEDS
+#endif
+
 #ifdef USE_AUX_RGB_LEDS
 // value: 0b00BBGGRR
 // each pair of bits: 0=off, 1=low, 2=high
-- 
cgit v1.2.3


From 583854e37efde7f461e073e735a1736b02d28c70 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 17 Apr 2023 00:08:32 -0600
Subject: switched the rest of FSM + Anduril to use SPDX license headers
 instead of full GPL headers (or all too often, nothing at all)

There are a few "FIXME" entries where I'm not sure about the correct copyright.

---
 spaghetti-monster/fsm-misc.h | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

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

diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 17ed66f..68929c2 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -1,24 +1,8 @@
-/*
- * fsm-misc.h: Miscellaneous function for SpaghettiMonster.
- *
- * Copyright (C) 2017 Selene ToyKeeper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// fsm-misc.h: Miscellaneous function for SpaghettiMonster.
+// Copyright (C) 2017-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
 
-#ifndef FSM_MISC_H
-#define FSM_MISC_H
+#pragma once
 
 #ifdef USE_DYNAMIC_UNDERCLOCKING
 void auto_clock_speed();
@@ -72,4 +56,3 @@ uint8_t triangle_wave(uint8_t phase);
 void reboot();
 #endif
 
-#endif
-- 
cgit v1.2.3


From e8d7e8ea11696bb2cad60c309527d02f130f7687 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 2 May 2023 05:19:50 -0600
Subject: added ability to set channel mode for number readouts (batt check,
 temp check, version check) Press 3C in batt check mode to change the blink
 channel.

Also fixed TS10 stepped ramp ceiling value.

---
 spaghetti-monster/fsm-misc.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 68929c2..8988337 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -9,10 +9,15 @@ void auto_clock_speed();
 #endif
 
 #if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
-#ifndef BLINK_BRIGHTNESS
-#define BLINK_BRIGHTNESS (MAX_LEVEL/6)
-#endif
-uint8_t blink_digit(uint8_t num);
+    #ifndef BLINK_BRIGHTNESS
+        #define BLINK_BRIGHTNESS (MAX_LEVEL/6)
+    #endif
+    #if defined(USE_CFG) && defined(DEFAULT_BLINK_CHANNEL)
+        #define BLINK_CHANNEL cfg.blink_channel
+    #elif defined(DEFAULT_BLINK_CHANNEL)
+        #define BLINK_CHANNEL DEFAULT_BLINK_CHANNEL
+    #endif
+    uint8_t blink_digit(uint8_t num);
 #endif
 
 #ifdef USE_BLINK_NUM
-- 
cgit v1.2.3


From e3798bbd2d4e46cb73e266401d2817533683a7e9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 30 May 2023 09:28:19 -0600
Subject: moved definition of BLINK_ONCE_TIME to the same file as
 BLINK_BRIGHTNESS

---
 spaghetti-monster/fsm-misc.h | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 8988337..8de6b29 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -8,6 +8,11 @@
 void auto_clock_speed();
 #endif
 
+// shortest time (in ms) the light should blink for to indicate a zero
+#ifndef BLINK_ONCE_TIME
+    #define BLINK_ONCE_TIME 10
+#endif
+
 #if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
     #ifndef BLINK_BRIGHTNESS
         #define BLINK_BRIGHTNESS (MAX_LEVEL/6)
-- 
cgit v1.2.3