Skip to content

Commit f92be06

Browse files
Jason2866arendstme-no-devP-R-O-C-H-YJason2866
authored
Tasmota changes
* Fix wdt OTA update * Fix ESP32-Solo WDT on HTTP OTA update Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com> * Fix ESP32-Solo WDT on HTTP OTA update * Fix ESP32-Solo WDT on HTTP OTA update Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com> * IDF master c69f0ec32 * Fix WDT only for solo core * IDF master 58022f859 * IDF master 606557b48 * IDF master 8131d6f46 * IDF master 59aa60d52 * IDF master 83956ebba * IDF master 83956ebbae * IDF master b1c3ee71c5 * IDF master 2c49af9e75 * IDF master eb1a66e7c9 * IDF master a20df743f1 * Fix build compilation due to changes in the HW_TIMER's structs * Fix compilation warnings and errors with USB * Update USBCDC.cpp * Update CMakeLists.txt * IDF master b63ec47238 * Update libarduino_tinyusb.a * Update HWCDC.cpp * IDF master 5f38b766a8 * IDF master b1f851b8f8 * IDF master 61299f879e * Delete tools/sdk/esp32/include/coap directory * Delete tools/sdk/esp32c3/include/coap directory * Delete tools/sdk/esp32s2/include/coap directory * solve conflicts * force Dynamic Buffer instead of Static ones * Remove debug if * Resolve conflicts * Revert espressif#5861 * add GPIO defines for C3 * Edit sd_diskio to check card status * Update CMakeLists.txt * Delete libraries/RainMaker directory * Update README.md * Update README.md * Revert "RMT refactor" * Fixes Lib Builder compiling errors * Fixes Lib Builder compiling errors * Revert "Revert "RMT refactor"" * Update esp32-hal-rmt.c * Update esp32-hal-rmt.c * Update esp32-hal-rmt.c * Update esp32-hal-rmt.c * Update esp32-hal-gpio.c * Bugfix of ff_sd_status * Fix I2C Slave Compile I2C Slave currently doesn't compile for projects where Arduino is an IDF component. This adds missing conditionals. * add missing c3 define when disable HAL lock is set * add ESP32C3 `esp32_adc2gpio` * Fixes UART MODBUS and Loopback issue * Update esp32-hal-uart.c * Revert "Fixing interrupts in LEDC (espressif#6160)" This reverts commit a593206. * Update esp32-hal.h * use Tasmota github * Use Tasmota platform for CI * tasmota eaptool v3.2 * add missing c3 define * enable SPI hal for S3 * revert enable spi for S3 * Update Esp.cpp * Update Esp.cpp * fix S3 uart gpios * Update HardwareSerial.cpp * Update Esp.cpp * Update Esp.cpp * Bootloader is at 0x0000 for S3 * Update esp32-hal-cpu.c * Update esp32-hal-spi.c * Update install-platformio-esp32.sh * Fix replace() failing * Update CMakeLists.txt * remove Rainmaker * Update CMakeLists.txt * try to find lib builder fail * Update CMakeLists.txt * Update idf_component.yml * Update esp32-hal-ledc.c * Update esp32-hal-gpio.c * Update esp32-hal-gpio.h * Update boards.txt * Update idf_component.yml * Update esp32-hal-gpio.c * Update esp32-hal-ledc.c * Update idf_component.yml * Add files via upload * Update HTTPClient.cpp * Update HTTPClient.h * Fixes RMT examples and adds ESP32-S3 config * Fixes RMT examples and adds ESP32-S3 config * fix compile * fix compile 2 * fix compile 3 * revert cookie changes * revert cookie jar support * cookie jar * cookie jar * Support mbedtls 2.28.x * Update esp32c3.rom.ld * GPIO refactoring GPIO now using ESP-IDF API on all chips. LEDC interrupt fix removed - no longer needed. Edited pins_arduino.h in variants according to changes in gpio. * Update esp32-hal-gpio.c * Update esp32-hal-ledc.c * Update HTTPClient.cpp * Update ssl_client.cpp * Update boards.txt * Update esp32-hal-gpio.c * Update esp32-hal-ledc.c * Edited analog channels functions * Update esp32-hal-gpio.c * Update esp32-hal-gpio.h * Update esp32-hal-ledc.c * Fix CDC+JTAG is disabled when WiFi is used on ESP32-C3 Fixes: espressif#6264 Thanks @Spritetm * ADC esp32s2 attenuation fix for DAC pins * Revert "ADC esp32s2 attenuation fix for DAC pins" * revert6134 espressif#6134 * revert2 * revert3 * revert * Update HardwareSerial.cpp * Update HardwareSerial.h * Update esp32-hal-uart.c * Update esp32-hal-uart.h * S3 * Update esp32-hal-adc.c * Fix ethenet * align with arduino upstream * Adds C++ std::function to Serial.onReceive() PR6364 upstream * Update esp32-hal-uart.c * Update HardwareSerial.cpp * Update esp32-hal-uart.c * Update boards.txt * Update HardwareSerial.cpp * Update HardwareSerial.h * Update WiFiAP.cpp * Update WiFiGeneric.cpp * Update WiFiGeneric.h * Update WiFiSTA.cpp * Update WiFiSTA.h * Update HardwareSerial.cpp * Update HardwareSerial.h * Delete libraries/RainMaker directory * remove rainmaker * Fixes USB CDC setRxBufferSize(), begin(), _onRX() * Fixes SetRxBufferSize(0) with end() * Fixes reset when 2x call to end() * publish.yml: Limit the running scope of the publish Workflow. (espressif#6428) 1. Don't run the publish test result workflow on the master branch. 2. Run only on Pull Requests to be able to publish the result as a PR comment. 3. Avoid running when the triggering workflow was skipped, this will cause a failure as no file will be uploaded. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com> * Add missing include in AsyncUDP.h (espressif#6412) In my project I'm getting the error ``` In file included from lib/Discovery/Discovery.cpp:2: C:/Users/David/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src/AsyncUDP.h:47:1: error: expected class-name before '{' token ``` Adding a reference to Stream.h fixes it. * Some board variant fixes (espressif#6411) * make work with rev C pcb * use #define for easy testing * Added another overloaded WiFiSTAClass::begin() function that provides… (espressif#6398) Summary The examples demonstrate how to create a WPA2 Enterprise connection, but it requires using various direct esp_idf functions. This patch is intended to create another overloaded version of the WiFi.begin() function that allows a user to create a WPA2 Enterprise connection in much the same way as different kinds of connections. My only question for the core maintainers is whether I should leave those #ifdef's in there. I added them so that it was easy to disable all the code I added via defines from my platformio.ini file, but they technically aren't necessary. Impact This should make it easier for novice users to create WPA2 Enterprise connections. For my university, I didn't need a root certificate or the client certificate or client key, so I haven't been able to debug those scenarios, but I built the begin functions to allow any one of those to be used, if needed. I can confirm that eduroam-style WPA2 Enterprise networks that only require authentication with a username and password works as expected. * Fix boot freeze when trying to init PSRAM on Pico D4 * Revert "Added another overloaded WiFiSTAClass::begin() function that provides… (espressif#6398)" This reverts commit d977359. * fix rainmaker merge Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com> Co-authored-by: me-no-dev <me-no-dev@users.noreply.github.com> Co-authored-by: me-no-dev <hristo@espressif.com> Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Co-authored-by: Jason2866 <jason2866@github.com> Co-authored-by: Rodrigo Garcia <Rodrigo.Garcia@espressif.com> Co-authored-by: mrengineer7777 <44048235+mrengineer7777@users.noreply.github.com> Co-authored-by: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Co-authored-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com> Co-authored-by: Limor "Ladyada" Fried <limor@ladyada.net> Co-authored-by: John P. Swensen <jpswensen@gmail.com> Co-authored-by: Stephan Hadinger <stephan.hadinger@gmail.com>
1 parent 86b6635 commit f92be06

File tree

16 files changed

+69
-38
lines changed

16 files changed

+69
-38
lines changed

‎.github/scripts/install-arduino-core-esp32.sh‎

Lines changed: 1 addition & 1 deletion
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 ..."

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Unit Test Results
33
on:
44
workflow_run:
55
workflows: [Run tests in hardware]
6+
branches-ignore: [master]
67

78
types:
89
- completed
@@ -11,6 +12,9 @@ jobs:
1112
unit-test-results:
1213
name: Unit Test Results
1314
runs-on: ubuntu-latest
15+
if: |
16+
github.event.workflow_run.event == 'pull_request' &&
17+
github.event.workflow_run.conclusion != 'skipped'
1418
steps:
1519
- name: Download and Extract Artifacts
1620
env:

‎boards.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13017,4 +13017,4 @@ deneyapkart1A.menu.DebugLevel.debug.build.code_debug=4
1301713017
deneyapkart1A.menu.DebugLevel.verbose=Verbose
1301813018
deneyapkart1A.menu.DebugLevel.verbose.build.code_debug=5
1301913019

13020-
##############################################################
13020+
##############################################################

‎cores/esp32/Esp.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern "C" {
4747
#elif CONFIG_IDF_TARGET_ESP32C3
4848
#include "esp32c3/rom/spi_flash.h"
4949
#define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c3 is located at 0x0000
50-
#else
50+
#else
5151
#error Target CONFIG_IDF_TARGET is not supported
5252
#endif
5353
#else // ESP32 Before IDF 4.0
@@ -192,7 +192,7 @@ static uint32_t sketchSize(sketchSize_t response) {
192192
return data.image_len;
193193
}
194194
}
195-
195+
196196
uint32_t EspClass::getSketchSize () {
197197
return sketchSize(SKETCH_SIZE_TOTAL);
198198
}
@@ -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();
@@ -391,17 +395,17 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size)
391395
return spi_flash_read(offset, (uint32_t*) data, size) == ESP_OK;
392396
}
393397

394-
bool EspClass::partitionEraseRange(const esp_partition_t *partition, uint32_t offset, size_t size)
398+
bool EspClass::partitionEraseRange(const esp_partition_t *partition, uint32_t offset, size_t size)
395399
{
396400
return esp_partition_erase_range(partition, offset, size) == ESP_OK;
397401
}
398402

399-
bool EspClass::partitionWrite(const esp_partition_t *partition, uint32_t offset, uint32_t *data, size_t size)
403+
bool EspClass::partitionWrite(const esp_partition_t *partition, uint32_t offset, uint32_t *data, size_t size)
400404
{
401405
return esp_partition_write(partition, offset, data, size) == ESP_OK;
402406
}
403407

404-
bool EspClass::partitionRead(const esp_partition_t *partition, uint32_t offset, uint32_t *data, size_t size)
408+
bool EspClass::partitionRead(const esp_partition_t *partition, uint32_t offset, uint32_t *data, size_t size)
405409
{
406410
return esp_partition_read(partition, offset, data, size) == ESP_OK;
407411
}

‎cores/esp32/HardwareSerial.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void serialEvent(void) {}
3737
#ifndef RX1
3838
#if CONFIG_IDF_TARGET_ESP32
3939
#define RX1 9
40-
#elif CONFIG_IDF_TARGET_ESP32S2
40+
#elif CONFIG_IDF_TARGET_ESP32S2
4141
#define RX1 18
4242
#elif CONFIG_IDF_TARGET_ESP32C3
4343
#define RX1 18
@@ -86,6 +86,8 @@ void serialEvent2(void) {}
8686
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
8787
#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
8888
HardwareSerial Serial0(0);
89+
#elif ARDUINO_HW_CDC_ON_BOOT
90+
HardwareSerial Serial0(0);
8991
#else
9092
HardwareSerial Serial(0);
9193
#endif
@@ -100,6 +102,8 @@ void serialEventRun(void)
100102
{
101103
#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
102104
if(Serial0.available()) serialEvent();
105+
#elif ARDUINO_HW_CDC_ON_BOOT
106+
if(Serial0.available()) serialEvent();
103107
#else
104108
if(Serial.available()) serialEvent();
105109
#endif

‎cores/esp32/HardwareSerial.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ extern void serialEventRun(void) __attribute__((weak));
156156
#define ARDUINO_USB_CDC_ON_BOOT 0
157157
#endif
158158
#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
159-
#if !ARDUINO_USB_MODE
160159
#include "USB.h"
161160
#include "USBCDC.h"
162-
#endif
161+
extern HardwareSerial Serial0;
162+
#elif ARDUINO_HW_CDC_ON_BOOT
163163
extern HardwareSerial Serial0;
164164
#else
165165
extern HardwareSerial Serial;

‎cores/esp32/USBCDC.cpp‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,14 @@ void USBCDC::onEvent(arduino_usb_cdc_event_t event, esp_event_handler_t callback
114114
}
115115

116116
size_t USBCDC::setRxBufferSize(size_t rx_queue_len){
117-
if(rx_queue){
118-
if(!rx_queue_len){
117+
size_t currentQueueSize = rx_queue ?
118+
uxQueueSpacesAvailable(rx_queue) + uxQueueMessagesWaiting(rx_queue) : 0;
119+
120+
if (rx_queue && (!rx_queue_len || rx_queue_len != currentQueueSize)) {
119121
vQueueDelete(rx_queue);
120122
rx_queue = NULL;
121-
}
123+
}
124+
if(!rx_queue_len || rx_queue_len == currentQueueSize){
122125
return 0;
123126
}
124127
rx_queue = xQueueCreate(rx_queue_len, sizeof(uint8_t));
@@ -133,7 +136,8 @@ void USBCDC::begin(unsigned long baud)
133136
if(tx_lock == NULL) {
134137
tx_lock = xSemaphoreCreateMutex();
135138
}
136-
setRxBufferSize(256);//default if not preset
139+
// if rx_queue was set before begin(), keep it
140+
if (!rx_queue) setRxBufferSize(256); //default if not preset
137141
devices[itf] = this;
138142
}
139143

@@ -144,6 +148,7 @@ void USBCDC::end()
144148
setRxBufferSize(0);
145149
if(tx_lock != NULL) {
146150
vSemaphoreDelete(tx_lock);
151+
tx_lock = NULL;
147152
}
148153
}
149154

@@ -246,14 +251,27 @@ void USBCDC::_onLineCoding(uint32_t _bit_rate, uint8_t _stop_bits, uint8_t _pari
246251
void USBCDC::_onRX(){
247252
uint8_t buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE+1];
248253
uint32_t count = tud_cdc_n_read(itf, buf, CONFIG_TINYUSB_CDC_RX_BUFSIZE);
254+
255+
if(rx_queue == NULL) {
256+
return;
257+
}
258+
if (uxQueueSpacesAvailable(rx_queue) < count) {
259+
//this VTaskDelay gives, to Arduino's task, time to the CPU do its processing
260+
//without it, data may be lost when the number of bytes received is higher than CDC buffer size
261+
vTaskDelay(10);
262+
}
249263
for(uint32_t i=0; i<count; i++){
250-
if(rx_queue == NULL || !xQueueSend(rx_queue, buf+i, 0)){
251-
return;
264+
if(!xQueueSend(rx_queue, buf+i, 0)){
265+
// rx_queue overflow - data will be lost
266+
count = i;
267+
break;
252268
}
253269
}
254-
arduino_usb_cdc_event_data_t p;
255-
p.rx.len = count;
256-
arduino_usb_event_post(ARDUINO_USB_CDC_EVENTS, ARDUINO_USB_CDC_RX_EVENT, &p, sizeof(arduino_usb_cdc_event_data_t), portMAX_DELAY);
270+
if (count) {
271+
arduino_usb_cdc_event_data_t p;
272+
p.rx.len = count;
273+
arduino_usb_event_post(ARDUINO_USB_CDC_EVENTS, ARDUINO_USB_CDC_RX_EVENT, &p, sizeof(arduino_usb_cdc_event_data_t), portMAX_DELAY);
274+
}
257275
}
258276

259277
void USBCDC::_onTX(){

‎cores/esp32/esp32-hal-psram.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ bool psramInit(){
5656
#if CONFIG_IDF_TARGET_ESP32
5757
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
5858
uint32_t pkg_ver = chip_ver & 0x7;
59-
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) {
59+
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4) {
6060
spiramFailed = true;
6161
log_w("PSRAM not supported!");
6262
return false;

‎libraries/AsyncUDP/src/AsyncUDP.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "IPAddress.h"
55
#include "IPv6Address.h"
66
#include "Print.h"
7+
#include "Stream.h"
78
#include <functional>
89
extern "C" {
910
#include "lwip/ip_addr.h"

‎libraries/ESP32/examples/RMT/RMTCallback/RMTCallback.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ void loop()
6464
{
6565
Serial.printf("GPIO 4: %08x 5: %08x 10: %08x\n", mp1.val(), mp2.val(), mp3.val());
6666
delay(500);
67-
}
67+
}

0 commit comments

Comments
 (0)