forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3850 from microDev1/touch-s2
Support for Touch Alarm
- Loading branch information
Showing
17 changed files
with
477 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * This file is part of the MicroPython project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 microDev | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include "shared-bindings/alarm/touch/TouchAlarm.h" | ||
| #include "shared-bindings/microcontroller/__init__.h" | ||
|
|
||
| #include "esp_sleep.h" | ||
| #include "peripherals/touch.h" | ||
| #include "supervisor/esp_port.h" | ||
|
|
||
| static volatile bool woke_up = false; | ||
| static touch_pad_t touch_channel = TOUCH_PAD_MAX; | ||
|
|
||
| void common_hal_alarm_touch_touchalarm_construct(alarm_touch_touchalarm_obj_t *self, const mcu_pin_obj_t *pin) { | ||
| if (pin->touch_channel == TOUCH_PAD_MAX) { | ||
| mp_raise_ValueError(translate("Invalid pin")); | ||
| } | ||
| claim_pin(pin); | ||
| self->pin = pin; | ||
| } | ||
|
|
||
| mp_obj_t alarm_touch_touchalarm_get_wakeup_alarm(const size_t n_alarms, const mp_obj_t *alarms) { | ||
| // First, check to see if we match any given alarms. | ||
| for (size_t i = 0; i < n_alarms; i++) { | ||
| if (MP_OBJ_IS_TYPE(alarms[i], &alarm_touch_touchalarm_type)) { | ||
| return alarms[i]; | ||
| } | ||
| } | ||
|
|
||
| alarm_touch_touchalarm_obj_t *alarm = m_new_obj(alarm_touch_touchalarm_obj_t); | ||
| alarm->base.type = &alarm_touch_touchalarm_type; | ||
| alarm->pin = NULL; | ||
|
|
||
| // Map the pin number back to a pin object. | ||
| for (size_t i = 0; i < mcu_pin_globals.map.used; i++) { | ||
| const mcu_pin_obj_t* pin_obj = MP_OBJ_TO_PTR(mcu_pin_globals.map.table[i].value); | ||
| if (pin_obj->touch_channel == touch_channel) { | ||
| alarm->pin = mcu_pin_globals.map.table[i].value; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return alarm; | ||
| } | ||
|
|
||
| // This is used to wake the main CircuitPython task. | ||
| void touch_interrupt(void *arg) { | ||
| (void) arg; | ||
| woke_up = true; | ||
| BaseType_t task_wakeup; | ||
| vTaskNotifyGiveFromISR(circuitpython_task, &task_wakeup); | ||
| if (task_wakeup) { | ||
| portYIELD_FROM_ISR(); | ||
| } | ||
| } | ||
|
|
||
| void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) { | ||
| bool touch_alarm_set = false; | ||
| alarm_touch_touchalarm_obj_t *touch_alarm = MP_OBJ_NULL; | ||
|
|
||
| for (size_t i = 0; i < n_alarms; i++) { | ||
| if (MP_OBJ_IS_TYPE(alarms[i], &alarm_touch_touchalarm_type)) { | ||
| if (!touch_alarm_set) { | ||
| touch_alarm = MP_OBJ_TO_PTR(alarms[i]); | ||
| touch_alarm_set = true; | ||
| } else { | ||
| mp_raise_ValueError(translate("Only one alarm.touch alarm can be set.")); | ||
| } | ||
| } | ||
| } | ||
| if (!touch_alarm_set) { | ||
| return; | ||
| } | ||
|
|
||
| touch_channel = touch_alarm->pin->touch_channel; | ||
|
|
||
| // configure interrupt for pretend to deep sleep | ||
| // this will be disabled if we actually deep sleep | ||
|
|
||
| // intialize touchpad | ||
| peripherals_touch_reset(); | ||
| peripherals_touch_never_reset(true); | ||
| peripherals_touch_init(touch_channel); | ||
|
|
||
| // wait for touch data to reset | ||
| mp_hal_delay_ms(10); | ||
|
|
||
| // configure trigger threshold | ||
| uint32_t touch_value; | ||
| touch_pad_read_benchmark(touch_channel, &touch_value); | ||
| touch_pad_set_thresh(touch_channel, touch_value * 0.1); //10% | ||
|
|
||
| // configure touch interrupt | ||
| touch_pad_timeout_set(true, SOC_TOUCH_PAD_THRESHOLD_MAX); | ||
| touch_pad_isr_register(touch_interrupt, NULL, TOUCH_PAD_INTR_MASK_ALL); | ||
| touch_pad_intr_enable(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE | TOUCH_PAD_INTR_MASK_TIMEOUT); | ||
| } | ||
|
|
||
| void alarm_touch_touchalarm_prepare_for_deep_sleep(void) { | ||
| // intialize touchpad | ||
| peripherals_touch_never_reset(false); | ||
| peripherals_touch_reset(); | ||
| peripherals_touch_init(touch_channel); | ||
|
|
||
| // configure touchpad for sleep | ||
| touch_pad_sleep_channel_enable(touch_channel, true); | ||
| touch_pad_sleep_channel_enable_proximity(touch_channel, false); | ||
|
|
||
| // wait for touch data to reset | ||
| mp_hal_delay_ms(10); | ||
|
|
||
| // configure trigger threshold | ||
| uint32_t touch_value; | ||
| touch_pad_sleep_channel_read_smooth(touch_channel, &touch_value); | ||
| touch_pad_sleep_set_threshold(touch_channel, touch_value * 0.1); //10% | ||
|
|
||
| // enable touchpad wakeup | ||
| esp_sleep_enable_touchpad_wakeup(); | ||
| esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON); | ||
| } | ||
|
|
||
| bool alarm_touch_touchalarm_woke_us_up(void) { | ||
| return woke_up; | ||
| } | ||
|
|
||
| void alarm_touch_touchalarm_reset(void) { | ||
| woke_up = false; | ||
| touch_channel = TOUCH_PAD_MAX; | ||
| peripherals_touch_never_reset(false); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * This file is part of the MicroPython project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 microDev | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H | ||
| #define MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H | ||
|
|
||
| #include "py/obj.h" | ||
| #include "common-hal/microcontroller/Pin.h" | ||
|
|
||
| typedef struct { | ||
| mp_obj_base_t base; | ||
| const mcu_pin_obj_t *pin; | ||
| } alarm_touch_touchalarm_obj_t; | ||
|
|
||
| // Find the alarm object that caused us to wake up or create an equivalent one. | ||
| mp_obj_t alarm_touch_touchalarm_get_wakeup_alarm(const size_t n_alarms, const mp_obj_t *alarms); | ||
| // Check for the wake up alarm from pretend deep sleep. | ||
| void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms); | ||
| void alarm_touch_touchalarm_prepare_for_deep_sleep(void); | ||
| bool alarm_touch_touchalarm_woke_us_up(void); | ||
| void alarm_touch_touchalarm_reset(void); | ||
|
|
||
| #endif // MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.