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=72e13323a9d6124ba863a70a71dc676af916a876;hp=c6c6a654ab67e1bd974366feefd575e98af95f55;hb=c30006aaf666f7cff3a6ab949c613c2f8cc6163b;hpb=20177f823fc0effcc9c5c389a629294c5ed367a1

diff --git a/firmware/ambient.c b/firmware/ambient.c
index c6c6a65..72e1332 100644
--- a/firmware/ambient.c
+++ b/firmware/ambient.c
@@ -2,6 +2,7 @@
 
 #include "lights.h"
 
+#define AMBIENT_VAL_SHIFT 2
 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, 0x3120 }, // dark
-	{ 0x30f0, 0x5000 },
-	{ 0x4c00, 0x8000 },
-	{ 0x7800, 0xffff }
+	{ 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
 };
 #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 >> 6);
+	ambient_val += adcval - (ambient_val
+		>> (AMBIENT_VAL_SHIFT - AMBIENT_ADC_SHIFT));
 
 	while (ambient_zones[ambient_zone].lo > ambient_val)
 		ambient_zone--;