pwmled.c: enabling/disabling functions

[bike-lights.git] / pwmled.c

diff --git a/pwmled.c b/pwmled.c
index 4861793ff0fbd0e625df98830bf77e816279bd23..5c816b3351e4b3077f46084baa6cdb5d3045f6da 100644 (file)
--- a/pwmled.c
+++ b/pwmled.c
@@ -12,6 +12,7 @@ static unsigned char adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
        0x04, 0x14, 0x24, 0x38,
 };
 
+// TODO: maybe convert this to bitmask to simplify pwmled_needs_adc() ?
 static unsigned char pwmled_state[N_PWMLEDS];
 #define ST_DISABLED 0
 #define ST_PROBING  1
@@ -42,7 +43,7 @@ void pwmled_init()
        }
 }
 
-unsigned char pwmled_is_on(unsigned char n)
+unsigned char pwmled_needs_adc(unsigned char n)
 {
        unsigned char st = pwmled_state[n];
        if (st == ST_PROBING || st == ST_ON)
@@ -51,6 +52,34 @@ unsigned char pwmled_is_on(unsigned char n)
                return 0;
 }
 
+unsigned char pwmled_enabled(unsigned char n)
+{
+       unsigned char st = pwmled_state[n];
+       if (st == ST_OFF || st == ST_ON)
+               return 1;
+       else
+               return 0;
+}
+
+void pwmled_set_mode(unsigned char n, unsigned char mode)
+{
+       if (!pwmled_enabled(n))
+               return;
+
+       if (mode == 0) {
+               pwm_off(n);
+               pwmled_state[n] = ST_OFF;
+               return;
+       }
+
+       if (mode <= N_PWMLED_MODES) {
+               mode--;
+               pwm_set(n, pwm_vals[n*N_PWMLED_MODES+mode]);
+               pwmled_state[n] = ST_ON;
+               pwmled_mode[n] = mode;
+       }
+}
+
 static void inline probing_adc(unsigned char n, uint16_t adcval)
 {
        unsigned char need_bigger = 0, i;
@@ -59,8 +88,8 @@ static void inline probing_adc(unsigned char n, uint16_t adcval)
        unsigned char pwm = pwm_probes[n];
 
 #if 0
-       log_byte(n);
        log_byte(0xF4);
+       log_byte(n);
        log_word(adcval);
 #endif
 
@@ -95,17 +124,17 @@ static void inline probing_adc(unsigned char n, uint16_t adcval)
                pwm_off(n);
                // pwm_set(n, 0);
                pwmled_state[n] = ST_OFF;
-               log_byte(n);
                log_byte(0xF1);
+               log_byte(n);
 
                return;
        }
 
-       if (pwm >= 0x60) { // over the maximum!
+       if (pwm >= 0x70) { // over the maximum!
+               pwm_off(n);
                pwmled_state[n] = ST_DISABLED;
-               log_byte(n);
                log_byte(0xF2);
-               pwm_off(n);
+               log_byte(n);
                // pwm_set(n, 0);
                return;
        }