mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Core3 ESP32S2 compile

This commit is contained in:
Theo Arends 2024-04-15 13:00:09 +02:00
parent 8045ca20ac
commit 1fe18cf7b6
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasmota/include/tasconsole.h
View File

@ -21,7 +21,7 @@ class TASCONSOLE {
virtual size_t printf(char *) = 0; virtual size_t printf(char *) = 0;
virtual size_t read() = 0; virtual size_t read() = 0;
virtual size_t setRxBufferSize(size_t) = 0; virtual size_t setRxBufferSize(size_t) = 0;
virtual size_t setTxBufferSize(size_t) = 0; // virtual size_t setTxBufferSize(size_t) = 0;
}; };
public: public:
@ -66,9 +66,9 @@ public:
return object->setRxBufferSize(rx_queue_len); return object->setRxBufferSize(rx_queue_len);
} }
size_t setTxBufferSize(size_t rx_queue_len) { // size_t setTxBufferSize(size_t rx_queue_len) {
return object->setTxBufferSize(rx_queue_len); // return object->setTxBufferSize(rx_queue_len);
} // }
template< typename T > template< typename T >
struct Model : Concept { struct Model : Concept {
@ -108,9 +108,9 @@ public:
return object.setRxBufferSize(size); return object.setRxBufferSize(size);
} }
size_t setTxBufferSize(size_t size) override { // size_t setTxBufferSize(size_t size) override {
return object.setTxBufferSize(size); // return object.setTxBufferSize(size);
} // }
private: private:
T object; T object;

4
tasmota/tasmota.ino
View File

@ -236,7 +236,9 @@ TASCONSOLE TasConsole{HWCDCSerial}; // ESP32C3/C6/S3 embedded USB using
#else // No ARDUINO_USB_MODE #else // No ARDUINO_USB_MODE
#include "USB.h" #include "USB.h"
#include "USBCDC.h" #include "USBCDC.h"
//USBCDC USBSerial; // Already defined in USBCDC.cpp #if !ARDUINO_USB_CDC_ON_BOOT
USBCDC USBSerial; // Already defined in USBCDC.cpp
#endif // ARDUINO_USB_CDC_ON_BOOT
TASCONSOLE TasConsole{USBSerial}; // ESP32Sx embedded USB interface TASCONSOLE TasConsole{USBSerial}; // ESP32Sx embedded USB interface
//#warning **** TasConsole uses USBCDC **** //#warning **** TasConsole uses USBCDC ****
#endif // ARDUINO_USB_MODE #endif // ARDUINO_USB_MODE