X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fpwmled.c;h=5ddb783b6c3762a8a268d3495670a65e783610bf;hb=92d572709e4653d1475014cc9bd90f87b3622a8d;hp=2640dba05bfc05edcd0c1d0f5e02f5c907919922;hpb=f956c1fa7f47b0e8b8afe323c2eff1b6c2607c2a;p=bike-lights.git

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 2640dba..5ddb783 100644
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -2,14 +2,16 @@
 
 #include "lights.h"
 
-static unsigned char pwm_vals[N_PWMLEDS*N_PWMLED_MODES];
-static unsigned char adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
+static uint16_t pwm_vals[N_PWMLEDS*N_PWMLED_MODES];
+static uint16_t pwm_max[N_PWMLEDS] = { 0x70, 0x70, 0x1F0 };
+static uint16_t adc_max[N_PWMLEDS] = { 0x70, 0x70, 0xF0 };
+static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
 	/* pwmled0 */
 	0x04, 0x14, 0x24, 0x38,
 	/* pwmled1 */
 	0x04, 0x14, 0x24, 0x38,
 	/* pwmled2 */
-	0x04, 0x14, 0x24, 0x38,
+	0x0c, 0x24, 0x48, 0x90,
 };
 
 // TODO: maybe convert this to bitmask to simplify pwmled_needs_adc() ?
@@ -22,13 +24,12 @@ static unsigned char pwmled_state[N_PWMLEDS];
 static unsigned char pwmled_mode[N_PWMLEDS];
 static unsigned char pwmled_mode_set[N_PWMLEDS];
 
-static unsigned char pwm_probes[N_PWMLEDS];
+static uint16_t pwm_probes[N_PWMLEDS];
 
 static void start_probing(unsigned char n)
 {
 	pwmled_state[n] = ST_PROBING;
 	pwm_set(n, 0);
-	pwm_on(n);
 	pwm_probes[n] = 0;
 }
 
@@ -83,11 +84,10 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 	}
 
 	if (mode <= N_PWMLED_MODES) {
-		unsigned char pwmval;
+		uint16_t pwmval;
 		mode--;
 		pwmval = pwm_vals[n*N_PWMLED_MODES+mode];
 		pwm_set(n, pwmval);
-		pwm_on(n);
 #if 0
 		log_byte(pwmval);
 #endif
@@ -100,9 +100,9 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 static void inline probing_adc(unsigned char n, uint16_t adcval)
 {
 	unsigned char need_bigger = 0, i;
-	unsigned char *pwm_p = &pwm_vals[n*N_PWMLED_MODES];
-	unsigned char *adc_p = &adc_vals[n*N_PWMLED_MODES];
-	unsigned char pwm = pwm_probes[n];
+	uint16_t *pwm_p = &pwm_vals[n*N_PWMLED_MODES];
+	uint16_t *adc_p = &adc_vals[n*N_PWMLED_MODES];
+	uint16_t pwm = pwm_probes[n];
 
 #if 0
 	log_byte(0xF4);
@@ -110,7 +110,7 @@ static void inline probing_adc(unsigned char n, uint16_t adcval)
 	log_word(adcval);
 #endif
 
-	if (adcval > 0x100 // Too high
+	if (adcval > adc_max[n] // Too high
 		|| (pwm == 0 && adcval > 0) // non-zero voltage with zero PWM
 		) {
 		pwm_off(n);
@@ -148,7 +148,7 @@ static void inline probing_adc(unsigned char n, uint16_t adcval)
 		return;
 	}
 
-	if (pwm >= 0x70) { // over the maximum!
+	if (pwm >= pwm_max[n]) { // over the maximum!
 		pwm_off(n);
 		pwmled_state[n] = ST_DISABLED;
 		log_byte(0xF2);
@@ -168,7 +168,7 @@ static void inline on_adc(unsigned char n, uint16_t adcval)
 {
 	unsigned char mode = pwmled_mode[n];
 	uint16_t adc_exp     =  adc_vals[n*N_PWMLED_MODES+mode];
-	unsigned char *pwm_p = &pwm_vals[n*N_PWMLED_MODES+mode];
+	uint16_t *pwm_p      = &pwm_vals[n*N_PWMLED_MODES+mode];
 	uint16_t old_pwm     = *pwm_p;
 	uint16_t new_pwm = old_pwm;
 
@@ -193,8 +193,8 @@ static void inline on_adc(unsigned char n, uint16_t adcval)
 	}
 
 	// FIXME: better disconnect detection
-	if (new_pwm > 0x60) { // disconnected?
-		new_pwm = 0x60;
+	if (new_pwm > pwm_max[n]) { // FIXME: disconnected?
+		new_pwm = pwm_max[n];
 	}
 	if (new_pwm < 2) { // short-circuit?
 		new_pwm = 2;
@@ -228,7 +228,7 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 				log_byte(pwmled_state[i]);
 				
 			for (i = 0; i < N_PWMLEDS*N_PWMLED_MODES; i++)
-				log_byte(pwm_vals[i]);
+				log_word(pwm_vals[i]);
 			log_flush();
 			log_set_state(4);
 		}