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=c156d8175f01440eef1601e4cc2609cc06082646;hp=7cc300641a5fe3fe2cf536ae32945814721aa44b;hb=9fd1101ae25f19ddd7b13a4660532339ddce3309;hpb=dfdde30a343b7da032bea880b0677b49ff0e5d8a

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 7cc3006..c156d81 100644
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -5,7 +5,10 @@
 typedef struct {
 	uint16_t target, pwm;
 	int16_t err_sum;
-	unsigned char mode, state, probe_steady;
+	unsigned char mode, state;
+	union {
+		unsigned char probe_steady, mode_changed;
+	};
 	uint16_t mode_pwm[N_PWMLED_MODES];
 	int16_t err_sums[N_PWMLED_MODES];
 } pwmled_t;
@@ -27,10 +30,8 @@ pwmled_t pwmleds[N_PWMLEDS];
 	* 1024 \
 	/ (1100000/(gain))))
 
-#define PWMLED_TESTING 1
-
 static uint16_t adc_max[N_PWMLEDS] = {
-#ifdef PWMLED_TESTING
+#ifdef TESTING_FW
 	MA_GAIN_TO_ADC( 400, 20),
 	MA_GAIN_TO_ADC(  30, 20),
 	MA_GAIN_TO_ADC( 800,  1)
@@ -41,42 +42,28 @@ static uint16_t adc_max[N_PWMLEDS] = {
 #endif
 };
 
-static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
-#ifdef PWMLED_TESTING
-	/* pwmled0 */
+static uint16_t adc_targets_0[] = {
 	MA_GAIN_TO_ADC(  50, 20),
-	MA_GAIN_TO_ADC( 150, 20),
-	MA_GAIN_TO_ADC( 250, 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(  15, 20),
 	MA_GAIN_TO_ADC(  20, 20),
-	/* pwmled2 */
+};
+
+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( 300,  1),
-	MA_GAIN_TO_ADC( 400,  1)
-#else
-	/* pwmled0 */
-	MA_GAIN_TO_ADC( 100, 20),
-	MA_GAIN_TO_ADC( 300, 20),
-	MA_GAIN_TO_ADC( 700, 20),
-	MA_GAIN_TO_ADC( 800, 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( 800,  1),
-	MA_GAIN_TO_ADC(1500,  1)
-#endif
+	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
@@ -93,16 +80,19 @@ 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_OFF;
+		led->pwm = 1;
+		pwm_set(i, led->pwm);
 
 		for (j = 0; j < N_PWMLED_MODES; j++) {
 			led->mode_pwm[j] = 0;
 			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)
@@ -124,6 +114,7 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
 		led->state = ST_ON;
 		led->pwm = led->mode_pwm[mode - 1];
 		led->err_sum = led->err_sums[mode - 1];
+		led->mode_changed = 1;
 		pwm_set(n, led->pwm);
 	} else {
 		led->state = ST_OFF;
@@ -131,6 +122,40 @@ 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;
+
+	CHECK_BRIGHTNESS(i, brightness & 0x7, adc_targets_0);
+	adc_vals[0] = adc_targets_0[i];
+	CHECK_BRIGHTNESS(i, (brightness >> 3) & 0x7, adc_targets_0);
+	adc_vals[1] = adc_targets_0[i];
+	adc_vals[2] = adc_vals[1];
+
+	CHECK_BRIGHTNESS(i, (brightness >> 6) & 0x7, adc_targets_1);
+	adc_vals[3] = adc_targets_1[i];
+	adc_vals[4] = adc_vals[3];
+	adc_vals[5] = adc_vals[3];
+
+	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);
+	adc_vals[7] = adc_targets_2[i];
+	adc_vals[8] = adc_vals[7];
+
+	for (i = 0; i < N_PWMLEDS; i++) {
+		pwmleds[i].err_sum = 0;
+		pwmled_set_mode(i, pwmleds[i].mode);
+	}
+}
+
 #define PWMLED_PROBE_STEADY_COUNT 10
 
 static inline unsigned char pwmled_probed_ok(unsigned char n, uint16_t old_pwm)
@@ -204,11 +229,16 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 	if (!ST_IS_ON(led->state))
 		return;
 
+	if (led->state == ST_ON && led->mode_changed) {
+		led->mode_changed--;
+		return;
+	}
 	// FIXME: test for maximum adcval value (adc_max[n])
 
 	old_pwm = led->pwm;
 
-	shift = led->state == ST_PROBING ? 3 : 5;
+	// shift = led->state == ST_PROBING ? 3 : 8;
+	shift = 3;
 
 	sum = ((int32_t)led->pwm << shift)
 		+ led->err_sum + led->target - adcval;
@@ -220,7 +250,8 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 	sum -= led->pwm << shift;
 	led->err_sum = sum;
 
-	if (led->pwm >= PWM_MAX) {
+	if (led->pwm >= PWM_MAX
+		|| (n == 1 && led->pwm > PWM_MAX/2 && adcval < 0x08)) {
 		pwmled_err(n);
 		return;
 	}