andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-10 09:49:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
MichaelDvP
2022-06-27 14:38:58 +02:00
committed by GitHub
parent 422657fbf7 da596a01b9
commit b840e2a6b5
13 changed files with 283 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/analogsensor.h
View File

@@ -45,7 +45,7 @@ class AnalogSensor {
std::string name() const;
void set_name(const std::string & name) {
name_ = name;
name_ = name;
}
uint8_t gpio() const {

2
src/dallassensor.h
View File

@@ -57,7 +57,7 @@ class DallasSensor {
std::string name() const;
void set_name(const std::string & name) {
name_ = name;
name_ = name;
}
bool apply_customization();

2
src/system.h
View File

@@ -191,7 +191,7 @@ class System {
#ifndef EMSESP_STANDALONE
return (ethernet_connected() || WiFi.isConnected());
#else
return true;
return true;
#endif
}

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.4.2b2"
#define EMSESP_APP_VERSION "3.4.2b3"