completely recalibrated FF E01 to match production sample

2 files changed, 40 insertions, 39 deletions

diff --git a/spaghetti-monster/anduril/cfg-ff-e01.h b/spaghetti-monster/anduril/cfg-ff-e01.h
index 432f37b..3b47165 100644
--- a/spaghetti-monster/anduril/cfg-ff-e01.h
+++ b/spaghetti-monster/anduril/cfg-ff-e01.h
@@ -1,31 +1,15 @@
 // Fireflies E01 SST-40 thrower config options for Anduril
-#include "cfg-ff-pl47.h"
+// most of the good stuff is in the FFUI config; just copy it
+#include "../fireflies-ui/cfg-ff-e01.h"
 
-// disable indicator LED
-#undef USE_INDICATOR_LED
-#undef TICK_DURING_STANDBY
-
-// ceiling is level 130/150  (50% power)
-#undef RAMP_SMOOTH_CEIL
-#define RAMP_SMOOTH_CEIL 130
+#ifndef BLINK_AT_RAMP_CEILING
 #define BLINK_AT_RAMP_CEILING
+#endif
 
-// 13, 36, 59, [83], 106, 130 (83 is highest regulated)
-#undef RAMP_DISCRETE_FLOOR
-#define RAMP_DISCRETE_FLOOR 13
-#undef RAMP_DISCRETE_CEIL
-#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
+// 20, 38, 56, 75, [93], 111, 130 (93 is highest regulated)
+// (9 / 45 / 116 / 248 / 467 / 742 / 1280 + 2140 lm)
 #undef RAMP_DISCRETE_STEPS
-#define RAMP_DISCRETE_STEPS 6
-
-// regulate down faster when the FET is active, slower otherwise
-#undef THERM_FASTER_LEVEL
-#define THERM_FASTER_LEVEL 130  // throttle back faster when high
-
-// play it safe, don't try to regulate above the recommended safe level
-#ifndef THERM_HARD_TURBO_DROP
-#define THERM_HARD_TURBO_DROP
-#endif
+#define RAMP_DISCRETE_STEPS 7
 
 // shortcut for first-time setup
 #define USE_TENCLICK_THERMAL_CONFIG
diff --git a/spaghetti-monster/fireflies-ui/cfg-ff-e01.h b/spaghetti-monster/fireflies-ui/cfg-ff-e01.h
index 31be0ef..42c23b2 100644
--- a/spaghetti-monster/fireflies-ui/cfg-ff-e01.h
+++ b/spaghetti-monster/fireflies-ui/cfg-ff-e01.h
@@ -1,27 +1,44 @@
 // Fireflies EDC thrower config options for Fireflies UI
-#include "cfg-ff-pl47.h"
+// (uses PL47 driver)
+#include "hwdef-FF_PL47.h"
 
-// disable indicator LED
+// disable indicator LED; it's hardwired
+#ifdef USE_INDICATOR_LED
 #undef USE_INDICATOR_LED
+#endif
+
+// don't do this
+#undef BLINK_AT_RAMP_MIDDLE
+#undef BLINK_AT_RAMP_CEILING
+
+// ramp shape and size
+#define RAMP_LENGTH 150
+
+// driver is a FET + 3x7135, ~413 lm at highest regulated level
+// ../../../bin/level_calc.py seventh 2 150 7135 1 12 414 FET 2 10 1930
+#define PWM1_LEVELS 1,1,2,2,3,3,4,4,5,5,6,6,7,8,8,9,10,10,11,12,13,14,15,15,16,17,18,20,21,22,23,24,26,27,28,30,31,33,34,36,38,39,41,43,45,47,49,51,53,56,58,60,63,65,68,71,74,77,80,83,86,89,93,96,100,103,107,111,115,119,124,128,132,137,142,147,152,157,163,168,174,180,186,192,198,204,211,218,225,232,240,247,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0
+#define PWM2_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,5,7,9,12,14,16,19,22,24,27,30,33,36,39,42,45,48,52,55,58,62,66,69,73,77,81,85,90,94,98,103,107,112,117,122,127,132,137,143,148,154,160,166,172,178,184,191,197,204,211,218,225,232,240,247,255
+#define MAX_1x7135 93
+#define HALFSPEED_LEVEL 14
+#define QUARTERSPEED_LEVEL 7
+
+#define MIN_THERM_STEPDOWN 65  // lowest value it'll step down to
+
 
 // ceiling is level 130/150  (50% power)
-#undef RAMP_SMOOTH_CEIL
+#define RAMP_SMOOTH_FLOOR 1
 #define RAMP_SMOOTH_CEIL 130
 
-// 36, 83, 130 (83 is highest regulated)
-#undef RAMP_DISCRETE_FLOOR
-#define RAMP_DISCRETE_FLOOR 36
-#undef RAMP_DISCRETE_CEIL
+// 20, 56, [93], 130 (93 is highest regulated)
+// (8 / 102 / 413 / 1163 + 1930 lm)
+#define RAMP_DISCRETE_FLOOR 20
 #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
-#undef RAMP_DISCRETE_STEPS
-#define RAMP_DISCRETE_STEPS 3
+#define RAMP_DISCRETE_STEPS 4
 
-// regulate down faster when the FET is active, slower otherwise
-#undef THERM_FASTER_LEVEL
-#define THERM_FASTER_LEVEL 130  // throttle back faster when high
+// ~25 lm to ~400 lm
+#define MUGGLE_FLOOR 30
+#define MUGGLE_CEILING MAX_1x7135
 
-// play it safe, don't try to regulate above the recommended safe level
-#ifndef THERM_HARD_TURBO_DROP
-#define THERM_HARD_TURBO_DROP
-#endif
+// throttle back faster when high
+#define THERM_FASTER_LEVEL 130