Made high levels regulate down even faster. Added missing save_config() at the end of, um, config modes.

Fixed ramp table indentation.

2 files changed, 14 insertions, 13 deletions

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index a29adae..2b958cc 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -587,7 +587,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #endif
         #ifdef USE_SET_LEVEL_GRADUALLY
         // make thermal adjustment speed scale with magnitude
-        if (arg & 1) return MISCHIEF_MANAGED;  // adjust slower
+        if ((arg & 1) && (actual_level < THERM_DOUBLE_SPEED_LEVEL)) {
+            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
+        }
         // [int(62*4 / (x**0.8)) for x in (1,2,4,8,16,32,64,128)]
         //uint8_t intervals[] = {248, 142, 81, 46, 26, 15, 8, 5};
         // [int(62*4 / (x**0.9)) for x in (1,2,4,8,16,32,64,128)]
@@ -600,12 +602,10 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (target_level > actual_level) diff = target_level - actual_level;
         else {
             diff = actual_level - target_level;
-            // if we're on a really high mode, drop faster
-            if (actual_level >= THERM_DOUBLE_SPEED_LEVEL) {
-                diff <<= 1;
-            }
         }
         uint8_t magnitude = 0;
+        // if we're on a really high mode, drop faster
+        if (actual_level >= THERM_DOUBLE_SPEED_LEVEL) { magnitude ++; }
         while (diff) {
             magnitude ++;
             diff >>= 1;
@@ -1253,6 +1253,7 @@ uint8_t config_state_base(EventPtr event, uint16_t arg,
         else {
             // TODO: blink out some sort of success pattern
             savefunc();
+            save_config();
             //set_state(retstate, retval);
             pop_state();
         }
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index b942ec0..14c8dae 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -72,14 +72,14 @@ PROGMEM const uint8_t pwm4_levels[] = { PWM4_LEVELS };
     PROGMEM const uint8_t 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,2,5,7,10,13,16,19,23,26,30,34,38,42,47,51,56,61,66,72,77,83,89,95,101,108,115,122,129,136,144,152,160,168,177,186,195,204,214,224,234,244,255 };
     #define MAX_1x7135 33
   #elif RAMP_LENGTH == 150
-      // ../../bin/level_calc.py 1 65 7135 1 0.8 150
-      // ... mixed with this:
-      // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
-      PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,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,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
-      PROGMEM const uint8_t 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,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
-      #define MAX_1x7135 65
-      #define HALFSPEED_LEVEL 14
-      #define QUARTERSPEED_LEVEL 5
+    // ../../bin/level_calc.py 1 65 7135 1 0.8 150
+    // ... mixed with this:
+    // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,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,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t 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,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
+    #define MAX_1x7135 65
+    #define HALFSPEED_LEVEL 14
+    #define QUARTERSPEED_LEVEL 5
   #endif
 #elif PWM_CHANNELS == 3
   #if RAMP_LENGTH == 50