Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ESP-IDF5.3] LittleFS: ESP-IDF5.3, SPIFFS: ESP-IDF5.1 #5111

Open
wants to merge 33 commits into
base: mega
Choose a base branch
from
+3,538 −1,973
Open

[ESP-IDF5.3] LittleFS: ESP-IDF5.3, SPIFFS: ESP-IDF5.1 #5111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ebf5526
[ESP-IDF5.3] Add support for ESP-IDF5.3 and SPIFFS builds for IDF5.1
TD-er Aug 23, 2024
c07529f
[ESP-IDF5.3] Fix crashes on sysinfo page
TD-er Aug 23, 2024
f648208
[ESP-IDF5.1] Add LTO to reduce bin size for ESP-IDF5.1 SPIFFS build
TD-er Aug 23, 2024
9e4accf
[ESP-IDF5.3] Fix usable UART ports on ESP32-C6
TD-er Aug 24, 2024
aa42a91
[Build] Fix build error on ESP32 Minimal OTA builds (debug/test builds)
TD-er Aug 24, 2024
47f00ca
[ESP-IDF5.3] Add 5 GHz WiFi modes for upcoming ESP32-C5
TD-er Aug 24, 2024
2d80a6c
[HeatpumpIR] Update lib to latest code
TD-er Aug 24, 2024
2da49d9
[Sysinfo] Add used ESP-IDF version to sysinfo page
TD-er Aug 24, 2024
32b8871
[HeatpumpIR] make the library compile again in ESP-IDF5.3
TD-er Aug 24, 2024
3e4d34b
[ESP-IDF] Make ESP32-S2 build again
TD-er Aug 24, 2024
a628431
[Arduino] Add define as workaround for Arduino change flush() to clear()
TD-er Aug 24, 2024
93b1008
[Uncrustify] Cleanup _P091_SerSwitch.ino
TD-er Aug 24, 2024
00983d7
[ESP-IDF5.3] Fix building on Windows
TD-er Aug 24, 2024
e0f6b29
[ESP-IDF 5.x] Fix detection of ESP32-rev3
TD-er Aug 26, 2024
4ccfa5a
[EDP-IDF] Update to latest IDF5.1 (SPIFFS) & IDF5.3(LittleFS) Arduino304
TD-er Aug 28, 2024
eb8d7c5
[ESP-IDF] Simplify eco mode power management
TD-er Aug 31, 2024
e373e31
[ESP-IDF5.3] Update to latest IDF5.3/Arduino3.0.5
TD-er Sep 1, 2024
3ee5a7e
[ESP-IDF] Revert IDF5.3 to IDF5.1 due to WiFi scan issues
TD-er Sep 2, 2024
8b514e2
[WiFi] Add copy constructor to WiFi_AP_Candidate
TD-er Sep 8, 2024
231e4f3
[Cleanup] simplify ExtraTaskSettings constructor
TD-er Sep 8, 2024
b2fc444
[ESP-IDF5.3] Switch back to IDF5.3 for LittleFS builds
TD-er Sep 14, 2024
88cb1bc
[N001_Email] Increase parse buffer size + cleanup
TD-er Sep 14, 2024
8af2923
[ESP-IDF5.3] Fix build solo1 builds
TD-er Sep 15, 2024
9b0fa9e
[Email] Set timeout on the connection itself
TD-er Sep 15, 2024
0d81a41
Do not apply nr. of decimals before calculating formula (#5123)
TD-er Sep 15, 2024
cffe500
[GPIO] Revert some changes regarding send bootstate on P001
TD-er Sep 15, 2024
0241592
Fix formatting nr. decimals with formula (#5123)
TD-er Sep 15, 2024
762b94a
[Email] Early exit on failing Auth calls + some cleanup
TD-er Sep 17, 2024
94b5716
[ESP-IDF5.3] Move to latest Arduino 3.1 / ESP-IDF 5.3.1 (LittleFS build)
TD-er Sep 18, 2024
42cf759
if we wait for data from SMTP - do not flush received data
uzi18 Sep 20, 2024
f695844
EMail - correct response checking
uzi18 Sep 20, 2024
be5574d
Merge pull request #9 from uzi18/patch-12
TD-er Sep 20, 2024
67e3116
Merge branch 'mega' into feature/ESP_IDF5_3
TD-er Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Blynk/src/BlynkParticle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class BlynkTransportParticle
return client.write((const uint8_t*)buf, len);
}

void flush() { client.flush(); }
void flush() { client.PR_9453_FLUSH_TO_CLEAR(); }
bool connected() { return client.connected(); }
int available() { return client.available(); }

Expand Down
32 changes: 16 additions & 16 deletions lib/ESPEasySerial/ESPEasySerialPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port, bo
case ESPEasySerialPort::serial0_swap: return shortName ? F("serial0swap") : F("HW Serial0 swap");
#endif // ifdef ESP8266
case ESPEasySerialPort::serial0: return shortName ? F("serial0") : F("HW Serial0");
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1: return shortName ? F("serial1") : F("HW Serial1");
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2: return shortName ? F("serial2") : F("HW Serial2");
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
#if USES_SW_SERIAL
case ESPEasySerialPort::software: return shortName ? F("serialsw") : F("SW Serial");
#endif // if USES_SW_SERIAL
Expand All @@ -43,12 +43,12 @@ bool isHWserial(ESPEasySerialPort port)
case ESPEasySerialPort::serial0_swap:
#endif // ifdef ESP8266
case ESPEasySerialPort::serial0:
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1:
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2:
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
return true;
default:
break;
Expand All @@ -63,12 +63,12 @@ bool useGPIOpins(ESPEasySerialPort port)
#ifdef ESP8266
case ESPEasySerialPort::serial0_swap:
#endif // ifdef ESP8266
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1:
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2:
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
#if USES_SW_SERIAL
case ESPEasySerialPort::software:
#endif // if USES_SW_SERIAL
Expand All @@ -90,12 +90,12 @@ bool validSerialPort(ESPEasySerialPort port)
#ifdef ESP8266
case ESPEasySerialPort::serial0_swap:
#endif // ifdef ESP8266
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1:
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2:
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
#if USES_SW_SERIAL
case ESPEasySerialPort::software:
#endif // if USES_SW_SERIAL
Expand Down
8 changes: 4 additions & 4 deletions lib/ESPEasySerial/ESPEasySerialPort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ enum class ESPEasySerialPort : uint8_t {
#ifdef ESP8266
serial0_swap = 3,
#endif // ifdef ESP8266
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
serial1 = 4,
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
serial2 = 5,
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
#if USES_SW_SERIAL
software = 6,
#endif // if USES_SW_SERIAL
Expand Down
16 changes: 8 additions & 8 deletions lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ bool ESPeasySerialType::getSerialTypePins(ESPEasySerialPort serType, int& rxPin,

switch (serType) {
case ESPEasySerialPort::serial0: rxPin = SOC_RX0; txPin = SOC_TX0; return true;
# if SOC_UART_NUM > 1
# if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1: rxPin = SOC_RX1; txPin = SOC_TX1; return true;
# endif // if SOC_UART_NUM > 1
# if SOC_UART_NUM > 2
# endif // if USABLE_SOC_UART_NUM > 1
# if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2: rxPin = SOC_RX2; txPin = SOC_TX2; return true;
# endif // if SOC_UART_NUM > 2
# endif // if USABLE_SOC_UART_NUM > 2
# if USES_I2C_SC16IS752
case ESPEasySerialPort::sc16is752: return true;
# endif // if USES_I2C_SC16IS752
Expand All @@ -37,18 +37,18 @@ ESPEasySerialPort ESPeasySerialType::getSerialType(ESPEasySerialPort typeHint, i

// Serial1 on ESP32 uses default pins connected to flash
// So must make sure to set them to other pins.
# if SOC_UART_NUM > 1
# if USABLE_SOC_UART_NUM > 1

if ((receivePin == SOC_RX1) && (transmitPin == SOC_TX1)) {
return ESPEasySerialPort::serial1; // UART1
}
# endif // if SOC_UART_NUM > 1
# if SOC_UART_NUM > 2
# endif // if USABLE_SOC_UART_NUM > 1
# if USABLE_SOC_UART_NUM > 2

if ((receivePin == SOC_RX2) && (transmitPin == SOC_TX2)) {
return ESPEasySerialPort::serial2; // UART2
}
# endif // if SOC_UART_NUM > 2
# endif // if USABLE_SOC_UART_NUM > 2
# if USES_I2C_SC16IS752

if ((receivePin >= 0x48) && (receivePin <= 0x57)) {
Expand Down
16 changes: 16 additions & 0 deletions lib/ESPEasySerial/ESPEasySerial_common_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ static_assert(false, "Implement processor architecture");
# endif // ifdef ESP8266
#endif // ifndef SOC_UART_NUM

#ifndef USABLE_SOC_UART_NUM
# ifdef SOC_UART_HP_NUM

// In ESP-IDF 5.3 the actual difference in high-power and low-power UART ports was defined.
# define USABLE_SOC_UART_NUM SOC_UART_HP_NUM
# else // ifdef SOC_UART_HP_NUM
# ifdef ESP32C6

// ESP32-C6 has 3 UARTs (2 HP UART, and 1 LP UART)
// We can only use the high-power ones
# define USABLE_SOC_UART_NUM 2
# else // ifdef ESP32C6
# define USABLE_SOC_UART_NUM SOC_UART_NUM
# endif // ifdef ESP32C6
# endif // ifdef SOC_UART_HP_NUM
#endif // ifndef USABLE_SOC_UART_NUM

#ifdef ESP32

Expand Down
17 changes: 9 additions & 8 deletions lib/ESPEasySerial/Port_ESPEasySerial_HardwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <hal/uart_types.h>
#endif


Port_ESPEasySerial_HardwareSerial_t::Port_ESPEasySerial_HardwareSerial_t() {}

Port_ESPEasySerial_HardwareSerial_t::~Port_ESPEasySerial_HardwareSerial_t() {}
Expand All @@ -33,12 +34,12 @@ void Port_ESPEasySerial_HardwareSerial_t::resetConfig(const ESPEasySerialConfig&

switch (config.port) {
case ESPEasySerialPort::serial0:
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
case ESPEasySerialPort::serial1:
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
case ESPEasySerialPort::serial2:
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
_config.port = config.port;
break;
default:
Expand All @@ -55,14 +56,14 @@ void Port_ESPEasySerial_HardwareSerial_t::resetConfig(const ESPEasySerialConfig&
} else if (_config.port == ESPEasySerialPort::serial0_swap) {
_serial = &Serial;
#endif // ifdef ESP8266
#if SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 1
} else if (_config.port == ESPEasySerialPort::serial1) {
_serial = &Serial1;
#endif // if SOC_UART_NUM > 1
#if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 1
#if USABLE_SOC_UART_NUM > 2
} else if (_config.port == ESPEasySerialPort::serial2) {
_serial = &Serial2;
#endif // if SOC_UART_NUM > 2
#endif // if USABLE_SOC_UART_NUM > 2
} else {
_config.port = ESPEasySerialPort::not_set;
}
Expand Down
3 changes: 2 additions & 1 deletion lib/HeatpumpIR/DaikinHeatpumpARC480A14IR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class DaikinHeatpumpARC480A14IR : public HeatpumpIR
{
public:
DaikinHeatpumpARC480A14IR();
void send(IRSender& IR, uint8_t powerModeCmd, uint8_t operatingModeCmd, uint8_t fanSpeedCmd, uint8_t temperatureCmd, uint8_t swingVCmd, uint8_t swingHCmd);
using HeatpumpIR::send;
void send(IRSender& IR, uint8_t powerModeCmd, uint8_t operatingModeCmd, uint8_t fanSpeedCmd, uint8_t temperatureCmd, uint8_t swingVCmd, uint8_t swingHCmd) override;
void send(IRSender& IR, uint8_t powerModeCmd, uint8_t operatingModeCmd, uint8_t fanSpeedCmd, uint8_t temperatureCmd, uint8_t swingVCmd, uint8_t swingHCmd, uint8_t comfortMode, uint8_t econo, uint8_t sensor, uint8_t quiet, uint8_t powerful);
private:
void sendDaikin(IRSender& IR, uint8_t operatingMode, uint8_t fanSpeed, uint8_t temperature, uint8_t swingV, uint8_t swingH, uint8_t comfortMode, uint8_t econo, uint8_t sensor, uint8_t quiet, uint8_t powerful);
Expand Down
Loading