newer TS10 ramp, more low modes (max 7135 at ramp 90/150 like SammysHP's ramp)

1 files changed, 16 insertions, 19 deletions

diff --git a/spaghetti-monster/anduril/cfg-wurkkos-ts10.h b/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
index 506e2b9..0819e42 100644
--- a/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
+++ b/spaghetti-monster/anduril/cfg-wurkkos-ts10.h
@@ -26,7 +26,7 @@
 
 #define RAMP_SIZE 150
 
-#if 0  // 2022 version by SammysHP, smoother and lower but only level 1/150 is underclocked
+#if 0  // 2022 version by SammysHP, smooth but only level 1/150 is underclocked
 // level 1 by hand, for the rest
 // level_calc.py 7.01 2 149 7135 3 0.5 125 FET 1 10 1200 --pwm dyn:63:2048:255
 #define PWM1_LEVELS 1,3,3,4,5,6,7,8,9,10,12,13,14,16,17,19,20,22,24,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,64,67,70,72,75,77,80,82,85,87,89,91,93,95,96,98,99,100,100,101,100,100,99,97,95,93,90,86,82,87,91,96,100,106,111,116,122,128,134,141,147,155,162,169,177,186,194,203,213,222,232,243,254,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
@@ -37,37 +37,34 @@
 #define QUARTERSPEED_LEVEL 2
 #endif
 
-// 7135 at 75/150
-// level_calc.py 5.7895 2 150 7135 -1 0.1 130 FET 1 10 3000 --pwm dyn:72:4096:255:5 --clock 5:21:8.0
-// (with heavy manual tweaks around the clock change points)
-// non-zero part of FET channel calculated with:
-//   level_calc.py 3 1 75 7135 2 500 3000
-#define PWM1_LEVELS  1,1,2,2,5,6,6,7,8,9,9,10,11,11,12,13,14,14,15,15,19,19,19,19,20,21,21,22,23,24,24,25,25,26,27,28,29,30,32,33,35,36,38,39,41,44,46,49,52,55,59,63,67,70,75,80,85,91,97,105,112,119,127,135,143,152,161,171,181,192,204,216,228,241,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,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,2,4,5,7,9,11,13,15,17,19,21,23,25,27,29,32,34,36,39,41,43,46,49,51,54,57,59,62,65,68,71,74,77,80,83,86,90,93,96,100,103,107,110,114,117,121,125,129,133,137,141,145,149,153,157,162,166,170,175,179,184,189,193,198,203,208,213,218,223,228,233,239,244,249,255
-#define PWM_TOPS     4095,2659,3154,1866,2864,2707,2113,2243,2256,2210,1846,1841,1853,1596,1591,1595,1592,1405,1395,1284,1000,903,807,711,707,693,622,593,565,537,486,464,441,420,400,380,362,344,339,322,316,300,293,286,278,277,269,266,263,259,259,258,256,253,253,252,251,251,251,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,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
-
-#define MAX_1x7135 75
-#define DEFAULT_LEVEL 50
+// 7135 at 90/150
+// level_calc.py 5.7895 2 150 7135 0 0.1 125.25 FET 1 10 1200 --pwm dyn:61:4096:255:2.5 --clock 5:11:2.0
+// (with heavy manual tweaks up to ~15/150)
+#define PWM1_LEVELS     1,   1,   2,   2,   3,   3,   4,   5,   6,   6,   8,   9,   9,  10,  10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  19,  20,  21,  22,  23, 23, 24, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 35, 36, 37, 38, 40, 41, 43, 45, 47, 50, 53, 56, 60, 63, 67, 71, 75, 79, 84, 89, 94, 99,104,110,116,122,129,136,143,150,158,166,174,183,192,202,211,222,232,243,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,  0,  0,  0,  0,  0,  0,  0,  0,  2,  3,  5,  7,  8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 29, 31, 34, 37, 39, 42, 45, 48, 51, 54, 58, 61, 65, 68, 72, 76, 80, 84, 88, 93, 97,102,107,112,117,122,127,133,139,145,151,157,163,170,177,183,191,198,205,213,221,229,238,246,255
+#define PWM_TOPS     4095,2893,3917,2806,3252,2703,2684,2660,2640,2370,3000,2900,2630,2549,2246,2193,2030,1961,1889,1716,1642,1569,1497,1428,1290,1232,1176,1122,1070,976,932,890,849,779,745,685,656,605,579,536,514,476,457,424,407,379,364,340,327,314,302,291,280,276,266,262,257,253,253,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,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
+#define MAX_1x7135 90
 #define MIN_THERM_STEPDOWN 60
-#define HALFSPEED_LEVEL 21
+#define HALFSPEED_LEVEL 11
 #define QUARTERSPEED_LEVEL 5
+#define DEFAULT_LEVEL 50
 
 #define RAMP_SMOOTH_FLOOR    1
 #define RAMP_SMOOTH_CEIL     150
-// 20 38 56 [75] 93 111 130
-#define RAMP_DISCRETE_FLOOR  20
+// 10 30 50 70 [90] 110 130
+#define RAMP_DISCRETE_FLOOR  10
 #define RAMP_DISCRETE_CEIL   130
 #define RAMP_DISCRETE_STEPS  7
 
 // at Wurkkos's request, reduce the Simple UI ceiling a little bit
 // (i.e. not 150; original config had it at 144/150, or DD FET 204/255)
-// 20 47 [75] 102 130
-#define SIMPLE_UI_FLOOR  20
+// 10 30 50 70 [90] 110 130
+#define SIMPLE_UI_FLOOR  10
 #define SIMPLE_UI_CEIL   130
-#define SIMPLE_UI_STEPS  5
+#define SIMPLE_UI_STEPS  7
 
 // stop panicking at ~50% power
-#define THERM_FASTER_LEVEL 120  // throttle back faster when high
+#define THERM_FASTER_LEVEL 130  // throttle back faster when high
 
 // show each channel while it scroll by in the menu
 #define USE_CONFIG_COLORS