diff options
| author | Hugo Dahl <hugo@code-jedi.com> | 2020-12-30 23:37:55 -0600 |
|---|---|---|
| committer | Hugo Dahl <hugo@code-jedi.com> | 2020-12-30 23:37:55 -0600 |
| commit | ad7f4d8ae97a7cfbd46c32f44de3c9f3e9e56519 (patch) | |
| tree | 2832aa5d299a23eb9325cc392da2a3f4726ecd5f /py | |
| parent | 1407af72913d891eefe884ff65f42f6b55aa2a14 (diff) | |
| parent | 5698b8bb0a178d9022cb20de417efa0f77216e87 (diff) | |
Merge branch 'main' of https://github.com/adafruit/circuitpython into add-translation-for-builtin-object-help
* 'main' of https://github.com/adafruit/circuitpython:
update wake-alarm implementation
enable light-sleep functionality
update frozen libs for 6.1.0-beta.3
Revert "Removing frozen libs"
add pretend-to-sleep functionality
expose wake pin parameter and more tweaks
add touch alarm support for esp32s2
implement touch alarm
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_defns.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 94f8ba42e..d6d192a95 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -311,6 +311,7 @@ SRC_COMMON_HAL_ALL = \ alarm/__init__.c \ alarm/pin/PinAlarm.c \ alarm/time/TimeAlarm.c \ + alarm/touch/TouchAlarm.c \ analogio/AnalogIn.c \ analogio/AnalogOut.c \ analogio/__init__.c \ |