Skip to content

Commit 3803cad

Browse files
committed
fix issue with rtc wdt
1 parent 509bcd3 commit 3803cad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+14
-10
lines changed

cores/esp32/esp32-hal-psram.h

+11
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@
1919
extern "C" {
2020
#endif
2121

22+
#include "sdkconfig.h"
23+
24+
#ifndef BOARD_HAS_PSRAM
25+
#ifdef CONFIG_SPIRAM_SUPPORT
26+
#undef CONFIG_SPIRAM_SUPPORT
27+
#endif
28+
#ifdef CONFIG_SPIRAM
29+
#undef CONFIG_SPIRAM
30+
#endif
31+
#endif
32+
2233
bool psramInit();
2334
bool psramFound();
2435

cores/esp32/esp32-hal.h

-6
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ void yield(void);
7777
#include "esp32-hal-psram.h"
7878
#include "esp32-hal-cpu.h"
7979

80-
#ifndef BOARD_HAS_PSRAM
81-
#ifdef CONFIG_SPIRAM_SUPPORT
82-
#undef CONFIG_SPIRAM_SUPPORT
83-
#endif
84-
#endif
85-
8680
//returns chip temperature in Celsius
8781
float temperatureRead();
8882

tools/sdk/esp32s2/include/config/sdkconfig.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define CONFIG_BOOTLOADER_SPI_WP_PIN 7
2121
#define CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V 1
2222
#define CONFIG_BOOTLOADER_WDT_ENABLE 1
23-
#define CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE 1
2423
#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
2524
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
2625
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10

tools/sdk/esp32s2/ld/esp32s2.project.ld

+2-2
Large diffs are not rendered by default.

tools/sdk/esp32s2/lib/libapp_trace.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libasio.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcbor.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcoap.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libconsole.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcxx.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libdriver.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libefuse.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp-tls.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp32s2.a

1.22 KB
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_common.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_eth.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_event.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_hid.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_netif.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_system.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_timer.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_wifi.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libexpat.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfatfs.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfb_gfx.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfreemodbus.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfreertos.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libheap.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libjsmn.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libjson.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblibsodium.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblog.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblwip.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedcrypto.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedtls.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedx509.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmdns.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmqtt.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnewlib.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnghttp.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnvs_flash.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libopenssl.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libperfmon.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libprotobuf-c.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libprotocomm.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libpthread.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libsdmmc.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libsoc.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libspi_flash.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libspiffs.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libulp.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libunity.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libvfs.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libxtensa.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
5353
# CONFIG_BOOTLOADER_FACTORY_RESET is not set
5454
# CONFIG_BOOTLOADER_APP_TEST is not set
5555
CONFIG_BOOTLOADER_WDT_ENABLE=y
56-
CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=y
56+
# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
5757
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
5858
# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
5959
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y

0 commit comments

Comments
 (0)