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=03d1adb5957df2711b6c7bedf11a9c696ccdec57;hp=6158067c83151d798505711978f03a2536855c63;hb=3e13c7f4abd65b939c1645d77cf6ed5e0124808e;hpb=cede7e08bdc10f43d0e6c3ef130f6ccac76630df

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 6158067..03d1adb 100644
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -11,10 +11,26 @@ typedef struct {
 	};
 	uint16_t mode_pwm[N_PWMLED_MODES];
 	int16_t err_sums[N_PWMLED_MODES];
+	unsigned char modes_not_yet_stable;
 } pwmled_t;
 
 pwmled_t pwmleds[N_PWMLEDS];
 
+/*
+ * Mode stabilization:
+ * when changing brightness via pwmled_set_brightness() below,
+ * we want to converge to the target value as fast as possible. Also,
+ * we would like to somehow initialize the mode 3, which is used as
+ * "mode 2 + other PWMLED on". So after the brightness is set,
+ * we also set pwmleds[n].modes_not_yet_stable to MODE_STABILIZATION_TIME.
+ * When modes_not_yet_stable is non-zero, we allow only mode 2 to be set
+ * regardless of what is fed to pwmled_set_mode. We will then converge
+ * to the target value of mode 2 only, and after MODE_STABILIZATION_TIME
+ * ADC measurements, we copy the mode_pwm value to all other modes.
+ * Only then it is allowed to set the other modes.
+ */
+#define MODE_STABILIZATION_TIME	(2*16)	// two seconds worth of measurements
+
 #define PWMLED2_TESTING_WITH_350MA_LED
 
 #define SENSE_MOHM	33	/* 0.033 Ohm */
@@ -44,8 +60,8 @@ static uint16_t adc_max[N_PWMLEDS] = {
 
 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(  80, 20),
+	MA_GAIN_TO_ADC( 160, 20),
 	MA_GAIN_TO_ADC( 350, 20),
 };
 
@@ -56,10 +72,20 @@ static uint16_t adc_targets_1[] = {
 };
 
 static uint16_t adc_targets_2[] = {
-	MA_GAIN_TO_ADC(  50,  1),
-	MA_GAIN_TO_ADC( 100,  1),
-	MA_GAIN_TO_ADC( 200,  1),
-	MA_GAIN_TO_ADC( 350,  1),
+#ifdef TESTING_FW
+	MA_GAIN_TO_ADC( 120,  1),
+	MA_GAIN_TO_ADC( 160,  1),
+	MA_GAIN_TO_ADC( 240,  1),
+	MA_GAIN_TO_ADC( 320,  1),
+	MA_GAIN_TO_ADC( 460,  1),
+#else
+	MA_GAIN_TO_ADC( 150,  1),
+	MA_GAIN_TO_ADC( 300,  1),
+	MA_GAIN_TO_ADC( 500,  1),
+	MA_GAIN_TO_ADC( 700,  1),
+	MA_GAIN_TO_ADC(1500,  1),
+	MA_GAIN_TO_ADC(2500,  1),
+#endif
 };
 
 static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES];
@@ -110,6 +136,8 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 	led->mode = mode;
 
 	if (mode > 0 && mode <= N_PWMLED_MODES) {
+		if (led->modes_not_yet_stable) // only mode 2 when !stable
+			mode = 2;
 		led->target = adc_vals[n*N_PWMLED_MODES + mode - 1];
 		led->state = ST_ON;
 		led->pwm = led->mode_pwm[mode - 1];
@@ -122,20 +150,39 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 	}
 }
 
+#define CHECK_BRIGHTNESS(var, expr, array) \
+	do { \
+		(var) = (expr); \
+		if ((var) >= sizeof(array)/sizeof(array[0])) \
+			(var) = sizeof(array)/sizeof(array[0]) - 1; \
+	} while (0)
+
 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];
+	CHECK_BRIGHTNESS(i, brightness & 0x7, adc_targets_0);
+	adc_vals[0] = adc_targets_0[i];
+	CHECK_BRIGHTNESS(i, (brightness >> 3) & 0x7, adc_targets_0);
+	if (adc_vals[1] != adc_targets_0[i]) {
+		adc_vals[1] = adc_targets_0[i];
+		pwmleds[0].modes_not_yet_stable = MODE_STABILIZATION_TIME;
+	}
 	adc_vals[2] = adc_vals[1];
 
-	adc_vals[3] = adc_targets_1[(brightness >> 6) & 0x7];
+	CHECK_BRIGHTNESS(i, (brightness >> 6) & 0x7, adc_targets_1);
+	// we use only one mode, so no modes_not_yet_stable handling here
+	adc_vals[3] = adc_targets_1[i];
 	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];
+	CHECK_BRIGHTNESS(i, (brightness >> 9) & 0x7, adc_targets_2);
+	adc_vals[6] = adc_targets_2[i];
+	CHECK_BRIGHTNESS(i, (brightness >> 12) & 0x7, adc_targets_2);
+	if (adc_vals[7] != adc_targets_2[i]) {
+		adc_vals[7] = adc_targets_2[i];
+		pwmleds[2].modes_not_yet_stable = MODE_STABILIZATION_TIME;
+	}
 	adc_vals[8] = adc_vals[7];
 
 	for (i = 0; i < N_PWMLEDS; i++) {
@@ -204,6 +251,12 @@ static inline void pwmled_err(unsigned char n)
 	log_byte(n);
 	log_word(jiffies);
 	log_flush();
+
+	switch (n) {
+	case 0: err_flags.err_pwmled0 = 1; break;
+	case 1: err_flags.err_pwmled1 = 1; break;
+	case 2: err_flags.err_pwmled2 = 1; break;
+	}
 }
 
 
@@ -248,6 +301,16 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 		if (pwmled_probed_ok(n, old_pwm))
 			return;
 
+	if (led->modes_not_yet_stable) {
+		if (!--led->modes_not_yet_stable) {
+			// reached stability, copy mode 2 to mode 3 (-1)
+			led->mode_pwm[0] = led->pwm;
+			led->mode_pwm[2] = led->pwm;
+			led->err_sums[0] = 0;
+			led->err_sums[2] = 0;
+		}
+	}
+
 	if (led->pwm == old_pwm)
 		return;