diff options
| author | Selene ToyKeeper | 2020-07-12 19:58:19 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2020-07-12 19:58:19 -0600 |
| commit | de399f8d58c5782b5405379cfd8c506c8963887f (patch) | |
| tree | 5fb5b7d303da31b0956440bfbc360894ed56f7e8 /spaghetti-monster | |
| parent | limited simple UI floor and ceiling to muggle mode levels, (diff) | |
| download | anduril-de399f8d58c5782b5405379cfd8c506c8963887f.tar.gz anduril-de399f8d58c5782b5405379cfd8c506c8963887f.tar.bz2 anduril-de399f8d58c5782b5405379cfd8c506c8963887f.zip | |
cleaned up s/ceiling/ceil/ and s/muggle_/simple_ui_/ in config files
Diffstat (limited to 'spaghetti-monster')
23 files changed, 77 insertions, 77 deletions
diff --git a/spaghetti-monster/anduril/cfg-blf-gt.h b/spaghetti-monster/anduril/cfg-blf-gt.h index 6a74bbc..2ba6455 100644 --- a/spaghetti-monster/anduril/cfg-blf-gt.h +++ b/spaghetti-monster/anduril/cfg-blf-gt.h @@ -9,7 +9,7 @@ #define TICK_DURING_STANDBY // don't blink during ramp, it's irrelevant and annoying on this light -#undef BLINK_AT_RAMP_CEILING +#undef BLINK_AT_RAMP_CEIL #undef BLINK_AT_RAMP_MIDDLE #undef BLINK_AT_RAMP_FLOOR @@ -32,9 +32,9 @@ // use 2.0 A as the ceiling, 2.5 A only for turbo // start both ramps at the bottom; even moon throws a long way on the GT #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL POWER_80PX +#define RAMP_SMOOTH_CEIL POWER_80PX #define RAMP_DISCRETE_FLOOR 1 -#define RAMP_DISCRETE_CEIL POWER_80PX +#define RAMP_DISCRETE_CEIL POWER_80PX #define RAMP_DISCRETE_STEPS 7 // stop panicking at 80% power, this light has plenty of thermal mass diff --git a/spaghetti-monster/anduril/cfg-blf-lantern.h b/spaghetti-monster/anduril/cfg-blf-lantern.h index e12a453..39ae7b8 100644 --- a/spaghetti-monster/anduril/cfg-blf-lantern.h +++ b/spaghetti-monster/anduril/cfg-blf-lantern.h @@ -50,13 +50,13 @@ // because this lantern isn't overpowered #define RAMP_STYLE 1 // 0 = smooth, 1 = stepped #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 150 +#define RAMP_SMOOTH_CEIL 150 #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 5 -#define MUGGLE_FLOOR 15 // about 20 lm -#define MUGGLE_CEILING 115 // about 350 lm +#define SIMPLE_UI_FLOOR 15 // about 20 lm +#define SIMPLE_UI_CEIL 115 // about 350 lm #define USE_SOS_MODE #define USE_SOS_MODE_IN_BLINKY_GROUP @@ -83,6 +83,6 @@ #undef BLINK_AT_RAMP_FLOOR #endif // except the top... blink at the top -#ifndef BLINK_AT_RAMP_CEILING -#define BLINK_AT_RAMP_CEILING +#ifndef BLINK_AT_RAMP_CEIL +#define BLINK_AT_RAMP_CEIL #endif diff --git a/spaghetti-monster/anduril/cfg-emisar-d18.h b/spaghetti-monster/anduril/cfg-emisar-d18.h index 72f0589..ea02f8c 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d18.h +++ b/spaghetti-monster/anduril/cfg-emisar-d18.h @@ -32,13 +32,13 @@ // higher floor than default, and stop at highest regulated level #define RAMP_DISCRETE_FLOOR 25 -#define RAMP_DISCRETE_CEIL MAX_Nx7135 +#define RAMP_DISCRETE_CEIL MAX_Nx7135 #define RAMP_DISCRETE_STEPS 7 // only blink at max regulated level and ceiling #define BLINK_AT_RAMP_MIDDLE #define BLINK_AT_RAMP_MIDDLE_1 MAX_Nx7135 -#define BLINK_AT_RAMP_CEILING +#define BLINK_AT_RAMP_CEIL // stop panicking at about ~40% power or ~5000 lm #define THERM_FASTER_LEVEL 125 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4.h b/spaghetti-monster/anduril/cfg-emisar-d4.h index 7700d88..818e55e 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4.h @@ -12,10 +12,10 @@ #define QUARTERSPEED_LEVEL 6 #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 120 +#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_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 // stop panicking at ~30% power or ~1200 lm diff --git a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h index 0f3a217..7652bf5 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h @@ -27,17 +27,17 @@ #define QUARTERSPEED_LEVEL 8 #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 130 +#define RAMP_SMOOTH_CEIL 130 // 20, 38, 56, 75, [93], 111, 130 #define RAMP_DISCRETE_FLOOR 20 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 //#define DEFAULT_LEVEL MAX_Nx7135 #define STROBE_BRIGHTNESS MAX_LEVEL -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING MAX_Nx7135 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL MAX_Nx7135 // 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 cbb5891..d620213 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2-nofet.h @@ -23,7 +23,7 @@ #undef RAMP_DISCRETE_CEIL #undef RAMP_DISCRETE_STEPS #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL 150 +#define RAMP_DISCRETE_CEIL 150 #define RAMP_DISCRETE_STEPS 5 #define CANDLE_AMPLITUDE 60 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h index 175774c..92c4252 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h @@ -26,16 +26,16 @@ #undef RAMP_DISCRETE_STEPS #define RAMP_SMOOTH_FLOOR 3 // level 1 is unreliable -#define RAMP_SMOOTH_CEIL 130 +#define RAMP_SMOOTH_CEIL 130 // 10, 30, [50], 70, 90, 110, 130 (plus [150] on turbo) #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#undef MUGGLE_FLOOR -#undef MUGGLE_CEILING -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 70 +#undef SIMPLE_UI_FLOOR +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 70 // make candle mode wobble more #define CANDLE_AMPLITUDE 32 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h index bc0cf60..83f2c3a 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h @@ -42,14 +42,14 @@ #define QUARTERSPEED_LEVEL 2 #define RAMP_SMOOTH_FLOOR 3 // level 1 is unreliable -#define RAMP_SMOOTH_CEIL 120 +#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_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 65 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 65 // stop panicking at ~25% power or ~1000 lm #define THERM_FASTER_LEVEL 100 diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.h index 241ca7e..dc96c47 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4v2.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.h @@ -31,10 +31,10 @@ #define QUARTERSPEED_LEVEL 6 #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 120 +#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_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 // stop panicking at ~30% power or ~1200 lm diff --git a/spaghetti-monster/anduril/cfg-ff-e01.h b/spaghetti-monster/anduril/cfg-ff-e01.h index 3b47165..7b3578a 100644 --- a/spaghetti-monster/anduril/cfg-ff-e01.h +++ b/spaghetti-monster/anduril/cfg-ff-e01.h @@ -2,8 +2,8 @@ // most of the good stuff is in the FFUI config; just copy it #include "../fireflies-ui/cfg-ff-e01.h" -#ifndef BLINK_AT_RAMP_CEILING -#define BLINK_AT_RAMP_CEILING +#ifndef BLINK_AT_RAMP_CEIL +#define BLINK_AT_RAMP_CEIL #endif // 20, 38, 56, 75, [93], 111, 130 (93 is highest regulated) diff --git a/spaghetti-monster/anduril/cfg-ff-pl47.h b/spaghetti-monster/anduril/cfg-ff-pl47.h index e6907c1..20d0306 100644 --- a/spaghetti-monster/anduril/cfg-ff-pl47.h +++ b/spaghetti-monster/anduril/cfg-ff-pl47.h @@ -48,20 +48,20 @@ // 10, 28, 46, 65, 83, 101, 120 (83 is highest regulated) #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL 120 +#define RAMP_DISCRETE_CEIL 120 #define RAMP_DISCRETE_STEPS 7 // ~25 lm to ~300 lm -#define MUGGLE_FLOOR 30 -#define MUGGLE_CEILING MAX_1x7135 +#define SIMPLE_UI_FLOOR 30 +#define SIMPLE_UI_CEIL MAX_1x7135 // ~50 lm to ~500 lm -//#define MUGGLE_FLOOR 40 -//#define MUGGLE_CEILING 90 +//#define SIMPLE_UI_FLOOR 40 +//#define SIMPLE_UI_CEIL 90 // regulate down faster when the FET is active, slower otherwise #define THERM_FASTER_LEVEL 135 // throttle back faster when high // don't do this #undef BLINK_AT_RAMP_MIDDLE -#undef BLINK_AT_RAMP_CEILING +#undef BLINK_AT_RAMP_CEIL diff --git a/spaghetti-monster/anduril/cfg-ff-pl47g2.h b/spaghetti-monster/anduril/cfg-ff-pl47g2.h index cab008c..8ccd6d6 100644 --- a/spaghetti-monster/anduril/cfg-ff-pl47g2.h +++ b/spaghetti-monster/anduril/cfg-ff-pl47g2.h @@ -39,17 +39,17 @@ // 10, 28, 46, 65, [83], 101, 120 #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL 120 +#define RAMP_DISCRETE_CEIL 120 #define RAMP_DISCRETE_STEPS 7 // ~25 lm to ~300 lm -#define MUGGLE_FLOOR 30 -#define MUGGLE_CEILING MAX_1x7135 +#define SIMPLE_UI_FLOOR 30 +#define SIMPLE_UI_CEIL MAX_1x7135 // regulate down faster when the FET is active, slower otherwise #define THERM_FASTER_LEVEL 135 // throttle back faster when high // don't do this #undef BLINK_AT_RAMP_MIDDLE -#undef BLINK_AT_RAMP_CEILING +#undef BLINK_AT_RAMP_CEIL diff --git a/spaghetti-monster/anduril/cfg-ff-rot66.h b/spaghetti-monster/anduril/cfg-ff-rot66.h index a87b66d..cefe48d 100644 --- a/spaghetti-monster/anduril/cfg-ff-rot66.h +++ b/spaghetti-monster/anduril/cfg-ff-rot66.h @@ -40,5 +40,5 @@ // don't do this #undef BLINK_AT_RAMP_MIDDLE -#undef BLINK_AT_RAMP_CEILING +#undef BLINK_AT_RAMP_CEIL diff --git a/spaghetti-monster/anduril/cfg-ff-rot66g2.h b/spaghetti-monster/anduril/cfg-ff-rot66g2.h index 4e353a8..d4c8ccf 100644 --- a/spaghetti-monster/anduril/cfg-ff-rot66g2.h +++ b/spaghetti-monster/anduril/cfg-ff-rot66g2.h @@ -40,10 +40,10 @@ // higher floor than default, and stop at highest regulated level #define RAMP_SMOOTH_FLOOR 1 // ~0.3 lm -#define RAMP_SMOOTH_CEIL MAX_Nx7135 // ~1200 lm +#define RAMP_SMOOTH_CEIL MAX_Nx7135 // ~1200 lm // 10, 28, 46, [65], 83, 101, [120] #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL MAX_Nx7135 +#define RAMP_DISCRETE_CEIL MAX_Nx7135 #define RAMP_DISCRETE_STEPS 7 diff --git a/spaghetti-monster/anduril/cfg-fw3a-nofet.h b/spaghetti-monster/anduril/cfg-fw3a-nofet.h index a6be10d..3c6f461 100644 --- a/spaghetti-monster/anduril/cfg-fw3a-nofet.h +++ b/spaghetti-monster/anduril/cfg-fw3a-nofet.h @@ -28,9 +28,9 @@ #undef RAMP_DISCRETE_STEPS #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 150 +#define RAMP_SMOOTH_CEIL 150 // 10, 33, 56, 80, 103, 126, 150 #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h index 28c77c2..6dce2eb 100644 --- a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h +++ b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h @@ -16,7 +16,7 @@ // don't blink during ramp, it's irrelevant and annoying on this light -#define BLINK_AT_RAMP_CEILING +#define BLINK_AT_RAMP_CEIL #undef BLINK_AT_RAMP_MIDDLE #undef BLINK_AT_RAMP_FLOOR @@ -37,12 +37,12 @@ #define QUARTERSPEED_LEVEL 8 #define RAMP_SMOOTH_FLOOR 1 // ~0.3 lm -#define RAMP_SMOOTH_CEIL 130 // ~??? lm +#define RAMP_SMOOTH_CEIL 130 // ~??? lm // 14/135/6 = 14, 38, 62, 86, [110], 135 // 20/110/7 = 20, 35, 50, [65], 80, 95, [110] // 15/130/7 = 15, 34, 53, 72, 91, [110], 130 <-- #define RAMP_DISCRETE_FLOOR 15 // ~?? lm -#define RAMP_DISCRETE_CEIL 130 // ~??? lm +#define RAMP_DISCRETE_CEIL 130 // ~??? lm #define RAMP_DISCRETE_STEPS 7 // ??, ??, ... lm diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h index 0585b38..ea28900 100644 --- a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h +++ b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h @@ -15,7 +15,7 @@ // don't blink during ramp, it's irrelevant and annoying on this light -#define BLINK_AT_RAMP_CEILING +#define BLINK_AT_RAMP_CEIL #undef BLINK_AT_RAMP_MIDDLE #undef BLINK_AT_RAMP_FLOOR @@ -33,10 +33,10 @@ #define QUARTERSPEED_LEVEL 6 #define RAMP_SMOOTH_FLOOR 1 // ~2.5 lm -#define RAMP_SMOOTH_CEIL 120 // ~5400 lm +#define RAMP_SMOOTH_CEIL 120 // ~5400 lm // 20, 36, 53, [70], 86, 103, 120 #define RAMP_DISCRETE_FLOOR 20 // 35 lm -#define RAMP_DISCRETE_CEIL 120 // ~5400 lm +#define RAMP_DISCRETE_CEIL 120 // ~5400 lm #define RAMP_DISCRETE_STEPS 7 // 35, 108, 280, 626, 1500, 2930, 5400 lm #define USE_TENCLICK_THERMAL_CONFIG // by request diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h index 617801f..c45fea6 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h @@ -37,14 +37,14 @@ #endif #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 130 +#define RAMP_SMOOTH_CEIL 130 // 10, 30, [50], 70, 90, 110, 130 #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 70 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 70 // 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 fd98979..a95c918 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h @@ -36,14 +36,14 @@ #define QUARTERSPEED_LEVEL 2 #define RAMP_SMOOTH_FLOOR 3 // level 1 is unreliable -#define RAMP_SMOOTH_CEIL 120 +#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_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 65 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 65 // stop panicking at ~25% power or ~1000 lm #define THERM_FASTER_LEVEL 120 diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1.h b/spaghetti-monster/anduril/cfg-noctigon-k1.h index 4f2c2cc..d844961 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k1.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k1.h @@ -38,14 +38,14 @@ #endif #define RAMP_SMOOTH_FLOOR 1 -#define RAMP_SMOOTH_CEIL 130 +#define RAMP_SMOOTH_CEIL 130 // 10, 30, [50], 70, 90, 110, 130 #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 70 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 70 // 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 19cbc23..8767fef 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h +++ b/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h @@ -25,16 +25,16 @@ #undef RAMP_DISCRETE_STEPS #define RAMP_SMOOTH_FLOOR 3 // level 1 is unreliable -#define RAMP_SMOOTH_CEIL 130 +#define RAMP_SMOOTH_CEIL 130 // 10, 30, [50], 70, 90, 110, 130 (plus [150] on turbo) #define RAMP_DISCRETE_FLOOR 10 -#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL +#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#undef MUGGLE_FLOOR -#undef MUGGLE_CEILING -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 70 +#undef SIMPLE_UI_FLOOR +#undef SIMPLE_UI_CEIL +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 70 // 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 dc71655..874d9b8 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-kr4.h +++ b/spaghetti-monster/anduril/cfg-noctigon-kr4.h @@ -31,14 +31,14 @@ #define QUARTERSPEED_LEVEL 2 #define RAMP_SMOOTH_FLOOR 3 // level 1 is unreliable -#define RAMP_SMOOTH_CEIL 120 +#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_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR -#define MUGGLE_CEILING 65 +#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR +#define SIMPLE_UI_CEIL 65 // stop panicking at ~25% power or ~1000 lm #define THERM_FASTER_LEVEL 100 diff --git a/spaghetti-monster/anduril/cfg-sofirn-sp36.h b/spaghetti-monster/anduril/cfg-sofirn-sp36.h index d808e2a..0bd5a5f 100644 --- a/spaghetti-monster/anduril/cfg-sofirn-sp36.h +++ b/spaghetti-monster/anduril/cfg-sofirn-sp36.h @@ -19,8 +19,8 @@ #ifdef BLINK_AT_RAMP_MIDDLE #undef BLINK_AT_RAMP_MIDDLE #endif -#ifdef BLINK_AT_RAMP_CEILING -#undef BLINK_AT_RAMP_CEILING +#ifdef BLINK_AT_RAMP_CEIL +#undef BLINK_AT_RAMP_CEIL #endif // stop panicking at ~60% power or ~3000 lm |
