mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'arendst:development' into feature/can-bus

This commit is contained in:
Marius Bezuidenhout 2021-07-14 11:44:10 +02:00 committed by GitHub
parent 425eb72305 0851549b10
commit f52ef2787a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/xsns_127_esp32_sensors.ino
View File

@ -18,8 +18,6 @@
*/ */
#ifdef ESP32 #ifdef ESP32
// Below test to solve ESP32-C3 compilations (20210420)
#if CONFIG_IDF_TARGET_ESP32
/*********************************************************************************************\ /*********************************************************************************************\
* ESP32 CPU Temperature and optional Hall Effect sensor * ESP32 CPU Temperature and optional Hall Effect sensor
* *
@ -131,12 +129,13 @@ bool Xsns127(uint8_t function) {
Esp32SensorShow(0); Esp32SensorShow(0);
break; break;
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
#if CONFIG_IDF_TARGET_ESP32
case FUNC_INIT: case FUNC_INIT:
Esp32SensorInit(); Esp32SensorInit();
break; break;
#endif // CONFIG_IDF_TARGET_ESP32
} }
return result; return result;
} }
#endif // CONFIG_IDF_TARGET_ESP32
#endif // ESP32 #endif // ESP32