From 98ea690cc7514f43254f3a6c72668c11820f657c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 28 May 2018 14:41:51 -0700 Subject: [PATCH] altos/telelco-v2.0: Fix button names and pin mappings. Add drag LED. Signed-off-by: Keith Packard --- src/telelco-v2.0/ao_lco_v2.c | 6 ++++-- src/telelco-v2.0/ao_pins.h | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c index 748b552f..cc6ab13a 100644 --- 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 77caf254..73ce9d6c 100644 --- 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_ */ -- 2.30.2