Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni

Conflicts:
	lights.c

diff --git a/lights.c b/lights.c
index 22bfc94ba9f1bd131ad6cc07c86daa761ba69fc9..78bd2e1b2198427f3ebc62aabcbfc9335a89fd4e 100644 (file)
--- a/lights.c
+++ b/lights.c
@@ -6,7 +6,7 @@
 
 volatile uint16_t adcval;
 unsigned char pwmval = 0x10;
-volatile uint16_t adc_exp = 0xd0;
+volatile uint16_t adc_exp = 0x10;
 unsigned char led_is_on = 0;
 volatile unsigned char adccount = 0;
 
@@ -106,7 +106,7 @@ static void inline tmr_handler()
 
        if ((clock & 0x7F) == 0x1F) {
                if (c1 < 0x80) {
-                       adc_exp = 0xc0;
+                       adc_exp = 0x80;
                } else {
                        adc_exp = 0x20;
                }