};
static uint16_t adc_targets_2[] = {
+#ifdef TESTING_FW
MA_GAIN_TO_ADC( 50, 1),
MA_GAIN_TO_ADC( 100, 1),
- MA_GAIN_TO_ADC( 200, 1),
+ MA_GAIN_TO_ADC( 150, 1),
+ MA_GAIN_TO_ADC( 240, 1),
MA_GAIN_TO_ADC( 350, 1),
+#else
+ MA_GAIN_TO_ADC( 150, 1),
+ MA_GAIN_TO_ADC( 300, 1),
+ MA_GAIN_TO_ADC( 500, 1),
+ MA_GAIN_TO_ADC( 800, 1),
+ MA_GAIN_TO_ADC(1200, 1),
+#endif
};
static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES];
led->target = adc_vals[i*N_PWMLED_MODES];
led->mode = 1;
led->probe_steady = 0;
- led->state = ST_PROBING;
+ led->state = ST_OFF;
led->pwm = 1;
pwm_set(i, led->pwm);
}
}
+#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);
+ adc_vals[1] = adc_targets_0[i];
adc_vals[2] = adc_vals[1];
- adc_vals[3] = adc_targets_1[(brightness >> 6) & 0x7];
+ 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];
- 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);
+ adc_vals[7] = adc_targets_2[i];
adc_vals[8] = adc_vals[7];
- for (i = 0; i < N_PWMLEDS; i++)
+ 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
old_pwm = led->pwm;
- shift = led->state == ST_PROBING ? 3 : 8;
+ // shift = led->state == ST_PROBING ? 3 : 8;
+ shift = 3;
sum = ((int32_t)led->pwm << shift)
+ led->err_sum + led->target - adcval;