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

move global vars to statics

Browse Source
This commit is contained in:
proddy
2019-01-10 21:51:59 +01:00
parent 1390db89aa
commit c82bb6d492
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ems-esp.ino
View File

@@ -114,16 +114,6 @@ command_t PROGMEM project_cmds[] = {
_Boiler_Status Boiler_Status; _Boiler_Status Boiler_Status;
_Boiler_Shower Boiler_Shower; _Boiler_Shower Boiler_Shower;
// CRC checks
uint32_t previousBoilerPublishCRC = 0;
uint32_t previousThermostatPublishCRC = 0;
// Times
const unsigned long POLL_TIMEOUT_ERR = 10000; // if no signal from boiler for last 10 seconds, assume its offline
const unsigned long TX_HOLD_LED_TIME = 2000; // how long to hold the Tx LED because its so quick
uint8_t last_boilerActive = 0xFF; // for remembering last setting of the tap water or heating on/off
// logging messages with fixed strings // logging messages with fixed strings
void myDebugLog(const char * s) { void myDebugLog(const char * s) {
if (ems_getLogging() >= EMS_SYS_LOGGING_BASIC) { if (ems_getLogging() >= EMS_SYS_LOGGING_BASIC) {
@@ -410,6 +400,10 @@ void publishValues(bool force) {
CRC32 crc; CRC32 crc;
uint32_t fchecksum; uint32_t fchecksum;
static uint8_t last_boilerActive = 0xFF; // for remembering last setting of the tap water or heating on/off
static uint32_t previousBoilerPublishCRC = 0; // CRC check
static uint32_t previousThermostatPublishCRC = 0; // CRC check
rootBoiler["wWSelTemp"] = _int_to_char(s, EMS_Boiler.wWSelTemp); rootBoiler["wWSelTemp"] = _int_to_char(s, EMS_Boiler.wWSelTemp);
rootBoiler["selFlowTemp"] = _float_to_char(s, EMS_Boiler.selFlowTemp); rootBoiler["selFlowTemp"] = _float_to_char(s, EMS_Boiler.selFlowTemp);
rootBoiler["outdoorTemp"] = _float_to_char(s, EMS_Boiler.extTemp); rootBoiler["outdoorTemp"] = _float_to_char(s, EMS_Boiler.extTemp);
@@ -786,9 +780,8 @@ void WIFICallback() {
ems_setModels(); ems_setModels();
} }
// Initialize the boiler settings // Initialize the boiler settings for the shower settings
void initShower() { void initShower() {
// default shower settings
Boiler_Status.shower_timer = BOILER_SHOWER_TIMER; Boiler_Status.shower_timer = BOILER_SHOWER_TIMER;
Boiler_Status.shower_alert = BOILER_SHOWER_ALERT; Boiler_Status.shower_alert = BOILER_SHOWER_ALERT;
Boiler_Shower.timerStart = 0; Boiler_Shower.timerStart = 0;
@@ -839,7 +832,7 @@ void do_systemCheck() {
void do_regularUpdates() { void do_regularUpdates() {
if (ems_getBusConnected()) { if (ems_getBusConnected()) {
myDebugLog("Calling scheduled data refresh from EMS devices.."); myDebugLog("Calling scheduled data refresh from EMS devices..");
ems_getThermostatValues(); // get Thermostat temps (if supported) ems_getThermostatValues();
ems_getBoilerValues(); ems_getBoilerValues();
} }
} }
@@ -941,10 +934,12 @@ void setup() {
ledcheckTimer.attach(LEDCHECK_TIME, do_ledcheck); // blink heartbeat LED ledcheckTimer.attach(LEDCHECK_TIME, do_ledcheck); // blink heartbeat LED
#endif #endif
#ifndef DEBUG_SUPPORT
// Timers using Ticker library // Timers using Ticker library
publishValuesTimer.attach(PUBLISHVALUES_TIME, do_publishValues); // post HA values publishValuesTimer.attach(PUBLISHVALUES_TIME, do_publishValues); // post HA values
systemCheckTimer.attach(SYSTEMCHECK_TIME, do_systemCheck); // check if Boiler is online systemCheckTimer.attach(SYSTEMCHECK_TIME, do_systemCheck); // check if Boiler is online
regularUpdatesTimer.attach(REGULARUPDATES_TIME, do_regularUpdates); // regular reads from the EMS regularUpdatesTimer.attach(REGULARUPDATES_TIME, do_regularUpdates); // regular reads from the EMS
#endif
// set up myESP for Wifi, MQTT, MDNS and Telnet // set up myESP for Wifi, MQTT, MDNS and Telnet
myESP.setTelnetCommands(project_cmds, ArraySize(project_cmds), TelnetCommandCallback); // set up Telnet commands myESP.setTelnetCommands(project_cmds, ArraySize(project_cmds), TelnetCommandCallback); // set up Telnet commands