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

Four files which used #ifdef EPS8266 instead of #ifdef ESP8266 - which e.g. broke the MFRC522 functionality between 12.5 and 13.x. (#19209)

Browse Source
This commit is contained in:
msedv 2023-07-29 16:50:27 +02:00 committed by GitHub
parent f2ab3b36a9
commit fb45e73384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -136,7 +136,7 @@ All notable changes to this project will be documented in this file.
### Added ### Added
- Matter support for Shutters with Tilt - Matter support for Shutters with Tilt
- Matter POC for remote Relay - Matter POC for remote Relay
- Support for Zero-Cross Dimmer on ESP32, changed calculation on EPS8266, high resolution control e.g. Solar: `ZCDimmerSet` - Support for Zero-Cross Dimmer on ESP32, changed calculation on ESP8266, high resolution control e.g. Solar: `ZCDimmerSet`
- ESP32 Enhanced Shutterbuttons functionality to control tilt position, additionally incr/decr possible to position and tilt. - ESP32 Enhanced Shutterbuttons functionality to control tilt position, additionally incr/decr possible to position and tilt.
- ESP32 command ``Shuttersetup`` for "Shelly 2.5 pro" automatic calibration and setup (experimental) - ESP32 command ``Shuttersetup`` for "Shelly 2.5 pro" automatic calibration and setup (experimental)
- Berry `tcpclientasync` class for non-blocking TCP client - Berry `tcpclientasync` class for non-blocking TCP client

4
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

@ -5379,10 +5379,10 @@ extern char *SML_GetSVal(uint32_t index);
glob_script_mem.spi.settings = SPISettings(fvar, MSBFIRST, SPI_MODE0); glob_script_mem.spi.settings = SPISettings(fvar, MSBFIRST, SPI_MODE0);
if (TasmotaGlobal.spi_enabled) { if (TasmotaGlobal.spi_enabled) {
#ifdef EPS8266 #ifdef ESP8266
SPI.begin(); SPI.begin();
glob_script_mem.spi.spip = &SPI; glob_script_mem.spi.spip = &SPI;
#endif // EPS8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
if (glob_script_mem.spi.sclk == -1) { if (glob_script_mem.spi.sclk == -1) {

4
tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
View File

@ -183,9 +183,9 @@ void UfsCheckSDCardInit(void) {
if (TasmotaGlobal.spi_enabled && PinUsed(GPIO_SDCARD_CS)) { if (TasmotaGlobal.spi_enabled && PinUsed(GPIO_SDCARD_CS)) {
int8_t cs = Pin(GPIO_SDCARD_CS); int8_t cs = Pin(GPIO_SDCARD_CS);
#ifdef EPS8266 #ifdef ESP8266
SPI.begin(); SPI.begin();
#endif // EPS8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1); SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
#endif // ESP32 #endif // ESP32

4
tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino
View File

@ -100,9 +100,9 @@ void RC522ScanForTag(void) {
void RC522Init(void) { void RC522Init(void) {
if (PinUsed(GPIO_RC522_CS) && PinUsed(GPIO_RC522_RST) && (SPI_MOSI_MISO == TasmotaGlobal.spi_enabled)) { if (PinUsed(GPIO_RC522_CS) && PinUsed(GPIO_RC522_RST) && (SPI_MOSI_MISO == TasmotaGlobal.spi_enabled)) {
Mfrc522 = new MFRC522(Pin(GPIO_RC522_CS), Pin(GPIO_RC522_RST)); Mfrc522 = new MFRC522(Pin(GPIO_RC522_CS), Pin(GPIO_RC522_RST));
#ifdef EPS8266 #ifdef ESP8266
SPI.begin(); SPI.begin();
#endif // EPS8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1); SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
#endif // ESP32 #endif // ESP32