X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fpwmled.c;h=db1cb862c75f21043acb8d34e668ff4037e63429;hp=70cbcf1429ca6d71bc0c6d432111d9ae72bbeca3;hb=6737fabc05aa6e7975d4fd47ad0f4a2128124351;hpb=cb10e19fb7311df4c3c14b64064c3d9a44fdacd1

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 70cbcf1..db1cb86 100644
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -48,7 +48,7 @@ static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
 	MA_GAIN_TO_ADC(  50, 20),
 	MA_GAIN_TO_ADC( 100, 20),
 	MA_GAIN_TO_ADC( 200, 20),
-	MA_GAIN_TO_ADC( 300, 20),
+	MA_GAIN_TO_ADC( 350, 20),
 	/* pwmled1 */
 	MA_GAIN_TO_ADC(   5, 20),
 	MA_GAIN_TO_ADC(  10, 20),
@@ -56,23 +56,23 @@ static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
 	MA_GAIN_TO_ADC(  20, 20),
 	/* pwmled2 */
 	MA_GAIN_TO_ADC(  50,  1),
-	MA_GAIN_TO_ADC( 100,  1),
+	MA_GAIN_TO_ADC(  80,  1),
 	MA_GAIN_TO_ADC( 150,  1),
 	MA_GAIN_TO_ADC( 200,  1)
 #else
 	/* pwmled0 */
+	MA_GAIN_TO_ADC(  50, 20),
 	MA_GAIN_TO_ADC( 100, 20),
-	MA_GAIN_TO_ADC( 300, 20),
-	MA_GAIN_TO_ADC( 700, 20),
-	MA_GAIN_TO_ADC( 800, 20),
+	MA_GAIN_TO_ADC( 200, 20),
+	MA_GAIN_TO_ADC( 350, 20),
 	/* pwmled1 */
 	MA_GAIN_TO_ADC(   5, 20),
 	MA_GAIN_TO_ADC(  10, 20),
 	MA_GAIN_TO_ADC(  18, 20),
 	MA_GAIN_TO_ADC(  23, 20),
 	/* pwmled2 */
-	MA_GAIN_TO_ADC( 200,  1),
-	MA_GAIN_TO_ADC( 400,  1),
+	MA_GAIN_TO_ADC( 150,  1),
+	MA_GAIN_TO_ADC( 300,  1),
 	MA_GAIN_TO_ADC( 800,  1),
 	MA_GAIN_TO_ADC(1500,  1)
 #endif
@@ -94,10 +94,11 @@ void init_pwmled()
 		pwmled_t *led = pwmleds + i;
 		led->err_sum = 0;
 		led->target = adc_vals[i*N_PWMLED_MODES];
-		led->pwm = 0;
 		led->mode = 1;
-		led->state = ST_PROBING;
 		led->probe_steady = 0;
+		led->state = ST_PROBING;
+		led->pwm = 1;
+		pwm_set(i, led->pwm);
 
 		for (j = 0; j < N_PWMLED_MODES; j++) {
 			led->mode_pwm[j] = 0;
@@ -214,7 +215,7 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 
 	old_pwm = led->pwm;
 
-	shift = led->state == ST_PROBING ? 3 : 5;
+	shift = led->state == ST_PROBING ? 3 : 8;
 
 	sum = ((int32_t)led->pwm << shift)
 		+ led->err_sum + led->target - adcval;
@@ -227,7 +228,7 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 	led->err_sum = sum;
 
 	if (led->pwm >= PWM_MAX
-		|| (n == 1 && led->pwm > PWM_MAX/4 && adcval < 0x08)) {
+		|| (n == 1 && led->pwm > PWM_MAX/2 && adcval < 0x08)) {
 		pwmled_err(n);
 		return;
 	}