File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4444#else
4545#define esp_himem_reserved_area_size () (0)
4646#endif
47- bool ok_to_reserve_psram = true;
4847size_t reserved_psram = DEFAULT_RESERVED_PSRAM ;
4948#endif
5049
@@ -63,9 +62,6 @@ bool common_hal_espidf_set_reserved_psram(size_t amount) {
6362 if (!esp_psram_is_initialized ()) {
6463 return false;
6564 }
66- if (!ok_to_reserve_psram ) {
67- return false;
68- }
6965 if (amount > psram_size_usable ()) {
7066 return false;
7167 }
@@ -113,11 +109,7 @@ size_t common_hal_espidf_get_total_psram(void) {
113109intptr_t common_hal_espidf_get_psram_start (void ) {
114110 #ifdef CONFIG_SPIRAM
115111 if (esp_psram_is_initialized ()) {
116- #ifdef CONFIG_IDF_TARGET_ESP32
117112 return SOC_EXTRAM_DATA_LOW ;
118- #else
119- return SOC_EXTRAM_DATA_HIGH - psram_size_usable ();
120- #endif
121113 }
122114 #endif
123115 return 0 ;
@@ -126,7 +118,7 @@ intptr_t common_hal_espidf_get_psram_start(void) {
126118intptr_t common_hal_espidf_get_psram_end (void ) {
127119 #ifdef CONFIG_SPIRAM
128120 if (esp_psram_is_initialized ()) {
129- return common_hal_espidf_get_psram_start () + psram_size_usable ();
121+ return SOC_EXTRAM_DATA_LOW + psram_size_usable ();
130122 }
131123 #endif
132124 return 0 ;
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
6161# Hardware Abstraction Layer (HAL) and Low Level (LL)
6262#
6363# CONFIG_HAL_ASSERTION_DISABLE is not set
64- # CONFIG_HAL_ASSERTION_SILIENT is not set
64+ # CONFIG_HAL_ASSERTION_SILENT is not set
6565# CONFIG_HAL_ASSERTION_ENABLE is not set
6666CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
6767# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
66CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
77CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384
88
9- CONFIG_ESP_TASK_WDT =n
9+ CONFIG_ESP_TASK_WDT_INIT =n
1010
1111CONFIG_ESP_TLS_SERVER=y
1212
You can’t perform that action at this time.
0 commit comments