andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Paul
2019-08-29 23:18:40 +02:00
parent 80ee758eef
commit d71dbbbd21
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MyESP.cpp
View File

@@ -4,6 +4,7 @@
* Paul Derbyshire - first revision: December 2018 * Paul Derbyshire - first revision: December 2018
* *
* with ideas borrowed from Espurna https://github.com/xoseperez/espurna * with ideas borrowed from Espurna https://github.com/xoseperez/espurna
* and web from https://github.com/esprfid/esp-rfid
*/ */
#include "MyESP.h" #include "MyESP.h"

10
src/ems-esp.cpp
View File

@@ -13,7 +13,7 @@
#include "emsuart.h" #include "emsuart.h"
#include "my_config.h" #include "my_config.h"
#include "version.h" #include "version.h"
#include <MyESP.h> #include "MyESP.h"
// Dallas external temp sensors // Dallas external temp sensors
#include "ds18.h" #include "ds18.h"
@@ -26,6 +26,13 @@ DS18 ds18;
// standard arduino libs // standard arduino libs
#include <Ticker.h> // https://github.com/esp8266/Arduino/tree/master/libraries/Ticker #include <Ticker.h> // https://github.com/esp8266/Arduino/tree/master/libraries/Ticker
// default APP params
#define APP_NAME "EMS-ESP"
#define APP_HOSTNAME "ems-esp"
#define APP_URL "https://github.com/proddy/EMS-ESP"
#define APP_UPDATEURL "https://api.github.com/repos/proddy/EMS-ESP/releases/latest"
// macros for easy debugging
#define myDebug(...) myESP.myDebug(__VA_ARGS__) #define myDebug(...) myESP.myDebug(__VA_ARGS__)
#define myDebug_P(...) myESP.myDebug_P(__VA_ARGS__) #define myDebug_P(...) myESP.myDebug_P(__VA_ARGS__)
@@ -1719,7 +1726,6 @@ void WebCallback(JsonObject root) {
char s[10]; char s[10];
itoa((it)->device_id, s, 16); itoa((it)->device_id, s, 16);
item["deviceid"] = s; // convert to hex item["deviceid"] = s; // convert to hex
} }
JsonObject thermostat = root.createNestedObject("thermostat"); JsonObject thermostat = root.createNestedObject("thermostat");

7
src/version.h
View File

@@ -1,6 +1 @@
#define APP_VERSION "1.9.0b6"
#define APP_NAME "EMS-ESP"
#define APP_VERSION "1.9.0b5"
#define APP_HOSTNAME "ems-esp"
#define APP_URL "https://github.com/proddy/EMS-ESP"
#define APP_UPDATEURL "https://api.github.com/repos/proddy/EMS-ESP/releases/latest"