ambient.c: adjust the day/dawn values

[bike-lights.git] / firmware / pwm.c

diff --git a/firmware/pwm.c b/firmware/pwm.c
index 3ef52c3fd436bc733ab7567b722487981fd3c133..b47227375703f355198f724f63586cdba5937aa7 100644 (file)
--- a/firmware/pwm.c
+++ b/firmware/pwm.c
@@ -1,9 +1,16 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
+#include <util/atomic.h>
 
 #include "lights.h"
 
+#define PWM_STEP_SHIFT 2 /* sub-LSB precision */
+#define PWM_TOP (((PWM_MAX) + (4 << (PWM_STEP_SHIFT))) >> (PWM_STEP_SHIFT))
+#if PWM_TOP > 0x3FF
+#error PWM_TOP too high
+#endif
+
 static uint16_t pwm[N_PWMLEDS];
 static volatile unsigned char step;
 
@@ -37,11 +44,11 @@ void init_pwm()
        TCCR1D = 0;
        TCCR1B = _BV(CS10);                     // no clock prescaling
 
-       TC1H = PWM_MAX >> 8;
-       OCR1C = PWM_MAX & 0xFF;                         // TOP value
+       TC1H = PWM_TOP >> 8;
+       OCR1C = PWM_TOP & 0xFF;                         // TOP value
 
-       TC1H = PWM_MAX >> 8;            // PWM3 is inverted
-       OCR1D = PWM_MAX & 0xFF;
+       TC1H = PWM_TOP >> 8;            // PWM3 is inverted
+       OCR1D = PWM_TOP & 0xFF;
 
        TC1H = 0x00;
        OCR1B = OCR1A = 0;              // initial stride is 0
@@ -67,12 +74,14 @@ void susp_pwm()
 
 void pwm_off(unsigned char n)
 {
-       pwm[n] = 0;
-
-       switch (n) {
-       case 0: DDRB &= ~_BV(PB1); break;
-       case 1: DDRB &= ~_BV(PB3); break;
-       case 2: DDRB &= ~_BV(PB5); break;
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+               pwm[n] = 0;
+
+               switch (n) {
+               case 0: DDRB &= ~_BV(PB1); break;
+               case 1: DDRB &= ~_BV(PB3); break;
+               case 2: DDRB &= ~_BV(PB5); break;
+               }
        }
 }
 
@@ -82,7 +91,7 @@ static void pwm_update_hw(unsigned char n)
        uint16_t stride = (pwm[n] + step) >> PWM_STEP_SHIFT;
 
        if (n == 2)
-               stride = PWM_MAX - stride;
+               stride = PWM_TOP - stride;
 
        hi = stride >> 8;
        lo = stride & 0xFF;
@@ -91,28 +100,34 @@ static void pwm_update_hw(unsigned char n)
        case 0:
                TC1H = hi;
                OCR1A = lo;
-               DDRB |= _BV(PB1);
                break;
        case 1:
                TC1H = hi;
                OCR1B = lo;
-               DDRB |= _BV(PB3);
                break;
        case 2:
                TC1H = hi;
                OCR1D = lo;
-               DDRB |= _BV(PB5);
                break;
        }
 }
 
 void pwm_set(unsigned char n, uint16_t stride)
 {
-       if (((stride + (1 << PWM_STEP_SHIFT)) >> PWM_STEP_SHIFT) >= PWM_MAX)
-               stride = PWM_MAX << PWM_STEP_SHIFT;
+       if (stride > PWM_MAX)
+               stride = PWM_MAX;
 
-       pwm[n] = stride;
-       pwm_update_hw(n);
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+               pwm[n] = stride;
+
+               pwm_update_hw(n);
+
+               switch(n) {
+               case 0: DDRB |= _BV(PB1); break;
+               case 1: DDRB |= _BV(PB3); break;
+               case 2: DDRB |= _BV(PB5); break;
+               }
+       }
 }
 
 void pwm_timer()
@@ -127,18 +142,3 @@ void pwm_timer()
                        pwm_update_hw(i);
 }
 
-#if 0
-static void inline pwm_handler()
-{
-       OCR1A = pwmval[0];
-       OCR1B = pwmval[1];
-       OCR1D = pwmval[2];
-       TIMSK &= ~_BV(TOIE1);
-}
-
-ISR(TIMER1_OVF_vect)
-{
-       pwm_handler();
-}
-#endif
-