jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix initial default settings

Browse Source
This commit is contained in:
Theo Arends 2024-05-05 18:21:03 +02:00
parent 3d0532ce8c
commit 53073b374d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/tasmota.ino
View File

@ -380,7 +380,7 @@ struct TasmotaGlobal_t {
#ifdef USE_BERRY #ifdef USE_BERRY
bool berry_fast_loop_enabled = false; // is Berry fast loop enabled, i.e. control is passed at each loop iteration bool berry_fast_loop_enabled = false; // is Berry fast loop enabled, i.e. control is passed at each loop iteration
#endif // USE_BERRY #endif // USE_BERRY
} TasmotaGlobal; } TasmotaGlobal = { 0 };
TSettings* Settings = nullptr; TSettings* Settings = nullptr;
@ -418,7 +418,6 @@ void setup(void) {
EmergencyReset(); EmergencyReset();
#endif // USE_EMERGENCY_RESET #endif // USE_EMERGENCY_RESET
memset(&TasmotaGlobal, 0, sizeof(TasmotaGlobal));
TasmotaGlobal.baudrate = APP_BAUDRATE; TasmotaGlobal.baudrate = APP_BAUDRATE;
TasmotaGlobal.seriallog_timer = SERIALLOG_TIMER; TasmotaGlobal.seriallog_timer = SERIALLOG_TIMER;
TasmotaGlobal.temperature_celsius = NAN; TasmotaGlobal.temperature_celsius = NAN;
@ -454,7 +453,7 @@ void setup(void) {
// Init settings and logging preparing for AddLog use // Init settings and logging preparing for AddLog use
#ifdef PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED #ifdef PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED
ESP.setIramHeap(); ESP.setIramHeap();
Settings = (TSettings*)malloc(sizeof(TSettings)); // Allocate in "new" 16k heap space Settings = (TSettings*)calloc(sizeof(TSettings), 1); // Allocate in "new" 16k heap space
TasmotaGlobal.log_buffer = (char*)malloc(LOG_BUFFER_SIZE); // Allocate in "new" 16k heap space TasmotaGlobal.log_buffer = (char*)malloc(LOG_BUFFER_SIZE); // Allocate in "new" 16k heap space
ESP.resetHeap(); ESP.resetHeap();
if (TasmotaGlobal.log_buffer == nullptr) { if (TasmotaGlobal.log_buffer == nullptr) {
@ -465,7 +464,7 @@ void setup(void) {
} }
#endif // PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED #endif // PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED
if (Settings == nullptr) { if (Settings == nullptr) {
Settings = (TSettings*)malloc(sizeof(TSettings)); Settings = (TSettings*)calloc(sizeof(TSettings), 1);
} }
#ifdef ESP32 #ifdef ESP32