From 215a56b08586dcf4352b6eb2713f5238a4d5b360 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 13 Sep 2018 03:44:23 -0600
Subject: Added tint ramping.  Not tested yet.  Also added BLF Lantern build
 target.

---
 spaghetti-monster/fsm-ramping.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'spaghetti-monster/fsm-ramping.c')

diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 6cdf5e6..0492943 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -25,9 +25,20 @@
 
 void set_level(uint8_t level) {
     actual_level = level;
+
+    #ifdef USE_TINT_RAMPING
+    // 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 warm_PWM, cool_PWM;
+    cool_PWM = (uint16_t)tint * brightness / 255;
+    warm_PWM = brightness - cool_PWM;
+    #endif
+
     #ifdef USE_SET_LEVEL_GRADUALLY
     gradual_target = level;
     #endif
+
     #ifdef USE_INDICATOR_LED
     #ifdef USE_INDICATOR_LED_WHILE_RAMPING
     if (! go_to_standby)
@@ -40,6 +51,7 @@ void set_level(uint8_t level) {
         indicator_led(0);
     #endif
     #endif
+
     //TCCR0A = PHASE;
     if (level == 0) {
         #if PWM_CHANNELS >= 1
@@ -56,6 +68,12 @@ void set_level(uint8_t level) {
         #endif
     } else {
         level --;
+
+        #ifdef USE_TINT_RAMPING
+        PWM1_LVL = warm_PWM;
+        PWM2_LVL = cool_PWM;
+        #else
+
         #if PWM_CHANNELS >= 1
         PWM1_LVL = pgm_read_byte(pwm1_levels + level);
         #endif
@@ -68,6 +86,8 @@ void set_level(uint8_t level) {
         #if PWM_CHANNELS >= 4
         PWM4_LVL = pgm_read_byte(pwm4_levels + level);
         #endif
+
+        #endif  // ifdef USE_TINT_RAMPING
     }
     #ifdef USE_DYNAMIC_UNDERCLOCKING
     auto_clock_speed();
-- 
cgit v1.2.3


From 4b93b02d6d966f4bda4ea90499601b52430c62f8 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 13 Sep 2018 04:30:02 -0600
Subject: fixed tint ramp brightness being off by one level, and eliminated
 bias toward first PWM channel

---
 spaghetti-monster/fsm-ramping.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'spaghetti-monster/fsm-ramping.c')

diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 0492943..ee816dd 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -26,15 +26,6 @@
 void set_level(uint8_t level) {
     actual_level = level;
 
-    #ifdef USE_TINT_RAMPING
-    // 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 warm_PWM, cool_PWM;
-    cool_PWM = (uint16_t)tint * brightness / 255;
-    warm_PWM = brightness - cool_PWM;
-    #endif
-
     #ifdef USE_SET_LEVEL_GRADUALLY
     gradual_target = level;
     #endif
@@ -70,6 +61,13 @@ void set_level(uint8_t level) {
         level --;
 
         #ifdef USE_TINT_RAMPING
+        // 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 warm_PWM, cool_PWM;
+        cool_PWM = (((uint16_t)tint * (uint16_t)brightness) + 127) / 255;
+        warm_PWM = brightness - cool_PWM;
+
         PWM1_LVL = warm_PWM;
         PWM2_LVL = cool_PWM;
         #else
-- 
cgit v1.2.3