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;
* 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)
};
static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
-#ifdef PWMLED_TESTING
+#ifdef TESTING_FW
/* pwmled0 */
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 */
MA_GAIN_TO_ADC( 5, 20),
MA_GAIN_TO_ADC( 15, 20),
MA_GAIN_TO_ADC( 20, 20),
/* pwmled2 */
- MA_GAIN_TO_ADC( 100, 1),
- MA_GAIN_TO_ADC( 200, 1),
- MA_GAIN_TO_ADC( 300, 1),
- MA_GAIN_TO_ADC( 400, 1)
+ MA_GAIN_TO_ADC( 50, 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
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;
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;
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;
sum = ((int32_t)led->pwm << shift)
+ led->err_sum + led->target - 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;
}