From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 14 Jun 2012 21:57:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni
X-Git-Tag: gedasymbols-20120913~60
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=commitdiff_plain;h=ac9739610c642b6c79b800b406ffc16a86553e11;hp=9c8fc5246057f13693731a58c814a1f6d40fa70e

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 22bfc94..78bd2e1 100644
--- 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;
 		}