diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cb92a4f..d783e74 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -83,7 +83,7 @@ jobs: - board: esp32 addr_bootloader: 0x1000 chip: ESP32 - fqbn: esp32:esp32:esp32:PartitionScheme=default,FlashMode=qio,FlashFreq=80,DebugLevel=none + fqbn: esp32:esp32:esp32wrover:PartitionScheme=default,FlashMode=qio,FlashFreq=80,DebugLevel=none # esp32:esp32:esp32wrover:PartitionScheme=default,FlashMode=qio,FlashFreq=80,UploadSpeed=921600,DebugLevel=none,EraseFlash=none name: ESP32 obname: SomfyController.onboard.esp32.bin @@ -91,14 +91,14 @@ jobs: - board: esp32c3 addr_bootloader: 0x0 chip: ESP32-C3 - fqbn: esp32:esp32:esp32c3 + fqbn: esp32:esp32:esp32c3:JTAGAdapter=default,USBMode=hwcdc,CDCOnBoot=cdc,DebugLevel=none,FlashMode=qio,PartitionScheme=default name: ESP32C3 obname: SomfyController.onboard.esp32c3.bin fwname: SomfyController.ino.esp32c3.bin - board: esp32s2 addr_bootloader: 0x1000 chip: ESP32-S2 - fqbn: esp32:esp32:esp32s2 + fqbn: esp32:esp32:esp32s2:JTAGAdapter=default,USBMode=hwcdc,CDCOnBoot=cdc,DebugLevel=none,FlashMode=qio,PartitionScheme=default,PSRAM=disabled name: ESP32S2 obname: SomfyController.onboard.esp32s2.bin fwname: SomfyController.ino.esp32s2.bin diff --git a/Somfy.cpp b/Somfy.cpp index 1bce68a..dbc9ee5 100644 --- a/Somfy.cpp +++ b/Somfy.cpp @@ -4318,7 +4318,7 @@ void Transceiver::disableReceive(void) { } bool Transceiver::toJSON(JsonObject& obj) { - Serial.println("Setting Transceiver Json"); + //Serial.println("Setting Transceiver Json"); JsonObject objConfig = obj.createNestedObject("config"); this->config.toJSON(objConfig); return true; @@ -4352,7 +4352,7 @@ bool Transceiver::end() { return true; } void transceiver_config_t::fromJSON(JsonObject& obj) { - Serial.print("Deserialize Radio JSON "); + //Serial.print("Deserialize Radio JSON "); if(obj.containsKey("type")) this->type = obj["type"]; if(obj.containsKey("CSNPin")) this->CSNPin = obj["CSNPin"]; if(obj.containsKey("MISOPin")) this->MISOPin = obj["MISOPin"]; @@ -4433,8 +4433,8 @@ void transceiver_config_t::toJSON(JsonObject& obj) { */ obj["enabled"] = this->enabled; obj["radioInit"] = this->radioInit; - Serial.print("Serialize Radio JSON "); - Serial.printf("SCK:%u MISO:%u MOSI:%u CSN:%u RX:%u TX:%u\n", this->SCKPin, this->MISOPin, this->MOSIPin, this->CSNPin, this->RXPin, this->TXPin); + //Serial.print("Serialize Radio JSON "); + //Serial.printf("SCK:%u MISO:%u MOSI:%u CSN:%u RX:%u TX:%u\n", this->SCKPin, this->MISOPin, this->MOSIPin, this->CSNPin, this->RXPin, this->TXPin); } void transceiver_config_t::save() { pref.begin("CC1101"); diff --git a/SomfyController.ino b/SomfyController.ino index 804c6fa..a814649 100644 --- a/SomfyController.ino +++ b/SomfyController.ino @@ -18,6 +18,7 @@ SomfyShadeController somfy; MQTTClass mqtt; GitUpdater git; +uint32_t oldheap = 0; void setup() { Serial.begin(115200); Serial.println(); @@ -39,6 +40,7 @@ void setup() { void loop() { // put your main code here, to run repeatedly: + //uint32_t heap = ESP.getFreeHeap(); if(rebootDelay.reboot && millis() > rebootDelay.rebootTime) { Serial.print("Rebooting after "); Serial.print(rebootDelay.rebootTime); @@ -65,4 +67,13 @@ void loop() { net.end(); ESP.restart(); } + /* + if(heap < oldheap) { + Serial.print("Heap: "); + Serial.print(oldheap); + Serial.print(" -> "); + Serial.println(heap); + } + oldheap = heap; + */ } diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index a50e3e4..c6f25f1 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/SomfyController.ino.esp32s3.bin b/SomfyController.ino.esp32s3.bin index 50a0fe1..4b46327 100644 Binary files a/SomfyController.ino.esp32s3.bin and b/SomfyController.ino.esp32s3.bin differ