Skip to content

Commit

Permalink
Update ESP-IDF to fix PinAlarm
Browse files Browse the repository at this point in the history
  • Loading branch information
tannewt committed Mar 11, 2022
1 parent 3089c9b commit 96dd11a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
[submodule "ports/espressif/esp-idf"]
path = ports/espressif/esp-idf
url = https://github.com/adafruit/esp-idf.git
branch = circuitpython-v4.4
url = https://github.com/espressif/esp-idf.git
branch = release/v4.4
[submodule "ports/espressif/certificates/nina-fw"]
path = ports/espressif/certificates/nina-fw
url = https://github.com/adafruit/nina-fw.git
Expand Down
7 changes: 0 additions & 7 deletions ports/espressif/common-hal/alarm/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,6 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
alarm_pin_pinalarm_prepare_for_deep_sleep();
alarm_touch_touchalarm_prepare_for_deep_sleep();

// Disable brownout detection, which appears to be triggered sometimes when
// waking from deep sleep.
// See https://www.esp32.com/viewtopic.php?f=13&t=19208#p71084
// and https://github.com/adafruit/circuitpython/issues/4025#issuecomment-771027606
// TODO: We can remove this workaround when ESP-IDF handles this.
CLEAR_PERI_REG_MASK(RTC_CNTL_BROWN_OUT_REG, RTC_CNTL_BROWN_OUT_RST_ENA);

// The ESP-IDF caches the deep sleep settings and applies them before sleep.
// We don't need to worry about resetting them in the interim.
esp_deep_sleep_start();
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/esp-idf
Submodule esp-idf updated 596 files

0 comments on commit 96dd11a

Please sign in to comment.