Merge branch 'feature/esp-wrover-kit-v4_1' into 'master'

[esp-idf] / components / esp32 / brownout.c

diff --git a/components/esp32/brownout.c b/components/esp32/brownout.c
index 1dcde078e3596dac78075ecf29541e4dca450735..1d78006140c3b820a288df12532729bcceb63daf 100644 (file)
--- a/components/esp32/brownout.c
+++ b/components/esp32/brownout.c
@@ -1,9 +1,9 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,28 +12,51 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include "sdkconfig.h"
 #include "soc/soc.h"
+#include "soc/cpu.h"
 #include "soc/rtc_cntl_reg.h"
+#include "rom/ets_sys.h"
+#include "esp_system_internal.h"
+#include "driver/rtc_cntl.h"
+#include "freertos/FreeRTOS.h"
+
+#ifdef CONFIG_BROWNOUT_DET_LVL
+#define BROWNOUT_DET_LVL CONFIG_BROWNOUT_DET_LVL
+#else
+#define BROWNOUT_DET_LVL 0
+#endif //CONFIG_BROWNOUT_DET_LVL
+
+static void rtc_brownout_isr_handler()
+{
+    /* Normally RTC ISR clears the interrupt flag after the application-supplied
+     * handler returns. Since restart is called here, the flag needs to be
+     * cleared manually.
+     */
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, RTC_CNTL_BROWN_OUT_INT_CLR);
+    /* Stall the other CPU to make sure the code running there doesn't use UART
+     * at the same time as the following ets_printf.
+     */
+    esp_cpu_stall(!xPortGetCoreID());
+    esp_reset_reason_set_hint(ESP_RST_BROWNOUT);
+    ets_printf("\r\nBrownout detector was triggered\r\n\r\n");
+    esp_restart_noos();
+}
 
+void esp_brownout_init()
+{
+    REG_WRITE(RTC_CNTL_BROWN_OUT_REG,
+            RTC_CNTL_BROWN_OUT_ENA /* Enable BOD */
+            | RTC_CNTL_BROWN_OUT_PD_RF_ENA /* Automatically power down RF */
+            /* Reset timeout must be set to >1 even if BOR feature is not used */
+            | (2 << RTC_CNTL_BROWN_OUT_RST_WAIT_S)
+            | (BROWNOUT_DET_LVL << RTC_CNTL_DBROWN_OUT_THRES_S));
 
-#if CONFIG_BROWNOUT_DET
-/*
-This file is included in esp-idf, but the menuconfig option for this is disabled because a silicon bug
-prohibits the brownout detector from functioning correctly on the ESP32.
-*/
-
-void esp_brownout_init() {
-    WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 
-            RTC_CNTL_BROWN_OUT_ENA | (CONFIG_BROWNOUT_DET_LVL << RTC_CNTL_DBROWN_OUT_THRES_S) |
-            RTC_CNTL_BROWN_OUT_RST_ENA | (((CONFIG_BROWNOUT_DET_RESETDELAY*150)/1000) << RTC_CNTL_BROWN_OUT_RST_WAIT_S) |
-            RTC_CNTL_BROWN_OUT_PD_RF_ENA|RTC_CNTL_BROWN_OUT_CLOSE_FLASH_ENA);
+    ESP_ERROR_CHECK( rtc_isr_register(rtc_brownout_isr_handler, NULL, RTC_CNTL_BROWN_OUT_INT_ENA_M) );
 
+    REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_BROWN_OUT_INT_ENA_M);
 }
-
-#endif
\ No newline at end of file