Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/bike-lights

diff --git a/firmware/adc.c b/firmware/adc.c
index b7dad0ad59b31a940acecec248c91fd14ba8b2aa..f5d846f2b21d0340bd8f3411a1d214db5ae04583 100644 (file)
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -21,15 +21,15 @@ static void inline setup_mux(unsigned char n)
        switch (n) {
        case 0: // pwmled 1: 1.1V, ADC0,1 (PA0,1), gain 20
                ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX1) | _BV(MUX0);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 1: // pwmled 2: 1.1V, ADC2,1 (PA2,1), gain 20
                ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 2: // pwmled 3: 1.1V, ADC4 (PA5), single-ended
                ADMUX = _BV(REFS1) | _BV(MUX2);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 3: // ambient light: 1.1V, ADC5 (PA6), single-ended
                ADMUX = _BV(REFS1) | _BV(MUX2) | _BV(MUX0);

diff --git a/firmware/buttons.c b/firmware/buttons.c
index c1a785d0492c93d9bf91fff728b7e646c3879d9b..1263fcb487adc37affa6eca9c1edbac56edc2090 100644 (file)
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -133,8 +133,8 @@ void susp_buttons()
        DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input
        PORTA |=  _BV(PA3) | _BV(PA4);  // enable internal pull-ups
 
-       GIMSK &= ~_BV(PCIE1); // disable pin-change IRQ on port B
-       GIMSK |= _BV(PCIE0);
+       GIMSK &= ~_BV(PCIE0);
+       GIMSK |= _BV(PCIE1);
 
        PCMSK0 = _BV(PCINT3) | _BV(PCINT4);
                // disable pin-change IRQs on all pins except PA3,PA4

diff --git a/firmware/control.c b/firmware/control.c
index 0b842a74dc794f980d0dc2ced63792cb7e009cb0..eb35aca947ba3be71a0b2b53bb58d96e5e7ad7cd 100644 (file)
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -54,9 +54,9 @@ static pattern_t normal2_pattern[] = {
 };
 
 static pattern_t normal3_pattern[] = {
-       { 2, 0x1 },
+       { 3, 0x1 },
        { 0, 0x1 },
-       { 2, 0x1 },
+       { 3, 0x1 },
        { 0, 0x8 },
        { 1, 0x1 },
        { 0, 0x1 },
@@ -66,9 +66,9 @@ static pattern_t normal3_pattern[] = {
 };
 
 static pattern_t normal4_pattern[] = {
-       { 2, 0x1 },
+       { 4, 0x1 },
        { 0, 0x1 },
-       { 2, 0x1 },
+       { 4, 0x1 },
        { 0, 0x8 },
        { 1, 0x1 },
        { 0, 0x1 },
@@ -123,6 +123,10 @@ pattern_t *pwmled0_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return normal3_pattern;
+#endif
+
        if (towbar_mode)
                return NULL;
 
@@ -139,6 +143,9 @@ pattern_t *pwmled1_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return off_pattern;
+#endif
        if (towbar_mode) {
                switch (ambient_zone) {
                case 0:
@@ -163,6 +170,9 @@ pattern_t *pwmled2_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return on3_pattern;
+#endif
        switch (ambient_zone) {
        case 0: return dim_mode ? on2_pattern : on3_pattern;
        case 1: return dim_mode ? slow1_pattern : normal2_pattern;
@@ -179,7 +189,7 @@ pattern_t *status_led_pattern_select()
                return buttons_setup_status0_pattern_select();
 
        // FIXME: do something sane
-       return number_pattern(1 + ambient_zone, 1);
+       return number_pattern(1 + ambient_zone, 0);
 }
 
 pattern_t *illumination_led_pattern_select()

diff --git a/firmware/lights.h b/firmware/lights.h
index fe8b59f10730c097394cec835b3dbab7206796d1..15e86b88df84c5b5e3f5cde6460d846cfd1446fd 100644 (file)
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -1,6 +1,8 @@
 #ifndef LIGHTS_H__
 #define LIGHTS_H__ 1
 
+#define TESTING_FW 1
+
 #define N_LEDS 7
 #define N_PWMLEDS 3
 #define N_PWMLED_MODES 4
@@ -23,6 +25,7 @@ void inline log_word(uint16_t word) { }
 #endif
 
 /* adc.c */
+#define PWMLED_ADC_SHIFT 3 /* 1<<3 measurements per single callback */
 void init_adc();
 void susp_adc();
 

diff --git a/firmware/pwm.c b/firmware/pwm.c
index d68eeb2c3fdf370f69f32a8aa10b1afd68ff48a9..b47227375703f355198f724f63586cdba5937aa7 100644 (file)
--- a/firmware/pwm.c
+++ b/firmware/pwm.c
@@ -7,7 +7,7 @@
 
 #define PWM_STEP_SHIFT 2 /* sub-LSB precision */
 #define PWM_TOP (((PWM_MAX) + (4 << (PWM_STEP_SHIFT))) >> (PWM_STEP_SHIFT))
-#if PWM_TOP > 0x1FF
+#if PWM_TOP > 0x3FF
 #error PWM_TOP too high
 #endif
 

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index d85087edcf81bc35d3765f419e8babfd24217fe2..fcde84a35a3f103968441a1a9663ee28f6bc3ecb 100644 (file)
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -15,49 +15,63 @@ pwmled_t pwmleds[N_PWMLEDS];
 #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 */ \
-)
+/*
+ * Voltage in uV at ADC reading == 1 is 1100/gain/1024
+ * ADC module returns sum of 1 << PWMLED_ADC_SHIFT measurements
+ * Voltage in uV measured is current in mA * sense resistance in mOhm
+ */
+#define MA_GAIN_TO_ADC(ma, gain) ((uint16_t) \
+       ((uint32_t)(ma) \
+       * (SENSE_MOHM) \
+       * (1 << (PWMLED_ADC_SHIFT)) \
+       * 1024 \
+       / (1100000/(gain))))
 
 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)
+#ifdef TESTING_FW
+       MA_GAIN_TO_ADC( 400, 20),
+       MA_GAIN_TO_ADC(  30, 20),
+       MA_GAIN_TO_ADC( 800,  1)
 #else
-       MA_MOHM_GAIN_TO_ADC(2500, SENSE_MOHM,  1)
+       MA_GAIN_TO_ADC( 900, 20),
+       MA_GAIN_TO_ADC(  30, 20),
+       MA_GAIN_TO_ADC(2500,  1)
 #endif
 };
 
 static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
+#ifdef TESTING_FW
        /* pwmled0 */
-       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),
+       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 */
-       16, 32, 64, 112,
-#if 0
-       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),
-#endif
+       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 */
-       24, 32, 40, 48
-#if 0
-#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),
+       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
-       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
+       /* 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
 };