logic for setting brightness

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

diff --git a/firmware/ambient.c b/firmware/ambient.c
index 548ff698571b989af6ebbc9395890c97c4418a29..48a752d4b35bf744fcf11992684a2b1fef521e44 100644 (file)
--- a/firmware/ambient.c
+++ b/firmware/ambient.c
@@ -4,9 +4,9 @@
 #include "lights.h"
 
 #define AMBIENT_VAL_SHIFT 2
-static uint16_t ambient_val;
+static uint16_t ambient_val, ambient_val16;
 volatile unsigned char ambient_zone;
-static unsigned char ambient_min, ambient_max;
+static unsigned char ambient_min, ambient_max, ambient_16drop;
 
 /* logging */
 #define AMBIENT_LOG_SIZE 128
@@ -24,19 +24,21 @@ typedef struct {
  * and having small overlaps in order to provide a bit of hysteresis.
  */
 static ambient_zone_t ambient_zones[] = {
-       { 0x0000                   , 0x0290<<AMBIENT_VAL_SHIFT }, // dark
-       { 0x0280<<AMBIENT_VAL_SHIFT, 0x0300<<AMBIENT_VAL_SHIFT }, // evening
-       { 0x02f8<<AMBIENT_VAL_SHIFT, 0x0310<<AMBIENT_VAL_SHIFT }, // dawn
-       { 0x0308<<AMBIENT_VAL_SHIFT, 0xffff                    }, // day
+       { 0x0000                   , 0x0270<<AMBIENT_VAL_SHIFT }, // dark
+       { 0x0260<<AMBIENT_VAL_SHIFT, 0x02e0<<AMBIENT_VAL_SHIFT }, // evening
+       { 0x02d0<<AMBIENT_VAL_SHIFT, 0x0306<<AMBIENT_VAL_SHIFT }, // dawn
+       { 0x0302<<AMBIENT_VAL_SHIFT, 0xffff                    }, // day
 };
 #define N_AMBIENT_ZONES (sizeof(ambient_zones)/sizeof(ambient_zones[0]))
 
 void init_ambient()
 {
        ambient_val = 0;
+       ambient_val16 = 0;
        ambient_max = 0;
        ambient_min = 0xFF;
        ambient_zone = 1;
+       ambient_16drop = 0;
 
        ambient_log_offset = eeprom_read_byte(&ambient_log_offset_stored);
 
@@ -61,31 +63,25 @@ void ambient_log_min_max()
        if (ambient_log_offset >= AMBIENT_LOG_SIZE - 1)
                return;
 
-       eeprom_write_byte(&ambient_log[ambient_log_offset++], ambient_min);
+       // eeprom_write_byte(&ambient_log[ambient_log_offset++], ambient_min);
        eeprom_write_byte(&ambient_log[ambient_log_offset++], ambient_max);
+       eeprom_write_byte(&ambient_log[ambient_log_offset++], ambient_16drop);
 
        ambient_min = 0xFF;
        ambient_max = 0;
+       ambient_16drop = 0;
 }
 
-void ambient_zone_changed()
+static inline void ambient_zone_changed()
 {
-#if 1
-       log_byte(0xab);
-       log_byte(ambient_zone);
-       log_word(ambient_val);
-       log_flush();
-#endif
-
-       // led_set_pattern(N_PWMLEDS, status_led_pattern_select());
-       // led_set_pattern(N_PWMLEDS+1, illumination_led_pattern_select());
-       // pattern_reload();
+       pwmled_select_brightness();
+       pattern_reload();
 }
 
 void ambient_adc(uint16_t adcval)
 {
        unsigned char old_zone = ambient_zone;
-       unsigned char byte_val;
+       unsigned char byte_val, byte_val16;
 
        ambient_val += adcval - (ambient_val
                >> (AMBIENT_VAL_SHIFT - AMBIENT_ADC_SHIFT));
@@ -96,21 +92,30 @@ void ambient_adc(uint16_t adcval)
        while (ambient_zones[ambient_zone].hi < ambient_val)
                ambient_zone++;
 
-       byte_val = adcval >> 2;
+       byte_val = ambient_val >> (2 + AMBIENT_VAL_SHIFT - AMBIENT_ADC_SHIFT);
+
+       ambient_val16 += byte_val - (ambient_val16 >> 4);
+       byte_val16 = ambient_val16 >> 4;
+
+       if (byte_val16 > byte_val) {
+               byte_val16 -= byte_val;
+               if (byte_val16 > ambient_16drop)
+                       ambient_16drop = byte_val16;
+       }
 
        if (ambient_min > byte_val)
                ambient_min = byte_val;
 
        if (ambient_max < byte_val)
                ambient_max = byte_val;
-#if 0
        if (old_zone != ambient_zone) {
+#if 0
                log_byte(0xab);
                log_byte(ambient_zone);
                log_word(adcval);
                log_flush();
-       }
-               // ambient_zone_changed();
 #endif
+               ambient_zone_changed();
+       }
 }