Skip to content

Commit a185429

Browse files
authored
Tasmota changes
1 parent 0260cd6 commit a185429

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

Diff for: .github/scripts/install-arduino-core-esp32.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
2020
ln -s $GITHUB_WORKSPACE esp32
2121
else
2222
echo "Cloning Core Repository..."
23-
git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1
23+
git clone https://github.com/tasmota/arduino-esp32.git esp32 > /dev/null 2>&1
2424
fi
2525

2626
#echo "Updating Submodules ..."

Diff for: CMakeLists.txt

-12
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ set(LIBRARY_SRCS
9191
libraries/I2S/src/I2S.cpp
9292
libraries/NetBIOS/src/NetBIOS.cpp
9393
libraries/Preferences/src/Preferences.cpp
94-
libraries/RainMaker/src/RMaker.cpp
95-
libraries/RainMaker/src/RMakerNode.cpp
96-
libraries/RainMaker/src/RMakerParam.cpp
97-
libraries/RainMaker/src/RMakerDevice.cpp
98-
libraries/RainMaker/src/RMakerType.cpp
99-
libraries/RainMaker/src/RMakerQR.cpp
100-
libraries/RainMaker/src/RMakerUtils.cpp
10194
libraries/SD_MMC/src/SD_MMC.cpp
10295
libraries/SD/src/SD.cpp
10396
libraries/SD/src/sd_diskio.cpp
@@ -187,7 +180,6 @@ set(includedirs
187180
libraries/I2S/src
188181
libraries/NetBIOS/src
189182
libraries/Preferences/src
190-
libraries/RainMaker/src
191183
libraries/SD_MMC/src
192184
libraries/SD/src
193185
libraries/SimpleBLE/src
@@ -242,10 +234,6 @@ endfunction()
242234

243235
maybe_add_component(esp-dsp)
244236

245-
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
246-
maybe_add_component(esp_rainmaker)
247-
maybe_add_component(qrcode)
248-
endif()
249237
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
250238
maybe_add_component(arduino_tinyusb)
251239
endif()

Diff for: cores/esp32/Esp.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ String EspClass::getSketchMD5()
231231
md5.add(buf.get(), readBytes);
232232
lengthLeft -= readBytes;
233233
offset += readBytes;
234+
235+
#if CONFIG_FREERTOS_UNICORE
236+
delay(1); // Fix solo WDT
237+
#endif
234238
}
235239
md5.calculate();
236240
result = md5.toString();

Diff for: libraries/Update/src/Updater.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,8 @@ size_t UpdateClass::writeStream(Stream &data) {
386386
if((_bufferLen == remaining() || _bufferLen == SPI_FLASH_SEC_SIZE) && !_writeBuffer())
387387
return written;
388388
written += toRead;
389+
390+
delay(1); // Fix solo WDT
389391
}
390392
return written;
391393
}

0 commit comments

Comments
 (0)