merged Noctigon K1 branch, which changes a few things...

- added support for 10-bit PWM
- 10-bit ADC voltage divider calibration values instead of 8-bit
- added ability to use different DIDR channels on different hardware
- made dynamic underclocking configurable per build target
- expanded RGB aux LED support
- increased resolution of RGB voltage readout (6 colors instead of 3)
- made party strobe ontime configurable per build target
- added support for an enable/disable pin for a regulator chip

1 files changed, 24 insertions, 15 deletions

diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 8515885..20500cc 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -68,16 +68,25 @@ void set_level(uint8_t level) {
         #if PWM_CHANNELS >= 4
         PWM4_LVL = 0;
         #endif
+        // disable the power channel, if relevant
+        #ifdef LED_ENABLE_PIN
+        LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN);
+        #endif
     } else {
         level --;
 
+        // enable the power channel, if relevant
+        #ifdef LED_ENABLE_PIN
+        LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
+        #endif
+
         #ifdef USE_TINT_RAMPING
         #ifndef TINT_RAMPING_CORRECTION
         #define TINT_RAMPING_CORRECTION 26  // 140% brightness at middle tint
         #endif
         // calculate actual PWM levels based on a single-channel ramp
         // and a global tint value
-        uint8_t brightness = pgm_read_byte(pwm1_levels + level);
+        uint8_t brightness = PWM_GET(pwm1_levels, level);
         uint8_t warm_PWM, cool_PWM;
 
         // auto-tint modes
@@ -110,16 +119,16 @@ void set_level(uint8_t level) {
         #else
 
         #if PWM_CHANNELS >= 1
-        PWM1_LVL = pgm_read_byte(pwm1_levels + level);
+        PWM1_LVL = PWM_GET(pwm1_levels, level);
         #endif
         #if PWM_CHANNELS >= 2
-        PWM2_LVL = pgm_read_byte(pwm2_levels + level);
+        PWM2_LVL = PWM_GET(pwm2_levels, level);
         #endif
         #if PWM_CHANNELS >= 3
-        PWM3_LVL = pgm_read_byte(pwm3_levels + level);
+        PWM3_LVL = PWM_GET(pwm3_levels, level);
         #endif
         #if PWM_CHANNELS >= 4
-        PWM4_LVL = pgm_read_byte(pwm4_levels + level);
+        PWM4_LVL = PWM_GET(pwm4_levels, level);
         #endif
 
         #endif  // ifdef USE_TINT_RAMPING
@@ -143,43 +152,43 @@ void gradual_tick() {
 
     gt --;  // convert 1-based number to 0-based
 
-    uint8_t target;
+    PWM_DATATYPE target;
 
     #if PWM_CHANNELS >= 1
-    target = pgm_read_byte(pwm1_levels + gt);
+    target = PWM_GET(pwm1_levels, gt);
     if ((gt < actual_level)     // special case for FET-only turbo
             && (PWM1_LVL == 0)  // (bypass adjustment period for first step)
-            && (target == 255)) PWM1_LVL = 255;
+            && (target == PWM_TOP)) PWM1_LVL = PWM_TOP;
     else if (PWM1_LVL < target) PWM1_LVL ++;
     else if (PWM1_LVL > target) PWM1_LVL --;
     #endif
     #if PWM_CHANNELS >= 2
-    target = pgm_read_byte(pwm2_levels + gt);
+    target = PWM_GET(pwm2_levels, gt);
     if (PWM2_LVL < target) PWM2_LVL ++;
     else if (PWM2_LVL > target) PWM2_LVL --;
     #endif
     #if PWM_CHANNELS >= 3
-    target = pgm_read_byte(pwm3_levels + gt);
+    target = PWM_GET(pwm3_levels, gt);
     if (PWM3_LVL < target) PWM3_LVL ++;
     else if (PWM3_LVL > target) PWM3_LVL --;
     #endif
     #if PWM_CHANNELS >= 4
-    target = pgm_read_byte(pwm4_levels + gt);
+    target = PWM_GET(pwm4_levels, gt);
     if (PWM4_LVL < target) PWM4_LVL ++;
     else if (PWM4_LVL > target) PWM4_LVL --;
     #endif
 
     // did we go far enough to hit the next defined ramp level?
     // if so, update the main ramp level tracking var
-    if ((PWM1_LVL == pgm_read_byte(pwm1_levels + gt))
+    if ((PWM1_LVL == PWM_GET(pwm1_levels, gt))
         #if PWM_CHANNELS >= 2
-            && (PWM2_LVL == pgm_read_byte(pwm2_levels + gt))
+            && (PWM2_LVL == PWM_GET(pwm2_levels, gt))
         #endif
         #if PWM_CHANNELS >= 3
-            && (PWM3_LVL == pgm_read_byte(pwm3_levels + gt))
+            && (PWM3_LVL == PWM_GET(pwm3_levels, gt))
         #endif
         #if PWM_CHANNELS >= 4
-            && (PWM4_LVL == pgm_read_byte(pwm4_levels + gt))
+            && (PWM4_LVL == PWM_GET(pwm4_levels, gt))
         #endif
         )
     {