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;
#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( 300, 20),
- /* pwmled1 */
+ MA_GAIN_TO_ADC( 350, 20),
+};
+
+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( 150, 1),
- MA_GAIN_TO_ADC( 200, 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
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)
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;
}
}
+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;
+ 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)
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;
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;
}