improve home assistant prefix & ltw defaults
This commit is contained in:
parent
2f609bf550
commit
ad76c797e3
|
@ -41,7 +41,11 @@ void setLed(int8_t, uint8_t);
|
|||
#define _HOSTNAME "OTGW"
|
||||
#define SETTINGS_FILE "/settings.ini"
|
||||
#define DEFAULT_TIMEZONE "Europe/Amsterdam"
|
||||
#define HOMEASSISTANT_PREFIX "homeassistant"
|
||||
|
||||
#define HOME_ASSISTANT_DISCOVERY_PREFIX "homeassistant" // Home Assistant discovery prefix
|
||||
#define HOME_ASSISTANT_LWT_TOPIC "homeassistant/status" // home Assistant Birth and Last Will Topic (default = homeassistant/status)
|
||||
#define HOME_ASSISTANT_LWT_SUBSCRIBE true // Subscribe to Home Assistant Birth and Last Will Topic (default = true)
|
||||
|
||||
#define CMSG_SIZE 512
|
||||
#define JSON_BUFF_MAX 1024
|
||||
#define CSTR(x) x.c_str()
|
||||
|
@ -82,7 +86,7 @@ String settingMQTTbroker= "192.168.88.254";
|
|||
int16_t settingMQTTbrokerPort = 1883;
|
||||
String settingMQTTuser = "";
|
||||
String settingMQTTpasswd = "";
|
||||
String settingMQTThaprefix = HOMEASSISTANT_PREFIX;
|
||||
String settingMQTThaprefix = HOME_ASSISTANT_DISCOVERY_PREFIX;
|
||||
String settingMQTTtopTopic = "OTGW";
|
||||
bool settingNTPenable = true;
|
||||
String settingNTPtimezone = DEFAULT_TIMEZONE;
|
||||
|
|
|
@ -85,7 +85,7 @@ void readSettings(bool show)
|
|||
settingMQTTtopTopic = doc["MQTTtoptopic"].as<String>();
|
||||
if (settingMQTTtopTopic=="null") settingMQTTtopTopic = _HOSTNAME;
|
||||
settingMQTThaprefix = doc["MQTThaprefix"].as<String>();
|
||||
if (settingMQTThaprefix=="null") settingMQTThaprefix = HOMEASSISTANT_PREFIX;
|
||||
if (settingMQTThaprefix=="null") settingMQTThaprefix = HOME_ASSISTANT_DISCOVERY_PREFIX;
|
||||
settingNTPenable = doc["NTPenable"];
|
||||
settingNTPtimezone = doc["NTPtimezone"].as<String>();
|
||||
if (settingNTPtimezone=="null") settingNTPtimezone = "Europe/Amsterdam"; //default to amsterdam timezone
|
||||
|
@ -146,7 +146,7 @@ void updateSetting(const char *field, const char *newValue)
|
|||
}
|
||||
if (stricmp(field, "MQTThaprefix")==0) {
|
||||
settingMQTThaprefix = String(newValue);
|
||||
if (settingMQTThaprefix.length()==0) settingMQTThaprefix = HOMEASSISTANT_PREFIX;
|
||||
if (settingMQTThaprefix.length()==0) settingMQTThaprefix = HOME_ASSISTANT_DISCOVERY_PREFIX;
|
||||
}
|
||||
|
||||
if (stricmp(field, "NTPenable")==0) settingNTPenable = EVALBOOLEAN(newValue);
|
||||
|
|
Loading…
Reference in New Issue