Skip to content

Commit da277a0

Browse files
Jason2866valerosOuss4pedrominatelP-R-O-C-H-Y
authored
updates from upstream (#134)
* LittleFs is working with C3 * Delete .skip.esp32c3 * Add support for extra flash images (espressif#6625) This PR adds support for uploading additional flash images (e.g. Adafruit Tiny UF2 bootloader) specified in board manifests. Additionally, the PR switches the PlatformIO CI script to the upstream version of the ESP32 dev-platform (basically reverts changes introduced in espressif#5387 as they are no longer required). * publish.yml: Remove a leftover parenthesis that was making the workflow (espressif#6620) Description of Change Remove a leftover parenthesis that was making the workflow that was making the workflow invalid. Tests scenarios Github Workflow. Related links https://github.com/espressif/arduino-esp32/actions/runs/2213167501 Signed-off-by: Abdelatif Guettouche <[email protected]> * Enable LittleFs sketches for C3 (espressif#6618) * LittleFs is working with C3 * Delete .skip.esp32c3 * Update LittleFS PlatformIO example (espressif#6617) * Added RainMaker support on Arduino IDE for ESP32-C3/S2/S3 (espressif#6598) * Added RainMaker support on Arduino IDE for ESP32-C3/S2/S3 Closes espressif#6573 Note related to the issue espressif#6435 * Touch change to init only selected GPIO. (espressif#6609) * Separated init for touch / channel called by touchRead() * compile error * Fixed touch_V2 + ISR * Allow BluetoothSerial::connect() with specified channel and more options (espressif#6380) * BTAddress const, add bool() * BTAdvertisedDevice: const functions * BluetoothSerial: add: getChannels, add isClosed, add read/peek timeout, add connect with channel# * BluetoothSerial: add sec_mask, role in ::connect * BluetoothSerial add discover and connect with channel number example * DiscoverConnect: add SPP_ENABLED check * DiscoverConnect: disable on esp32s3 * Fixes stream load memory leak in WifiSecureClient for SSL CACert, Certificate, and (espressif#6387) Private Key. Issue presented during any subsequent invocation of loadCACert, loadCertificate, and loadPrivateKey, respectively, after the first invocation. * Call i2c_set_timeout in i2cSetClock (espressif#6537) * Uniform behaviour of WiFiClientSecure and WiFiClient setTimeout() (espressif#6562) * Uniform timeout WiFiClient-WiFiClientSecure * Added missing prototype * Add socket check on setTimeout * enh(log) salvage TAG from ESP_IDF log-statements > (espressif#6567) by converting result log-rows from the 1st line to the 2nd (`NET` is the tag): ``` [ 73419][D][telelogger.cpp:915] telemetry(): state: 33C [ 73419][D][telelogger.cpp:915] telemetry(): [NET] state: 33C ``` Co-authored-by: Me No Dev <[email protected]> * add AirM2M_CORE_ESP32C3 board (espressif#6613) * add AirM2M_CORE_ESP32C3 board * Added Unexpected Maker Reflow Master Pro (UM RMP) board (espressif#6630) Fixed wrong SCK and MISO pins for TinyS2 * Tasmota changes (#24) * Update install-arduino-core-esp32.sh * Update CMakeLists.txt * Update Esp.cpp * Update Updater.cpp Co-authored-by: Valerii Koval <[email protected]> Co-authored-by: Abdelatif Guettouche <[email protected]> Co-authored-by: Pedro Minatel <[email protected]> Co-authored-by: Jan Procházka <[email protected]> Co-authored-by: Christian Ferbar <[email protected]> Co-authored-by: Billy <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: Gonzalo Brusco <[email protected]> Co-authored-by: Kostis Anagnostopoulos <[email protected]> Co-authored-by: Me No Dev <[email protected]> Co-authored-by: Darren Cheng <[email protected]> Co-authored-by: Unexpected Maker <[email protected]>
1 parent f60cd8a commit da277a0

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
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

-10
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ set(LIBRARY_SRCS
9090
libraries/I2S/src/I2S.cpp
9191
libraries/NetBIOS/src/NetBIOS.cpp
9292
libraries/Preferences/src/Preferences.cpp
93-
libraries/RainMaker/src/RMaker.cpp
94-
libraries/RainMaker/src/RMakerNode.cpp
95-
libraries/RainMaker/src/RMakerParam.cpp
96-
libraries/RainMaker/src/RMakerDevice.cpp
97-
libraries/RainMaker/src/RMakerType.cpp
9893
libraries/SD_MMC/src/SD_MMC.cpp
9994
libraries/SD/src/SD.cpp
10095
libraries/SD/src/sd_diskio.cpp
@@ -184,7 +179,6 @@ set(includedirs
184179
libraries/I2S/src
185180
libraries/NetBIOS/src
186181
libraries/Preferences/src
187-
libraries/RainMaker/src
188182
libraries/SD_MMC/src
189183
libraries/SD/src
190184
libraries/SimpleBLE/src
@@ -239,10 +233,6 @@ endfunction()
239233

240234
maybe_add_component(esp-dsp)
241235

242-
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
243-
maybe_add_component(esp_rainmaker)
244-
maybe_add_component(qrcode)
245-
endif()
246236
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
247237
maybe_add_component(arduino_tinyusb)
248238
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
@@ -377,6 +377,8 @@ size_t UpdateClass::writeStream(Stream &data) {
377377
if((_bufferLen == remaining() || _bufferLen == SPI_FLASH_SEC_SIZE) && !_writeBuffer())
378378
return written;
379379
written += toRead;
380+
381+
delay(1); // Fix solo WDT
380382
}
381383
return written;
382384
}

0 commit comments

Comments
 (0)