pwm.c: channels running - visible from the outside

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

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 076d032c7b4a713e4a9db98e79ddf6381ed835ab..9aa6d8074689dd9b5e08de41e2d0a23e805e4a60 100644 (file)
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -5,7 +5,10 @@
 typedef struct {
        uint16_t target, pwm;
        int16_t err_sum;
-       unsigned char mode, state, probe_steady;
+       unsigned char mode, state;
+       union {
+               unsigned char probe_steady, mode_changed;
+       };
        uint16_t mode_pwm[N_PWMLED_MODES];
        int16_t err_sums[N_PWMLED_MODES];
 } pwmled_t;
@@ -15,49 +18,63 @@ pwmled_t pwmleds[N_PWMLEDS];
 #define PWMLED2_TESTING_WITH_350MA_LED
 
 #define SENSE_MOHM     33      /* 0.033 Ohm */
-#define MA_MOHM_GAIN_TO_ADC(ma, mohm, gain) (\
-       ((unsigned long)(ma))*(mohm) /* voltage at sensing resistor in uV */ \
-       /(1100000UL/gain/1024UL)     /* voltage of ADC reading == 1 */ \
-)
+/*
+ * Voltage in uV at ADC reading == 1 is 1100/gain/1024
+ * ADC module returns sum of 1 << PWMLED_ADC_SHIFT measurements
+ * Voltage in uV measured is current in mA * sense resistance in mOhm
+ */
+#define MA_GAIN_TO_ADC(ma, gain) ((uint16_t) \
+       ((uint32_t)(ma) \
+       * (SENSE_MOHM) \
+       * (1 << (PWMLED_ADC_SHIFT)) \
+       * 1024 \
+       / (1100000/(gain))))
 
 static uint16_t adc_max[N_PWMLEDS] = {
-       MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC(  30, SENSE_MOHM, 20),
-#ifdef PWMLED2_TESTING_WITH_350MA_LED
-       MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM,  1)
+#ifdef TESTING_FW
+       MA_GAIN_TO_ADC( 400, 20),
+       MA_GAIN_TO_ADC(  30, 20),
+       MA_GAIN_TO_ADC( 800,  1)
 #else
-       MA_MOHM_GAIN_TO_ADC(2500, SENSE_MOHM,  1)
+       MA_GAIN_TO_ADC( 900, 20),
+       MA_GAIN_TO_ADC(  30, 20),
+       MA_GAIN_TO_ADC(2500,  1)
 #endif
 };
 
 static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
+#ifdef TESTING_FW
        /* pwmled0 */
-       MA_MOHM_GAIN_TO_ADC(  20, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC(  50, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 20),
+       MA_GAIN_TO_ADC(  50, 20),
+       MA_GAIN_TO_ADC( 100, 20),
+       MA_GAIN_TO_ADC( 200, 20),
+       MA_GAIN_TO_ADC( 350, 20),
        /* pwmled1 */
-       16, 32, 64, 112,
-#if 0
-       MA_MOHM_GAIN_TO_ADC(   5, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC(  12, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC(  16, SENSE_MOHM, 20),
-       MA_MOHM_GAIN_TO_ADC(  20, SENSE_MOHM, 20),
-#endif
+       MA_GAIN_TO_ADC(   5, 20),
+       MA_GAIN_TO_ADC(  10, 20),
+       MA_GAIN_TO_ADC(  15, 20),
+       MA_GAIN_TO_ADC(  20, 20),
        /* pwmled2 */
-       24, 32, 40, 48
-#if 0
-#ifdef PWMLED2_TESTING_WITH_350MA_LED
-       MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC( 140, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC( 250, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM,  1),
+       MA_GAIN_TO_ADC(  50,  1),
+       MA_GAIN_TO_ADC(  80,  1),
+       MA_GAIN_TO_ADC( 150,  1),
+       MA_GAIN_TO_ADC( 200,  1)
 #else
-       MA_MOHM_GAIN_TO_ADC( 150, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC( 700, SENSE_MOHM,  1),
-       MA_MOHM_GAIN_TO_ADC(2400, SENSE_MOHM,  1),
-#endif
+       /* pwmled0 */
+       MA_GAIN_TO_ADC(  50, 20),
+       MA_GAIN_TO_ADC( 100, 20),
+       MA_GAIN_TO_ADC( 200, 20),
+       MA_GAIN_TO_ADC( 350, 20),
+       /* pwmled1 */
+       MA_GAIN_TO_ADC(   5, 20),
+       MA_GAIN_TO_ADC(  10, 20),
+       MA_GAIN_TO_ADC(  18, 20),
+       MA_GAIN_TO_ADC(  23, 20),
+       /* pwmled2 */
+       MA_GAIN_TO_ADC( 150,  1),
+       MA_GAIN_TO_ADC( 300,  1),
+       MA_GAIN_TO_ADC( 800,  1),
+       MA_GAIN_TO_ADC(1500,  1)
 #endif
 };
 
@@ -108,6 +125,7 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
                led->state = ST_ON;
                led->pwm = led->mode_pwm[mode - 1];
                led->err_sum = led->err_sums[mode - 1];
+               led->mode_changed = 1;
                pwm_set(n, led->pwm);
        } else {
                led->state = ST_OFF;
@@ -188,11 +206,15 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
        if (!ST_IS_ON(led->state))
                return;
 
+       if (led->state == ST_ON && led->mode_changed) {
+               led->mode_changed--;
+               return;
+       }
        // FIXME: test for maximum adcval value (adc_max[n])
 
        old_pwm = led->pwm;
 
-       shift = led->state == ST_PROBING ? 3 : 5;
+       shift = led->state == ST_PROBING ? 3 : 8;
 
        sum = ((int32_t)led->pwm << shift)
                + led->err_sum + led->target - adcval;
@@ -204,7 +226,8 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
        sum -= led->pwm << shift;
        led->err_sum = sum;
 
-       if (led->pwm > (PWM_MAX << PWM_STEP_SHIFT)-5) {
+       if (led->pwm >= PWM_MAX
+               || (n == 1 && led->pwm > PWM_MAX/2 && adcval < 0x08)) {
                pwmled_err(n);
                return;
        }