0x04, 0x14, 0x24, 0x38,
};
+// TODO: maybe convert this to bitmask to simplify pwmled_needs_adc() ?
static unsigned char pwmled_state[N_PWMLEDS];
#define ST_DISABLED 0
#define ST_PROBING 1
#define ST_ON 3
static unsigned char pwmled_mode[N_PWMLEDS];
+static unsigned char pwmled_mode_set[N_PWMLEDS];
static unsigned char pwm_probes[N_PWMLEDS];
{
unsigned char i;
- for (i = 0; i < N_PWMLEDS*N_PWMLED_MODES; i++)
+ for (i = 0; i < N_PWMLEDS*N_PWMLED_MODES; i++) {
pwm_vals[i] = 0;
+ pwmled_mode[i] = 0;
+ pwmled_mode_set[i] = 0;
+ }
for (i = 0; i < N_PWMLEDS; i++) {
start_probing(i);
}
}
-unsigned char pwmled_is_on(unsigned char n)
+unsigned char pwmled_needs_adc(unsigned char n)
{
unsigned char st = pwmled_state[n];
if (st == ST_PROBING || st == ST_ON)
return 0;
}
+unsigned char pwmled_enabled(unsigned char n)
+{
+ unsigned char st = pwmled_state[n];
+ if (st == ST_OFF || st == ST_ON)
+ return 1;
+ else
+ return 0;
+}
+
+void pwmled_set_mode(unsigned char n, unsigned char mode)
+{
+ if (!pwmled_enabled(n))
+ return;
+
+#if 0
+ log_byte(0xF8);
+ log_byte(n);
+ log_byte(mode);
+#endif
+
+ if (mode == 0) {
+ pwm_off(n);
+ pwmled_state[n] = ST_OFF;
+ return;
+ }
+
+ if (mode <= N_PWMLED_MODES) {
+ unsigned char pwmval;
+ mode--;
+ pwmval = pwm_vals[n*N_PWMLED_MODES+mode];
+ pwm_set(n, pwmval);
+ pwm_on(n);
+#if 0
+ log_byte(pwmval);
+#endif
+ pwmled_state[n] = ST_ON;
+ pwmled_mode[n] = mode;
+ pwmled_mode_set[n] = 1;
+ }
+}
+
static void inline probing_adc(unsigned char n, uint16_t adcval)
{
unsigned char need_bigger = 0, i;
unsigned char pwm = pwm_probes[n];
#if 0
- log_byte(n);
log_byte(0xF4);
+ log_byte(n);
log_word(adcval);
#endif
-#if 0
- if (pwm == 0 && adcval > 0) { // non-zero voltage with zero PWM?
+ if (adcval > 0x100 // Too high
+ || (pwm == 0 && adcval > 0) // non-zero voltage with zero PWM
+ ) {
+ pwm_off(n);
pwmled_state[n] = ST_DISABLED;
- log_byte(n);
log_byte(0xF0);
+ log_byte(n);
log_word(adcval);
return;
}
-#endif
for (i = 0; i < N_PWMLED_MODES; i++, pwm_p++, adc_p++) {
uint16_t adc = *adc_p;
pwm_off(n);
// pwm_set(n, 0);
pwmled_state[n] = ST_OFF;
- log_byte(n);
log_byte(0xF1);
+ log_byte(n);
return;
}
- if (pwm >= 0x60) { // over the maximum!
+ if (pwm >= 0x70) { // over the maximum!
+ pwm_off(n);
pwmled_state[n] = ST_DISABLED;
- log_byte(n);
log_byte(0xF2);
- pwm_off(n);
+ log_byte(n);
// pwm_set(n, 0);
return;
}
// Feedback loop
static void inline on_adc(unsigned char n, uint16_t adcval)
{
+ unsigned char mode = pwmled_mode[n];
+ uint16_t adc_exp = adc_vals[n*N_PWMLED_MODES+mode];
+ unsigned char *pwm_p = &pwm_vals[n*N_PWMLED_MODES+mode];
+ uint16_t old_pwm = *pwm_p;
+ uint16_t new_pwm = old_pwm;
+
#if 0
- uint16_t new_pwm = led_modes[led_mode].pwmval;
- uint16_t old_pwm = new_pwm;
- uint16_t adc_exp = led_modes[led_mode].expected;
+ log_byte(0xF5);
+ log_byte(n);
+ log_word(adcval);
+#endif
- log_word(((adcval & 0xFF) << 8) | old_pwm);
+ if (pwmled_mode_set[n]) { // ignore the first reading
+ pwmled_mode_set[n] = 0;
+ return;
+ }
+ // FIXME: running average?
if (2*adcval > 5*adc_exp) { // >2.5x expected, lower significantly
new_pwm = 2*old_pwm/3;
} else if (3*adcval > 4*adc_exp) { // >1.33x expected, lower a bit
new_pwm = old_pwm + 1;
}
- if (new_pwm > 0x60) { // odpojeno?
+ // FIXME: better disconnect detection
+ if (new_pwm > 0x60) { // disconnected?
new_pwm = 0x60;
}
- if (new_pwm < 2) { // zkrat?
+ if (new_pwm < 2) { // short-circuit?
new_pwm = 2;
}
-set_pwm:
if (new_pwm != old_pwm) {
- led_modes[led_mode].pwmval = new_pwm;
- OCR1D = new_pwm;
- }
- // ADCSRA |= _BV(ADSC);
+ *pwm_p = new_pwm;
+ pwm_set(n, new_pwm);
+#if 0
+ log_byte(0xF9);
+ log_byte(new_pwm);
#endif
+ }
}
void pwmled_adc(unsigned char n, uint16_t adcval)
case ST_PROBING:
probing_adc(n, adcval);
+#if 1
probing = 0;
for (i = 0; i < N_PWMLEDS; i++)
if (pwmled_state[i] == ST_PROBING)
for (i = 0; i < N_PWMLEDS*N_PWMLED_MODES; i++)
log_byte(pwm_vals[i]);
log_flush();
+ log_set_state(4);
}
+#endif
return;
case ST_ON:
on_adc(n, adcval);
return;
- // WTF am I doing in this function then?
+ // WTF am I doing in this function then? Maybe recently switched off?
}
}