jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrong RMT channels for ESP32S3, now depends on 'soc_caps.h' (#23021)

Browse Source
This commit is contained in:
s-hadinger 2025-02-17 22:24:50 +01:00 committed by GitHub
parent 871723b6f7
commit 9b258cadcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- Berry parser error in rare case (#22997)
- ESP32 TasMesh broker MAC address all zeros (#23005)
- Wrong RMT channels for ESP32S3, now depends on `soc_caps.h`
### Removed

33
tasmota/include/tasmota.h
View File

@ -93,24 +93,29 @@ const uint16_t VL53LXX_MAX_SENSORS = 8; // Max number of VL53L0X sensors
const uint8_t MAX_SR04 = 3; // Max number of SR04 ultrasonic sensors
#ifdef ESP32
// SPI
const uint8_t MAX_SPI = 2; // Max number of Hardware SPI controllers (ESP32 = 2)
const uint8_t MAX_I2S = 2; // Max number of Hardware I2S controllers (ESP32 = 2)
#if CONFIG_IDF_TARGET_ESP32
const uint8_t MAX_RMT = 8; // Max number or RMT channels (ESP32 only)
#elif CONFIG_IDF_TARGET_ESP32S2
const uint8_t MAX_RMT = 4; // Max number or RMT channels (ESP32S2 only)
#elif CONFIG_IDF_TARGET_ESP32S3
const uint8_t MAX_RMT = 1; // Max number or RMT channels (ESP32S3 only)
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
const uint8_t MAX_RMT = 2; // Max number or RMT channels (ESP32C3 only)
#else
const uint8_t MAX_RMT = 0; // Max number or RMT channels (0 if unknown)
#endif
#else
// I2S
#ifdef SOC_I2S_SUPPORTED
const uint8_t MAX_I2S = SOC_I2S_NUM;
#else // SOC_I2S_SUPPORTED
const uint8_t MAX_I2S = 0;
#endif // SOC_I2S_SUPPORTED
// RMT
#ifdef SOC_RMT_SUPPORTED
const uint8_t MAX_RMT = (SOC_RMT_GROUPS) * (SOC_RMT_TX_CANDIDATES_PER_GROUP);
#else // SOC_RMT_SUPPORTED
const uint8_t MAX_RMT = 0;
#endif // SOC_RMT_SUPPORTED
#else // ESP32 - now ESP8266
const uint8_t MAX_SPI = 1; // Max number of Hardware SPI controllers
const uint8_t MAX_I2S = 0; // Max number of Hardware I2S controllers (ESP8266 = 0, no choice)
const uint8_t MAX_RMT = 0; // No RMT channel on ESP8266
#endif
#endif // ESP32
// Changes to the following MAX_ defines need to be in line with enum SettingsTextIndex
const uint8_t MAX_MQTT_PREFIXES = 3; // Max number of MQTT prefixes (cmnd, stat, tele)