X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fambient.c;h=00f5941dc7766bc26c143ce196ddc41d9b5a974a;hb=accd3529556e8deb9a93ec620c7b336e9e12286b;hp=f62620862df49538a5a5ab282fb01d1168ec6f9e;hpb=541892c2955660bdd068dc7bc0a2611592f408d7;p=bike-lights.git diff --git a/firmware/ambient.c b/firmware/ambient.c index f626208..00f5941 100644 --- a/firmware/ambient.c +++ b/firmware/ambient.c @@ -1,10 +1,18 @@ #include +#include #include "lights.h" -#define AMBIENT_VAL_SHIFT 3 -static uint16_t ambient_val; +#define AMBIENT_VAL_SHIFT 2 +static uint16_t ambient_val, ambient_val16; volatile unsigned char ambient_zone; +static unsigned char ambient_min, ambient_max, ambient_16drop; + +/* logging */ +#define AMBIENT_LOG_SIZE 128 +static unsigned char ambient_log_offset_stored EEMEM; +static unsigned char ambient_log_offset; +static unsigned char ambient_log[AMBIENT_LOG_SIZE] EEMEM; /* My photodiode reads 0x00C5 .. 0x033B */ typedef struct { @@ -16,17 +24,52 @@ typedef struct { * and having small overlaps in order to provide a bit of hysteresis. */ static ambient_zone_t ambient_zones[] = { - { 0x0000 , 0x0290<= AMBIENT_LOG_SIZE - 1) + return; + + // 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() @@ -46,6 +89,7 @@ void ambient_zone_changed() void ambient_adc(uint16_t adcval) { unsigned char old_zone = ambient_zone; + unsigned char byte_val, byte_val16; ambient_val += adcval - (ambient_val >> (AMBIENT_VAL_SHIFT - AMBIENT_ADC_SHIFT)); @@ -56,6 +100,22 @@ void ambient_adc(uint16_t adcval) while (ambient_zones[ambient_zone].hi < ambient_val) ambient_zone++; + 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) { log_byte(0xab);