diff options
| author | Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com> | 2020-11-23 17:19:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-23 18:24:36 +0000 |
| commit | 813eb1f4b13150bee964614a57e1e099aba0c83d (patch) | |
| tree | abf18fc233300d29cb50cfa7d55dbcdfd1df58d7 /board/metaknight | |
| parent | 430d933f4c2fa49d692bd1eb4b48d7b287b87b97 (diff) | |
| download | chrome-ec-813eb1f4b13150bee964614a57e1e099aba0c83d.tar.gz | |
Metaknight: Press volume up/down by ADC Hook function
Add Vol +- volume up/down by ADC HOOK function
BUG=b:169615752
BRANCH=master
TEST=make BOARD=metaknight
TEST=Press Vol+- button function work.
Signed-off-by: yu-an.chen@quanta.corp-partner.google.com
Change-Id: I70a10dd867ee1e1e24f34857f8097fbcd0a76350
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2552332
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/metaknight')
| -rw-r--r-- | board/metaknight/board.c | 52 | ||||
| -rw-r--r-- | board/metaknight/board.h | 6 | ||||
| -rw-r--r-- | board/metaknight/gpio.inc | 4 |
3 files changed, 60 insertions, 2 deletions
diff --git a/board/metaknight/board.c b/board/metaknight/board.c index 2910c366ed..1d199ed6fc 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -45,6 +45,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] = { GPIO_EN_USB_A0_VBUS, @@ -592,6 +597,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) diff --git a/board/metaknight/board.h b/board/metaknight/board.h index deee0f527b..47a9fd2e17 100644 --- a/board/metaknight/board.h +++ b/board/metaknight/board.h @@ -124,6 +124,12 @@ #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_GPIO +/* Volume Button feature */ +#define CONFIG_ADC_BUTTONS +#define CONFIG_VOLUME_BUTTONS +#define GPIO_VOLUME_UP_L GPIO_VOLUP_BTN_ODL +#define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL + #define CONFIG_CHIP_INIT_ROM_REGION #ifndef __ASSEMBLER__ diff --git a/board/metaknight/gpio.inc b/board/metaknight/gpio.inc index 95bd3aa9b4..caea1bc4f2 100644 --- a/board/metaknight/gpio.inc +++ b/board/metaknight/gpio.inc @@ -31,8 +31,6 @@ GPIO_INT(EC_I2C_SUB_C1_SDA_HDMI_HPD_ODL, PIN(9, 1), GPIO_INT_BOTH, sub_hdmi_hpd_ /* Button interrupts */ GPIO_INT(H1_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) -GPIO_INT(VOLDN_BTN_ODL, PIN(4, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(VOLUP_BTN_ODL, PIN(7, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Other interrupts */ GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) @@ -106,6 +104,8 @@ GPIO(EN_USB_A1_VBUS, PIN(F, 2), GPIO_OUT_LOW) /* Enable A1 5V Charging */ UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) +UNIMPLEMENTED(VOLDN_BTN_ODL) +UNIMPLEMENTED(VOLUP_BTN_ODL) /* Alternate Functions */ /* ADC */ |