From fb45e73384e9bc2f260694489a99dae00c271be4 Mon Sep 17 00:00:00 2001 From: msedv Date: Sat, 29 Jul 2023 16:50:27 +0200 Subject: [PATCH] Four files which used #ifdef EPS8266 instead of #ifdef ESP8266 - which e.g. broke the MFRC522 functionality between 12.5 and 13.x. (#19209) --- CHANGELOG.md | 2 +- tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino | 4 ++-- tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino | 4 ++-- tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d078da4d..2a2b6cdc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -136,7 +136,7 @@ All notable changes to this project will be documented in this file. ### Added - Matter support for Shutters with Tilt - 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 command ``Shuttersetup`` for "Shelly 2.5 pro" automatic calibration and setup (experimental) - Berry `tcpclientasync` class for non-blocking TCP client diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino index 54922adf9..a91c48b0f 100755 --- a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino @@ -5379,10 +5379,10 @@ extern char *SML_GetSVal(uint32_t index); glob_script_mem.spi.settings = SPISettings(fvar, MSBFIRST, SPI_MODE0); if (TasmotaGlobal.spi_enabled) { -#ifdef EPS8266 +#ifdef ESP8266 SPI.begin(); glob_script_mem.spi.spip = &SPI; -#endif // EPS8266 +#endif // ESP8266 #ifdef ESP32 if (glob_script_mem.spi.sclk == -1) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino index ee99a4f80..dfc54172e 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino @@ -183,9 +183,9 @@ void UfsCheckSDCardInit(void) { if (TasmotaGlobal.spi_enabled && PinUsed(GPIO_SDCARD_CS)) { int8_t cs = Pin(GPIO_SDCARD_CS); -#ifdef EPS8266 +#ifdef ESP8266 SPI.begin(); -#endif // EPS8266 +#endif // ESP8266 #ifdef ESP32 SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1); #endif // ESP32 diff --git a/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino b/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino index 037ded6da..7ceeed9ae 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino @@ -100,9 +100,9 @@ void RC522ScanForTag(void) { void RC522Init(void) { 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)); -#ifdef EPS8266 +#ifdef ESP8266 SPI.begin(); -#endif // EPS8266 +#endif // ESP8266 #ifdef ESP32 SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1); #endif // ESP32