altos/telelco-v2.0: A bit fancier with the drag-mode LED show

[fw/altos] / src / telelco-v2.0 / ao_lco_v2.c

diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c
index 748b552fcb40e1a02edf512b7db253c1185df0d2..d78f54d2d47e4978e0e16e54f5f2b68501c7164c 100644 (file)
--- a/src/telelco-v2.0/ao_lco_v2.c
+++ b/src/telelco-v2.0/ao_lco_v2.c
@@ -252,6 +252,7 @@ ao_lco_drag_enable(void)
        PRINTD("Drag enable\n");
        ao_lco_drag_race = 1;
        memset(ao_lco_selected, 0, sizeof (ao_lco_selected));
+       ao_led_on(AO_LED_DRAG);
        ao_lco_drag_beep(5);
        ao_lco_set_display();
 }
@@ -261,6 +262,7 @@ ao_lco_drag_disable(void)
 {
        PRINTD("Drag disable\n");
        ao_lco_drag_race = 0;
+       ao_led_off(AO_LED_DRAG);
        memset(ao_lco_selected, 0, sizeof (ao_lco_selected));
        ao_lco_drag_beep(2);
        ao_lco_set_display();
@@ -415,13 +417,13 @@ ao_lco_input(void)
                                        }
                                }
                                break;
-                       case AO_BUTTON_MODE_SELECT:
+                       case AO_BUTTON_DRAG_MODE:
                                if (event.value)
                                        ao_lco_drag_enable();
                                else
                                        ao_lco_drag_disable();
                                break;
-                       case AO_BUTTON_SELECT:
+                       case AO_BUTTON_ENCODER_SELECT:
                                if (event.value) {
                                        if (!ao_lco_armed) {
                                                ao_lco_select_mode = 1 - ao_lco_select_mode;
@@ -579,23 +581,32 @@ ao_lco_igniter_status(void)
                for (c = 0; c < AO_LED_CONTINUITY_NUM; c++) {
                        uint8_t status;
 
-                       if (ao_lco_drag_race) {
-                               if (ao_lco_selected[ao_lco_box] & (1 << c) && t)
+                       if (ao_pad_query.channels & (1 << c))
+                               status = ao_pad_query.igniter_status[c];
+                       else
+                               status = AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_OPEN;
+
+                       if (ao_lco_drag_race && (ao_lco_selected[ao_lco_box] & (1 << c))) {
+                               uint8_t on = 0;
+                               if (status == AO_PAD_IGNITER_STATUS_GOOD_IGNITER_RELAY_OPEN) {
+                                       if (t)
+                                               on = 1;
+                               } else {
+                                       if (!t)
+                                               on = 1;
+                               }
+                               if (on)
                                        ao_led_on(continuity_led[c]);
                                else
                                        ao_led_off(continuity_led[c]);
                        } else {
-                               if (ao_pad_query.channels & (1 << c))
-                                       status = ao_pad_query.igniter_status[c];
-                               else
-                                       status = AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_OPEN;
                                if (status == AO_PAD_IGNITER_STATUS_GOOD_IGNITER_RELAY_OPEN)
                                        ao_led_on(continuity_led[c]);
                                else
                                        ao_led_off(continuity_led[c]);
                        }
                }
-               t = 1-t;
+               t = (t + 1) & 3;
        }
 }