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

Four files which used #ifdef EPS8266 instead of #ifdef ESP8266 - whic… #19209

Merged
merged 1 commit into from
Jul 29, 2023
Merged

Four files which used #ifdef EPS8266 instead of #ifdef ESP8266 - whic… #19209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,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
Expand Down
4 changes: 2 additions & 2 deletions tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down