From c63f3338ee66d1f1b27505b86c9a542985ed9867 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 20 Aug 2020 17:19:14 -0600 Subject: raised ceiling levels for simple UI in each build target (the idea is "high but not crazy", or around 100% to 150% of thermally-sustainable level) ... and set the default steps to 5 instead of 3 --- spaghetti-monster/anduril/cfg-blf-gt.h | 5 +++++ spaghetti-monster/anduril/cfg-blf-lantern.h | 6 ++++-- spaghetti-monster/anduril/cfg-blf-q8.h | 12 ++++++++++++ spaghetti-monster/anduril/cfg-emisar-d1.h | 4 ++++ spaghetti-monster/anduril/cfg-emisar-d18.h | 14 +++++++++++--- spaghetti-monster/anduril/cfg-emisar-d1s.h | 4 ++++ spaghetti-monster/anduril/cfg-emisar-d1v2.h | 4 ++++ spaghetti-monster/anduril/cfg-emisar-d4.h | 5 +++++ spaghetti-monster/anduril/cfg-emisar-d4s.h | 18 +++++++++++++----- spaghetti-monster/anduril/cfg-emisar-d4sv2.h | 12 ++++++++---- spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h | 6 ++++++ spaghetti-monster/anduril/cfg-emisar-d4v2.h | 5 +++++ spaghetti-monster/anduril/cfg-ff-e01.h | 7 +++++++ spaghetti-monster/anduril/cfg-ff-pl47.h | 10 ++++++++-- spaghetti-monster/anduril/cfg-ff-pl47g2.h | 8 +++++--- spaghetti-monster/anduril/cfg-ff-rot66.h | 6 ++++++ spaghetti-monster/anduril/cfg-ff-rot66g2.h | 5 +++++ spaghetti-monster/anduril/cfg-fw3a-nofet.h | 5 +++++ spaghetti-monster/anduril/cfg-fw3a.h | 6 ++++++ spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h | 6 ++++++ spaghetti-monster/anduril/cfg-mateminco-mf01s.h | 6 ++++++ spaghetti-monster/anduril/cfg-noctigon-k1-12v.h | 4 +++- spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h | 6 ++++-- spaghetti-monster/anduril/cfg-noctigon-k1.h | 4 +++- spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h | 4 +++- spaghetti-monster/anduril/cfg-noctigon-kr4.h | 4 +++- spaghetti-monster/anduril/ramp-mode.h | 2 +- 27 files changed, 152 insertions(+), 26 deletions(-) (limited to 'spaghetti-monster') diff --git a/spaghetti-monster/anduril/cfg-blf-gt.h b/spaghetti-monster/anduril/cfg-blf-gt.h index 2ba6455..a255073 100644 --- a/spaghetti-monster/anduril/cfg-blf-gt.h +++ b/spaghetti-monster/anduril/cfg-blf-gt.h @@ -37,6 +37,11 @@ #define RAMP_DISCRETE_CEIL POWER_80PX #define RAMP_DISCRETE_STEPS 7 +// GT can handle heat well, so don't limit simple mode +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL +#define SIMPLE_UI_STEPS 5 + // stop panicking at 80% power, this light has plenty of thermal mass #define THERM_FASTER_LEVEL POWER_80PX // throttle back faster when high diff --git a/spaghetti-monster/anduril/cfg-blf-lantern.h b/spaghetti-monster/anduril/cfg-blf-lantern.h index 9a91c93..b2cc1b0 100644 --- a/spaghetti-monster/anduril/cfg-blf-lantern.h +++ b/spaghetti-monster/anduril/cfg-blf-lantern.h @@ -57,8 +57,10 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 5 -#define SIMPLE_UI_FLOOR 15 // about 20 lm -#define SIMPLE_UI_CEIL 115 // about 350 lm +// LT1 can handle heat well, so don't limit simple mode +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL +#define SIMPLE_UI_STEPS RAMP_DISCRETE_STEPS #define USE_SOS_MODE #define USE_SOS_MODE_IN_BLINKY_GROUP diff --git a/spaghetti-monster/anduril/cfg-blf-q8.h b/spaghetti-monster/anduril/cfg-blf-q8.h index 970fedb..a907d02 100644 --- a/spaghetti-monster/anduril/cfg-blf-q8.h +++ b/spaghetti-monster/anduril/cfg-blf-q8.h @@ -24,6 +24,18 @@ #define HALFSPEED_LEVEL 14 #define QUARTERSPEED_LEVEL 5 +#define RAMP_SMOOTH_FLOOR 1 +#define RAMP_SMOOTH_CEIL 120 +// 10 28 46 [65] 83 101 120 +#define RAMP_DISCRETE_FLOOR 10 +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_STEPS 7 + +// safe limit ~50% power +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL +#define SIMPLE_UI_STEPS 5 + // stop panicking at ~75% power or ~3000 lm, this light has high thermal mass #define THERM_FASTER_LEVEL (RAMP_SIZE*9/10) // throttle back faster when high diff --git a/spaghetti-monster/anduril/cfg-emisar-d1.h b/spaghetti-monster/anduril/cfg-emisar-d1.h index 9276ba3..4b894d7 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d1.h +++ b/spaghetti-monster/anduril/cfg-emisar-d1.h @@ -3,6 +3,10 @@ // same as Emisar D4, mostly #include "cfg-emisar-d4.h" +// safe limit ~50% power +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_CEIL 120 + // stop panicking at ~75% power or ~1000 lm (D1 has a decent power-to-thermal-mass ratio) #ifdef THERM_FASTER_LEVEL #undef THERM_FASTER_LEVEL diff --git a/spaghetti-monster/anduril/cfg-emisar-d18.h b/spaghetti-monster/anduril/cfg-emisar-d18.h index 7fb9597..5f29270 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d18.h +++ b/spaghetti-monster/anduril/cfg-emisar-d18.h @@ -15,11 +15,19 @@ // start at ~2000 lm after battery change, not ~150 lm (at Emisar's request) //#define DEFAULT_LEVEL MAX_Nx7135 -// higher floor than default, and stop at highest regulated level -#define RAMP_DISCRETE_FLOOR 25 -#define RAMP_DISCRETE_CEIL MAX_Nx7135 +// go up to ~4000 lm +#define RAMP_SMOOTH_FLOOR 1 +#define RAMP_SMOOTH_CEIL 117 +// 20 36 52 68 84 [100] 117 +#define RAMP_DISCRETE_FLOOR 20 +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~20% power / max regulated +#define SIMPLE_UI_FLOOR 20 +#define SIMPLE_UI_CEIL MAX_Nx7135 +#define SIMPLE_UI_STEPS 5 + // only blink at max regulated level and ceiling #define BLINK_AT_RAMP_MIDDLE #define BLINK_AT_RAMP_MIDDLE_1 MAX_Nx7135 diff --git a/spaghetti-monster/anduril/cfg-emisar-d1s.h b/spaghetti-monster/anduril/cfg-emisar-d1s.h index c01c37d..cc25ddd 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d1s.h +++ b/spaghetti-monster/anduril/cfg-emisar-d1s.h @@ -3,6 +3,10 @@ // same as Emisar D4, mostly #include "cfg-emisar-d4.h" +// safe limit ~50% power +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_CEIL 120 + // stop panicking at ~90% power or ~1200 lm (D1S has a good power-to-thermal-mass ratio) #ifdef THERM_FASTER_LEVEL #undef THERM_FASTER_LEVEL diff --git a/spaghetti-monster/anduril/cfg-emisar-d1v2.h b/spaghetti-monster/anduril/cfg-emisar-d1v2.h index 91be3f3..42f6ab8 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d1v2.h +++ b/spaghetti-monster/anduril/cfg-emisar-d1v2.h @@ -10,6 +10,10 @@ // no aux LEDs means no need for sleep ticks #undef TICK_DURING_STANDBY +// safe limit ~50% power +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_CEIL 120 + // stop panicking at ~75% power or ~1000 lm (D1 has a decent power-to-thermal-mass ratio) #ifdef THERM_FASTER_LEVEL #undef THERM_FASTER_LEVEL diff --git a/spaghetti-monster/anduril/cfg-emisar-d4.h b/spaghetti-monster/anduril/cfg-emisar-d4.h index 818e55e..3ee7c73 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4.h @@ -18,6 +18,11 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~20% power +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 95 +#define SIMPLE_UI_STEPS 5 + // stop panicking at ~30% power or ~1200 lm #define THERM_FASTER_LEVEL 105 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h index f5addb2..80f557d 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4s.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h @@ -19,17 +19,25 @@ #define RAMP_LENGTH 150 // 3x7135 + FET -// ../../bin/level_calc.py 2 150 7135 1 11.2 450 FET 1 10 4000 -// (with a x**9 curve instead of x**3) -// (because it made the ramp look better than accurate values) +// level_calc.py ninth 2 150 7135 1 11.2 450 FET 1 10 4000 #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,16,17,18,19,21,22,23,25,26,27,29,31,32,34,36,38,40,42,44,46,49,51,54,56,59,62,65,68,71,74,78,81,85,89,93,97,101,106,110,115,120,125,130,136,141,147,153,160,166,173,180,187,195,202,210,219,227,236,245,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,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,1,3,4,5,7,8,10,11,13,14,16,18,19,21,23,25,27,29,31,34,36,38,41,43,46,48,51,54,57,60,63,66,69,72,76,79,83,87,91,95,99,103,107,112,116,121,126,131,136,141,146,152,158,163,169,175,182,188,195,202,209,216,223,231,239,247,255 #define MAX_1x7135 83 #define HALFSPEED_LEVEL 13 #define QUARTERSPEED_LEVEL 6 -// ceiling is level 120/150 -#define RAMP_SMOOTH_CEIL (MAX_LEVEL*4/5) +#define RAMP_SMOOTH_FLOOR 1 +#define RAMP_SMOOTH_CEIL 120 +// 10, 28, 46, 65, [83], 101, 120 +#define RAMP_DISCRETE_FLOOR 10 +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_STEPS 7 + +// safe limit ~30% power +// 10 34 59 [83] 108 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 108 +#define SIMPLE_UI_STEPS 5 // thermal regulation parameters #ifdef MIN_THERM_STEPDOWN diff --git a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h index 418c11b..2702261 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h @@ -26,6 +26,8 @@ #define HALFSPEED_LEVEL 18 #define QUARTERSPEED_LEVEL 8 +//#define DEFAULT_LEVEL MAX_Nx7135 + #define RAMP_SMOOTH_FLOOR 1 #define RAMP_SMOOTH_CEIL 130 // 20, 38, 56, 75, [93], 111, 130 @@ -33,11 +35,13 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -//#define DEFAULT_LEVEL MAX_Nx7135 -#define STROBE_BRIGHTNESS MAX_LEVEL - +// safe limit ~35% power, 150% of sustainable thermal power +// 20 44 69 [93] 118 #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL MAX_Nx7135 +#define SIMPLE_UI_CEIL 118 +#define SIMPLE_UI_STEPS 5 + +#define STROBE_BRIGHTNESS MAX_LEVEL // stop panicking at ~50% power or ~2000 lm #define THERM_FASTER_LEVEL 130 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h b/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h index d620213..c53e2e9 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h @@ -26,6 +26,12 @@ #define RAMP_DISCRETE_CEIL 150 #define RAMP_DISCRETE_STEPS 5 +// safe limit ~100% power because no FET +#undef SIMPLE_UI_FLOOR +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL + #define CANDLE_AMPLITUDE 60 #undef THERM_FASTER_LEVEL diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.h index eac4013..b7093af 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.h @@ -37,6 +37,11 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~20% power +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 95 +#define SIMPLE_UI_STEPS 5 + // stop panicking at ~30% power or ~1200 lm #define THERM_FASTER_LEVEL 105 diff --git a/spaghetti-monster/anduril/cfg-ff-e01.h b/spaghetti-monster/anduril/cfg-ff-e01.h index 689cce8..7db369c 100644 --- a/spaghetti-monster/anduril/cfg-ff-e01.h +++ b/spaghetti-monster/anduril/cfg-ff-e01.h @@ -10,3 +10,10 @@ // (9 / 45 / 116 / 248 / 467 / 742 / 1280 + 2140 lm) #undef RAMP_DISCRETE_STEPS #define RAMP_DISCRETE_STEPS 7 + +// safe limit ~50% power +// 20 56 [93] 130 +#define SIMPLE_UI_FLOOR 20 +#define SIMPLE_UI_CEIL 130 +#define SIMPLE_UI_STEPS 4 + diff --git a/spaghetti-monster/anduril/cfg-ff-pl47.h b/spaghetti-monster/anduril/cfg-ff-pl47.h index 20d0306..2636b71 100644 --- a/spaghetti-monster/anduril/cfg-ff-pl47.h +++ b/spaghetti-monster/anduril/cfg-ff-pl47.h @@ -51,9 +51,15 @@ #define RAMP_DISCRETE_CEIL 120 #define RAMP_DISCRETE_STEPS 7 +// safe limit ~25% power / ~1000 lm +// 10 34 59 [83] 108 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 108 +#define SIMPLE_UI_STEPS 5 + // ~25 lm to ~300 lm -#define SIMPLE_UI_FLOOR 30 -#define SIMPLE_UI_CEIL MAX_1x7135 +//#define SIMPLE_UI_FLOOR 30 +//#define SIMPLE_UI_CEIL MAX_1x7135 // ~50 lm to ~500 lm //#define SIMPLE_UI_FLOOR 40 //#define SIMPLE_UI_CEIL 90 diff --git a/spaghetti-monster/anduril/cfg-ff-pl47g2.h b/spaghetti-monster/anduril/cfg-ff-pl47g2.h index 8ccd6d6..87b3c07 100644 --- a/spaghetti-monster/anduril/cfg-ff-pl47g2.h +++ b/spaghetti-monster/anduril/cfg-ff-pl47g2.h @@ -42,9 +42,11 @@ #define RAMP_DISCRETE_CEIL 120 #define RAMP_DISCRETE_STEPS 7 -// ~25 lm to ~300 lm -#define SIMPLE_UI_FLOOR 30 -#define SIMPLE_UI_CEIL MAX_1x7135 +// safe limit ~25% power / ~1000 lm +// 10 34 59 [83] 108 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 108 +#define SIMPLE_UI_STEPS 5 // regulate down faster when the FET is active, slower otherwise #define THERM_FASTER_LEVEL 135 // throttle back faster when high diff --git a/spaghetti-monster/anduril/cfg-ff-rot66.h b/spaghetti-monster/anduril/cfg-ff-rot66.h index cefe48d..d43c260 100644 --- a/spaghetti-monster/anduril/cfg-ff-rot66.h +++ b/spaghetti-monster/anduril/cfg-ff-rot66.h @@ -35,6 +35,12 @@ #define HALFSPEED_LEVEL 14 #define QUARTERSPEED_LEVEL 8 +// safe limit max regulated power +// 20 46 72 98 [125] +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL MAX_Nx7135 +#define SIMPLE_UI_STEPS 5 + // regulate down faster when the FET is active, slower otherwise #define THERM_FASTER_LEVEL 130 // throttle back faster when high diff --git a/spaghetti-monster/anduril/cfg-ff-rot66g2.h b/spaghetti-monster/anduril/cfg-ff-rot66g2.h index 25e779d..8dd6d9c 100644 --- a/spaghetti-monster/anduril/cfg-ff-rot66g2.h +++ b/spaghetti-monster/anduril/cfg-ff-rot66g2.h @@ -49,4 +49,9 @@ #define RAMP_DISCRETE_CEIL MAX_Nx7135 #define RAMP_DISCRETE_STEPS 7 +// safe limit max regulated power +// 10 37 65 92 [120] +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL MAX_Nx7135 +#define SIMPLE_UI_STEPS 5 diff --git a/spaghetti-monster/anduril/cfg-fw3a-nofet.h b/spaghetti-monster/anduril/cfg-fw3a-nofet.h index 3c6f461..10d8902 100644 --- a/spaghetti-monster/anduril/cfg-fw3a-nofet.h +++ b/spaghetti-monster/anduril/cfg-fw3a-nofet.h @@ -34,3 +34,8 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~25% power +// 10 37 65 92 120 +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_CEIL 120 + diff --git a/spaghetti-monster/anduril/cfg-fw3a.h b/spaghetti-monster/anduril/cfg-fw3a.h index d8e271d..e47a8f0 100644 --- a/spaghetti-monster/anduril/cfg-fw3a.h +++ b/spaghetti-monster/anduril/cfg-fw3a.h @@ -13,6 +13,12 @@ #define HALFSPEED_LEVEL 14 #define QUARTERSPEED_LEVEL 5 +// safe limit ~20% power +// 20 40 60 80 100 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 100 +#define SIMPLE_UI_STEPS 5 + // stop panicking at about 3A or ~1100 lm, this light is a hotrod #define THERM_FASTER_LEVEL MAX_Nx7135 diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h index 0176da6..2634a34 100644 --- a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h +++ b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h @@ -48,5 +48,11 @@ #define RAMP_DISCRETE_CEIL 130 // ~??? lm #define RAMP_DISCRETE_STEPS 7 // ??, ??, ... lm +// safe limit max regulated power +// 15 38 62 86 [110] +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 110 +#define SIMPLE_UI_STEPS 5 + #define THERM_FASTER_LEVEL 130 // throttle back faster when high diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h index 8761f66..b3c58e8 100644 --- a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h +++ b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h @@ -39,6 +39,12 @@ #define RAMP_DISCRETE_CEIL 120 // ~5400 lm #define RAMP_DISCRETE_STEPS 7 // 35, 108, 280, 626, 1500, 2930, 5400 lm +// safe limit ~25% power +// 18 35 52 [70] 87 105 +#define SIMPLE_UI_FLOOR 18 +#define SIMPLE_UI_CEIL 105 +#define SIMPLE_UI_STEPS 6 + #define THERM_FASTER_LEVEL 125 // throttle back faster when high (>6000 lm) #define THERM_HARD_TURBO_DROP // this light is massively overpowered diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h index 4dbdf4f..b1fb136 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h @@ -43,8 +43,10 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~50% power #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 70 +#define SIMPLE_UI_CEIL 120 +#define SIMPLE_UI_STEPS 5 // make candle mode wobble more #define CANDLE_AMPLITUDE 32 diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h index 7af7d8d..9e52fa6 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h @@ -42,10 +42,12 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~33% power #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 65 +#define SIMPLE_UI_CEIL 110 +#define SIMPLE_UI_STEPS 5 -// stop panicking at ~25% power or ~1000 lm +// stop panicking at ~40% power or ~1700 lm #define THERM_FASTER_LEVEL 120 #define MIN_THERM_STEPDOWN DEFAULT_LEVEL //#define THERM_NEXT_WARNING_THRESHOLD 16 // accumulate less error before adjusting diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1.h b/spaghetti-monster/anduril/cfg-noctigon-k1.h index 8ebf904..d3c199e 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1.h @@ -44,8 +44,10 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~75% power #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 70 +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL +#define SIMPLE_UI_STEPS 5 // make candle mode wobble more #define CANDLE_AMPLITUDE 32 diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h b/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h index 9f7616b..f09d952 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h +++ b/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h @@ -33,10 +33,12 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~67% power / ~1200 lm (can sustain 900 lm) #undef SIMPLE_UI_FLOOR #undef SIMPLE_UI_CEIL #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 70 +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL + // make candle mode wobble more #define CANDLE_AMPLITUDE 32 diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4.h b/spaghetti-monster/anduril/cfg-noctigon-kr4.h index 92c4443..0cf520e 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-kr4.h +++ b/spaghetti-monster/anduril/cfg-noctigon-kr4.h @@ -46,8 +46,10 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 +// safe limit ~30% power / ~1400 lm (can sustain 900 lm) #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 65 +#define SIMPLE_UI_CEIL 110 +#define SIMPLE_UI_STEPS 5 // stop panicking at ~25% power or ~1000 lm #define THERM_FASTER_LEVEL 100 diff --git a/spaghetti-monster/anduril/ramp-mode.h b/spaghetti-monster/anduril/ramp-mode.h index 43e8844..eb13430 100644 --- a/spaghetti-monster/anduril/ramp-mode.h +++ b/spaghetti-monster/anduril/ramp-mode.h @@ -49,7 +49,7 @@ #define SIMPLE_UI_CEIL (MAX_1x7135+20) #endif #ifndef SIMPLE_UI_STEPS -#define SIMPLE_UI_STEPS 3 +#define SIMPLE_UI_STEPS 5 #endif #endif -- cgit v1.2.3