X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fambient.c;h=f62620862df49538a5a5ab282fb01d1168ec6f9e;hp=143ffc49e1bf98d8ad5c5ae42566aac38c907e52;hb=541892c2955660bdd068dc7bc0a2611592f408d7;hpb=6193f6a3200efa660bbbe406e317fe7fa0473de0

diff --git a/firmware/ambient.c b/firmware/ambient.c
index 143ffc4..f626208 100644
--- a/firmware/ambient.c
+++ b/firmware/ambient.c
@@ -2,6 +2,7 @@
 
 #include "lights.h"
 
+#define AMBIENT_VAL_SHIFT 3
 static uint16_t ambient_val;
 volatile unsigned char ambient_zone;
 
@@ -15,10 +16,10 @@ typedef struct {
  * and having small overlaps in order to provide a bit of hysteresis.
  */
 static ambient_zone_t ambient_zones[] = {
-	{ 0x0000, 0xa400 }, // dark
-	{ 0xa000, 0xc000 },
-	{ 0xbe00, 0xc800 },
-	{ 0xc600, 0xffff }
+	{ 0x0000                   , 0x0290<<AMBIENT_VAL_SHIFT }, // dark
+	{ 0x0280<<AMBIENT_VAL_SHIFT, 0x0300<<AMBIENT_VAL_SHIFT }, // evening
+	{ 0x02f8<<AMBIENT_VAL_SHIFT, 0x0320<<AMBIENT_VAL_SHIFT }, // dawn
+	{ 0x0318<<AMBIENT_VAL_SHIFT, 0xffff                    }, // day
 };
 #define N_AMBIENT_ZONES (sizeof(ambient_zones)/sizeof(ambient_zones[0]))
 
@@ -46,7 +47,8 @@ void ambient_adc(uint16_t adcval)
 {
 	unsigned char old_zone = ambient_zone;
 
-	ambient_val += adcval - (ambient_val >> 3);
+	ambient_val += adcval - (ambient_val
+		>> (AMBIENT_VAL_SHIFT - AMBIENT_ADC_SHIFT));
 
 	while (ambient_zones[ambient_zone].lo > ambient_val)
 		ambient_zone--;