@wurkkos-*: raised default temperature limit from 45 C to 50 C,

moved some common options to a shared config file

3 files changed, 29 insertions, 30 deletions

diff --git a/spaghetti-monster/anduril/cfg-wurkkos-ts10.h b/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
index 8e3462e..781d128 100644
--- a/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
+++ b/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
@@ -6,6 +6,7 @@
 // same as  the  BLF Q8 T1616, mostly (added Dynamic PWM)
 #define MODEL_NUMBER "0714"
 #include "hwdef-wurkkos-ts10.h"
+#include "wurkkos-cfg.h"
 // ATTINY: 1616
 
 // uses forward-facing aux LEDs
@@ -65,9 +66,6 @@
 #define SIMPLE_UI_CEIL   130
 #define SIMPLE_UI_STEPS  5
 
-// enable 2 click turbo (Anduril 1 style)
-#define DEFAULT_2C_STYLE 1
-
 // stop panicking at ~50% power
 #define THERM_FASTER_LEVEL 120  // throttle back faster when high
 
@@ -77,16 +75,6 @@
 // blink numbers on the aux LEDs by default
 #define DEFAULT_BLINK_CHANNEL  CM_AUX
 
-// enable SOS in the blinkies group
-#define USE_SOS_MODE
-#define USE_SOS_MODE_IN_BLINKY_GROUP
-
-// Allow 3C in Simple UI for switching between smooth and stepped ramping
-#define USE_SIMPLE_UI_RAMPING_TOGGLE
-
-// allow Aux Config and Strobe Modes in Simple UI
-#define USE_EXTENDED_SIMPLE_UI
-
 // the default of 26 looks a bit rough, so increase it to make it smoother
 #define CANDLE_AMPLITUDE 33
 
@@ -95,6 +83,6 @@
 #undef BLINK_AT_RAMP_MIDDLE
 #endif
 
-// enable factory reset on 13H without loosening tailcap
+// enable factory reset on 13H without loosening tailcap (required)
 #define USE_SOFT_FACTORY_RESET
 
diff --git a/spaghetti-monster/anduril/cfg-wurkkos-ts25.h b/spaghetti-monster/anduril/cfg-wurkkos-ts25.h
index 0f54b32..852e91b 100644
--- a/spaghetti-monster/anduril/cfg-wurkkos-ts25.h
+++ b/spaghetti-monster/anduril/cfg-wurkkos-ts25.h
@@ -5,6 +5,7 @@
 
 #define MODEL_NUMBER "0715"
 #include "hwdef-wurkkos-ts25.h"
+#include "wurkkos-cfg.h"
 // ATTINY: 1616
 
 // this light has three aux LED channels: R, G, B
@@ -61,9 +62,6 @@
 #define SIMPLE_UI_CEIL   125
 #define SIMPLE_UI_STEPS  5
 
-// enable 2 click turbo (Anduril 1 style)
-#define DEFAULT_2C_STYLE 1
-
 // stop panicking at ~50% power
 #define THERM_FASTER_LEVEL 120  // throttle back faster when high
 
@@ -82,21 +80,8 @@
 #define POLICE_COLOR_STROBE_CH1        CM_AUXRED
 #define POLICE_COLOR_STROBE_CH2        CM_AUXBLU
 
-// enable SOS in the blinkies group
-#define USE_SOS_MODE
-#define USE_SOS_MODE_IN_BLINKY_GROUP
-
-// Allow 3C in Simple UI for switching between smooth and stepped ramping
-#define USE_SIMPLE_UI_RAMPING_TOGGLE
-
-// allow Aux Config and Strobe Modes in Simple UI
-#define USE_EXTENDED_SIMPLE_UI
-
 // don't blink mid-ramp
 #ifdef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_MIDDLE
 #endif
 
-// enable factory reset on 13H without loosening tailcap
-#define USE_SOFT_FACTORY_RESET
-
diff --git a/spaghetti-monster/anduril/wurkkos-cfg.h b/spaghetti-monster/anduril/wurkkos-cfg.h
new file mode 100644
index 0000000..b9992fb
--- /dev/null
+++ b/spaghetti-monster/anduril/wurkkos-cfg.h
@@ -0,0 +1,26 @@
+// Wurkkos config options for Anduril
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// allow Aux Config and Strobe Modes in Simple UI
+#define USE_EXTENDED_SIMPLE_UI
+
+// Allow 3C in Simple UI for switching between smooth and stepped ramping
+#define USE_SIMPLE_UI_RAMPING_TOGGLE
+
+// enable 2 click turbo (Anduril 1 style)
+#define DEFAULT_2C_STYLE 1
+
+// enable SOS in the blinkies group
+#define USE_SOS_MODE
+#define USE_SOS_MODE_IN_BLINKY_GROUP
+
+// enable factory reset on 13H without loosening tailcap
+// only really needed on TS10, but doesn't hurt on other models
+#define USE_SOFT_FACTORY_RESET
+
+// higher temperature limit because attiny1616 is more accurate
+#undef DEFAULT_THERM_CEIL
+#define DEFAULT_THERM_CEIL 50
+