#include "lights.h"
-static unsigned char pwm_vals[N_PWMLEDS*N_PWMLED_MODES];
-static unsigned char adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
+static uint16_t pwm_vals[N_PWMLEDS*N_PWMLED_MODES];
+static uint16_t pwm_max[N_PWMLEDS] = {
+ PWM_MAX/2,
+ PWM_MAX - (PWM_MAX >> 4), // step-up
+ PWM_MAX/2
+};
+
+#define PWMLED2_TESTING_WITH_350MA_LED
+
+#define SENSE_MOHM 33 /* 0.033 Ohm */
+#define MA_MOHM_GAIN_TO_ADC(ma, mohm, gain) (\
+ ((unsigned long)(ma))*(mohm) /* voltage at sensing resistor in uV */ \
+ /(1100000UL/gain/1024UL) /* voltage of ADC reading == 1 */ \
+)
+static uint16_t adc_max[N_PWMLEDS] = {
+ MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 30, SENSE_MOHM, 20),
+#ifdef PWMLED2_TESTING_WITH_350MA_LED
+ MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM, 1)
+#else
+ MA_MOHM_GAIN_TO_ADC(2500, SENSE_MOHM, 1)
+#endif
+};
+static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
/* pwmled0 */
- 0x04, 0x14, 0x24, 0x38,
+ MA_MOHM_GAIN_TO_ADC( 20, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 50, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 20),
/* pwmled1 */
- 0x04, 0x14, 0x24, 0x38,
+ MA_MOHM_GAIN_TO_ADC( 5, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 12, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 16, SENSE_MOHM, 20),
+ MA_MOHM_GAIN_TO_ADC( 20, SENSE_MOHM, 20),
/* pwmled2 */
- 0x04, 0x14, 0x24, 0x38,
+#ifdef PWMLED2_TESTING_WITH_350MA_LED
+ MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC( 140, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC( 250, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 1),
+#else
+ MA_MOHM_GAIN_TO_ADC( 150, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC( 700, SENSE_MOHM, 1),
+ MA_MOHM_GAIN_TO_ADC(2400, SENSE_MOHM, 1),
+#endif
};
// TODO: maybe convert this to bitmask to simplify pwmled_needs_adc() ?
static unsigned char pwmled_mode[N_PWMLEDS];
static unsigned char pwmled_mode_set[N_PWMLEDS];
-static unsigned char pwm_probes[N_PWMLEDS];
+static uint16_t pwm_probes[N_PWMLEDS];
static void start_probing(unsigned char n)
{
pwmled_state[n] = ST_PROBING;
pwm_set(n, 0);
- pwm_on(n);
pwm_probes[n] = 0;
}
}
if (mode <= N_PWMLED_MODES) {
- unsigned char pwmval;
+ uint16_t pwmval;
mode--;
pwmval = pwm_vals[n*N_PWMLED_MODES+mode];
pwm_set(n, pwmval);
- pwm_on(n);
#if 0
log_byte(pwmval);
#endif
static void inline probing_adc(unsigned char n, uint16_t adcval)
{
unsigned char need_bigger = 0, i;
- unsigned char *pwm_p = &pwm_vals[n*N_PWMLED_MODES];
- unsigned char *adc_p = &adc_vals[n*N_PWMLED_MODES];
- unsigned char pwm = pwm_probes[n];
+ uint16_t *pwm_p = &pwm_vals[n*N_PWMLED_MODES];
+ uint16_t *adc_p = &adc_vals[n*N_PWMLED_MODES];
+ uint16_t pwm = pwm_probes[n];
#if 0
log_byte(0xF4);
log_word(adcval);
#endif
- if (adcval > 0x100 // Too high
+ if (adcval > adc_max[n] // Too high
|| (pwm == 0 && adcval > 0) // non-zero voltage with zero PWM
) {
pwm_off(n);
return;
}
- if (pwm >= 0x70) { // over the maximum!
+ if (pwm >= pwm_max[n]) { // over the maximum!
pwm_off(n);
pwmled_state[n] = ST_DISABLED;
log_byte(0xF2);
{
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 *pwm_p = &pwm_vals[n*N_PWMLED_MODES+mode];
uint16_t old_pwm = *pwm_p;
uint16_t new_pwm = old_pwm;
}
// FIXME: better disconnect detection
- if (new_pwm > 0x60) { // disconnected?
- new_pwm = 0x60;
+ if (new_pwm > pwm_max[n]) { // FIXME: disconnected?
+ new_pwm = pwm_max[n];
}
if (new_pwm < 2) { // short-circuit?
new_pwm = 2;
log_byte(pwmled_state[i]);
for (i = 0; i < N_PWMLEDS*N_PWMLED_MODES; i++)
- log_byte(pwm_vals[i]);
+ log_word(pwm_vals[i]);
log_flush();
log_set_state(4);
}