Merge pull request adafruit#6144 from tannewt/back_to_idf4.4

dhalbert · web-flow · commit af9f80daebfd · 2022-03-15T17:10:42.000-04:00
Update ESP-IDF to fix PinAlarm
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
@@ -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();
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 2775b6e213a1876dd1abe4923097ca5b437397e3
+Subproject commit 121ddb87e5130314e4fcc5e9cb260a81b7d30d36
