From d4ba302307b2b6995c2df0a83e4d02ff45bbd08d Mon Sep 17 00:00:00 2001 From: stefan123t Date: Mon, 11 Jul 2022 00:16:03 +0200 Subject: [PATCH] add sane defaults for MIN_SERIAL/SEND/MQTT_INTERVAL 5/30/60 seconds respectively --- tools/esp8266/app.cpp | 18 +++++++++--------- tools/esp8266/config.h | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 8f164f1a..0264d2e5 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -15,11 +15,11 @@ app::app() : Main() { DPRINTLN(DBG_VERBOSE, F("app::app():Main")); mSendTicker = 0xffff; - mSendInterval = 0; + mSendInterval = MIN_SEND_INTERVAL; mMqttTicker = 0xffff; - mMqttInterval = 0; + mMqttInterval = MIN_MQTT_INTERVAL; mSerialTicker = 0xffff; - mSerialInterval = 0; + mSerialInterval = MIN_SERIAL_INTERVAL; mMqttActive = false; mTicker = 0; @@ -65,8 +65,8 @@ void app::setup(uint32_t timeout) { if(mSettingsValid) { mEep->read(ADDR_INV_INTERVAL, &mSendInterval); - if(mSendInterval < 5) - mSendInterval = 5; + if(mSendInterval < MIN_SEND_INTERVAL) + mSendInterval = MIN_SEND_INTERVAL; mSendTicker = mSendInterval; // inverter @@ -114,12 +114,12 @@ void app::setup(uint32_t timeout) { // serial console uint8_t tmp; mEep->read(ADDR_SER_INTERVAL, &mSerialInterval); + if(mSerialInterval < MIN_SERIAL_INTERVAL) + mSerialInterval = MIN_SERIAL_INTERVAL; mEep->read(ADDR_SER_ENABLE, &tmp); mSerialValues = (tmp == 0x01); mEep->read(ADDR_SER_DEBUG, &tmp); mSerialDebug = (tmp == 0x01); - if(mSerialInterval < 1) - mSerialInterval = 1; mSys->Radio.mSerialDebug = mSerialDebug; @@ -138,8 +138,8 @@ void app::setup(uint32_t timeout) { if(mqttAddr[0] > 0) { mMqttActive = true; - if(mMqttInterval < 1) - mMqttInterval = 10; + if(mMqttInterval < MIN_MQTT_INTERVAL) + mMqttInterval = MIN_MQTT_INTERVAL; } else mMqttInterval = 0xffff; diff --git a/tools/esp8266/config.h b/tools/esp8266/config.h index ff96b301..3a250b49 100644 --- a/tools/esp8266/config.h +++ b/tools/esp8266/config.h @@ -37,6 +37,15 @@ // number of configurable inverters #define MAX_NUM_INVERTERS 3 +// minimum serial interval +#define MIN_SERIAL_INTERVAL 5 + +// minimum send interval +#define MIN_SEND_INTERVAL 30 + +// minimum mqtt interval +#define MIN_MQTT_INTERVAL 60 + // maximum human readable inverter name length #define MAX_NAME_LENGTH 16