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

clean up boolean, move to MQTT screen

Browse Source
This commit is contained in:
proddy
2021-02-23 17:45:48 +01:00
parent 1d64285f09
commit b2e85ee026
16 changed files with 53 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/framework/APSettingsService.cpp
View File

@@ -46,7 +46,7 @@ void APSettingsService::manageAP() {
}
void APSettingsService::startAP() {
Serial.println(F("Starting software access point"));
// Serial.println(F("Starting software access point"));
WiFi.softAPConfig(_state.localIP, _state.gatewayIP, _state.subnetMask);
WiFi.softAP(_state.ssid.c_str(), _state.password.c_str());
if (!_dnsServer) {
@@ -65,7 +65,7 @@ void APSettingsService::stopAP() {
delete _dnsServer;
_dnsServer = nullptr;
}
Serial.println(F("Stopping software access point"));
// Serial.println(F("Stopping software access point"));
WiFi.softAPdisconnect(true);
}

2
lib/framework/MqttSettingsService.cpp
View File

@@ -185,6 +185,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
root["mqtt_qos"] = settings.mqtt_qos;
root["mqtt_retain"] = settings.mqtt_retain;
root["dallas_format"] = settings.dallas_format;
root["bool_format"] = settings.bool_format;
root["ha_climate_format"] = settings.ha_climate_format;
root["ha_enabled"] = settings.ha_enabled;
}
@@ -214,6 +215,7 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting
newSettings.publish_time_sensor = root["publish_time_sensor"] | EMSESP_DEFAULT_PUBLISH_TIME;
newSettings.dallas_format = root["dallas_format"] | EMSESP_DEFAULT_DALLAS_FORMAT;
newSettings.bool_format = root["bool_format"] | EMSESP_DEFAULT_BOOL_FORMAT;
newSettings.ha_climate_format = root["ha_climate_format"] | EMSESP_DEFAULT_HA_CLIMATE_FORMAT;
newSettings.ha_enabled = root["ha_enabled"] | EMSESP_DEFAULT_HA_ENABLED;

3
lib/framework/MqttSettingsService.h
View File

@@ -60,6 +60,8 @@ static String generateClientId() {
#define FACTORY_MQTT_MAX_TOPIC_LENGTH 128
#endif
#define EMSESP_DEFAULT_BOOL_FORMAT 1 // on/off
#define EMSESP_DEFAULT_DALLAS_FORMAT 1 // sensorid
#define EMSESP_DEFAULT_HA_CLIMATE_FORMAT 1 // current temp
#define EMSESP_DEFAULT_MQTT_QOS 0
@@ -101,6 +103,7 @@ class MqttSettings {
uint8_t mqtt_qos;
bool mqtt_retain;
uint8_t dallas_format;
uint8_t bool_format;
uint8_t ha_climate_format;
bool ha_enabled;