altos/telelco-v2.0: Fix button names and pin mappings. Add drag LED.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c
index 748b552fcb40e1a02edf512b7db253c1185df0d2..cc6ab13ab0bb848b0f1030e1119840d86699e9f6 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;

diff --git a/src/telelco-v2.0/ao_pins.h b/src/telelco-v2.0/ao_pins.h
index 77caf254182937e0241a52fa9e4a4d59bc6900d2..73ce9d6c80237517c1f7d12c88faa605f62e475e 100644 (file)
--- a/src/telelco-v2.0/ao_pins.h
+++ b/src/telelco-v2.0/ao_pins.h
@@ -321,13 +321,13 @@
 #define AO_BUTTON_COUNT                9
 #define AO_BUTTON_MODE         AO_EXTI_MODE_PULL_UP
 
-#define AO_BUTTON_MODE_SELECT  0
+#define AO_BUTTON_DRAG_MODE    0
 #define AO_BUTTON_0_PORT       &stm_gpioe
 #define AO_BUTTON_0            1
 
 #define AO_BUTTON_DRAG_SELECT  1
 #define AO_BUTTON_1_PORT       &stm_gpioe
-#define AO_BUTTON_1            1
+#define AO_BUTTON_1            0
 
 #define AO_BUTTON_SPARE1               2
 #define AO_BUTTON_2_PORT       &stm_gpiob
@@ -353,8 +353,8 @@
 #define AO_BUTTON_7_PORT       &stm_gpiod
 #define AO_BUTTON_7            11
 
-#define AO_BUTTON_SELECT       8
+#define AO_BUTTON_ENCODER_SELECT       8
 #define AO_BUTTON_8_PORT       &stm_gpioe
-#define AO_BUTTON_8            0
+#define AO_BUTTON_8            13
 
 #endif /* _AO_PINS_H_ */