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=b8f702a766f2b9b39b5dac9b16ce0890d4fd6e22;hp=27bdc0e54ce8d4b2d67c67756fc7da80cba44cde;hb=5f604897b4f9a6f0602034f83c70105d94d073e6;hpb=1d5dfb4d273a61877eb5937f93fbd266b782bc7a

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 27bdc0e..b8f702a 100644
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -42,36 +42,28 @@ static uint16_t adc_max[N_PWMLEDS] = {
 #endif
 };
 
-static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
-#ifdef TESTING_FW
-	/* pwmled0 */
+static uint16_t adc_targets_0[] = {
 	MA_GAIN_TO_ADC(  50, 20),
 	MA_GAIN_TO_ADC( 100, 20),
+	MA_GAIN_TO_ADC( 200, 20),
 	MA_GAIN_TO_ADC( 350, 20),
-	/* pwmled1 */
+};
+
+static uint16_t adc_targets_1[] = {
 	MA_GAIN_TO_ADC(   5, 20),
 	MA_GAIN_TO_ADC(  10, 20),
 	MA_GAIN_TO_ADC(  20, 20),
-	/* pwmled2 */
+};
+
+static uint16_t adc_targets_2[] = {
 	MA_GAIN_TO_ADC(  50,  1),
-	MA_GAIN_TO_ADC(  80,  1),
-	MA_GAIN_TO_ADC( 150,  1)
-#else
-	/* pwmled0 */
-	MA_GAIN_TO_ADC(  50, 20),
-	MA_GAIN_TO_ADC( 100, 20),
-	MA_GAIN_TO_ADC( 350, 20),
-	/* pwmled1 */
-	MA_GAIN_TO_ADC(   5, 20),
-	MA_GAIN_TO_ADC(  10, 20),
-	MA_GAIN_TO_ADC(  23, 20),
-	/* pwmled2 */
-	MA_GAIN_TO_ADC( 150,  1),
-	MA_GAIN_TO_ADC( 300,  1),
-	MA_GAIN_TO_ADC(1500,  1)
-#endif
+	MA_GAIN_TO_ADC( 100,  1),
+	MA_GAIN_TO_ADC( 200,  1),
+	MA_GAIN_TO_ADC( 350,  1),
 };
 
+static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES];
+
 #define ST_DISABLED 0
 #define ST_OFF      1
 #define ST_PROBING  2
@@ -99,6 +91,8 @@ void init_pwmled()
 			led->err_sums[j] = 0;
 		}
 	}
+
+	pwmled_set_brightness(PWMLED_BRIGHTNESS(0, 2, 1, 0, 2));
 }
 
 void pwmled_set_mode(unsigned char n, unsigned char mode)
@@ -128,6 +122,26 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 	}
 }
 
+void pwmled_set_brightness(uint16_t brightness)
+{
+	unsigned char i;
+
+	adc_vals[0] = adc_targets_0[brightness & 0x7];
+	adc_vals[1] = adc_targets_0[(brightness >> 3) & 0x7];
+	adc_vals[2] = adc_vals[1];
+
+	adc_vals[3] = adc_targets_1[(brightness >> 6) & 0x7];
+	adc_vals[4] = adc_vals[3];
+	adc_vals[5] = adc_vals[3];
+
+	adc_vals[6] = adc_targets_2[(brightness >> 9) & 0x7];
+	adc_vals[7] = adc_targets_2[(brightness >> 12) & 0x7];
+	adc_vals[8] = adc_vals[7];
+
+	for (i = 0; i < N_PWMLEDS; i++)
+		pwmleds[i].err_sum = 0;
+}
+
 #define PWMLED_PROBE_STEADY_COUNT 10
 
 static inline unsigned char pwmled_probed_ok(unsigned char n, uint16_t old_pwm)