diff options
| author | Ben Chen <ben.chen2@quanta.corp-partner.google.com> | 2020-09-24 19:44:20 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-07 21:34:09 +0000 |
| commit | 4d7e27892ec3a079dd3bb6f15a1074e3e9a95e0c (patch) | |
| tree | 2427669cde684aeb5a62ea93907e7861c41ffa4a /board/magolor/board.c | |
| parent | 63eac1804338622856672e8d24be826a0523a3df (diff) | |
| download | chrome-ec-4d7e27892ec3a079dd3bb6f15a1074e3e9a95e0c.tar.gz | |
magolor: press volume up/down by ADC Hook function
Add Vol +- volume up/down by ADC HOOK function
BUG=b:167319238
BRANCH=master
TEST=Press Vol+- button function work.
Change-Id: I43b597db399aaa588d10a0dfd586208e5714c532
Signed-off-by: Ben Chen <ben.chen2@quanta.corp-partner.google.com>
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2402498
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/magolor/board.c')
| -rw-r--r-- | board/magolor/board.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/board/magolor/board.c b/board/magolor/board.c index c2e510af1b..d173c25716 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -47,6 +47,11 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) +#define ADC_VOL_UP_MASK BIT(0) +#define ADC_VOL_DOWN_MASK BIT(1) + +static uint8_t new_adc_key_state; + /******************************************************************************/ /* USB-A Configuration */ const int usb_port_enable[USB_PORT_COUNT] = { @@ -559,6 +564,53 @@ uint16_t tcpc_get_alert_status(void) return status; } +int adc_to_physical_value(enum gpio_signal gpio) +{ + if (gpio == GPIO_VOLUME_UP_L) + return !!(new_adc_key_state & ADC_VOL_UP_MASK); + else if (gpio == GPIO_VOLUME_DOWN_L) + return !!(new_adc_key_state & ADC_VOL_DOWN_MASK); + + CPRINTS("Not a volume up or down key"); + return 0; +} + +int button_is_adc_detected(enum gpio_signal gpio) +{ + return (gpio == GPIO_VOLUME_DOWN_L) || (gpio == GPIO_VOLUME_UP_L); +} + +static void adc_vol_key_press_check(void) +{ + int volt = adc_read_channel(ADC_SUB_ANALOG); + static uint8_t old_adc_key_state; + uint8_t adc_key_state_change; + + if (volt > 2400 && volt < 2490) { + /* volume-up is pressed */ + new_adc_key_state = ADC_VOL_UP_MASK; + } else if (volt > 2600 && volt < 2690) { + /* volume-down is pressed */ + new_adc_key_state = ADC_VOL_DOWN_MASK; + } else if (volt < 2290) { + /* both volumn-up and volume-down are pressed */ + new_adc_key_state = ADC_VOL_UP_MASK | ADC_VOL_DOWN_MASK; + } else if (volt > 2700) { + /* both volumn-up and volume-down are released */ + new_adc_key_state = 0; + } + if (new_adc_key_state != old_adc_key_state) { + adc_key_state_change = old_adc_key_state ^ new_adc_key_state; + if (adc_key_state_change && ADC_VOL_UP_MASK) + button_interrupt(GPIO_VOLUME_UP_L); + if (adc_key_state_change && ADC_VOL_DOWN_MASK) + button_interrupt(GPIO_VOLUME_DOWN_L); + + old_adc_key_state = new_adc_key_state; + } +} +DECLARE_HOOK(HOOK_TICK, adc_vol_key_press_check, HOOK_PRIO_DEFAULT); + #ifndef TEST_BUILD /* This callback disables keyboard when convertibles are fully open */ void lid_angle_peripheral_enable(int enable) |