github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 20:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added option to send data as raw values to MQTT

Browse Source
This commit is contained in:
Gunnar Skjold
2020-03-10 18:43:18 +01:00
parent 732639814b
commit e12980db11
5 changed files with 182 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/web/AmsWebServer.cpp
View File

@@ -226,12 +226,17 @@ void AmsWebServer::configMqttHtml() {
html.replace("${config.mqtt}", config->getMqttHost() == 0 ? "" : "checked");
html.replace("${config.mqttHost}", config->getMqttHost());
html.replace("${config.mqttPort}", String(config->getMqttPort()));
if(config->getMqttPort() > 0) {
html.replace("${config.mqttPort}", String(config->getMqttPort()));
} else {
html.replace("${config.mqttPort}", String(1883));
}
html.replace("${config.mqttClientId}", config->getMqttClientId());
html.replace("${config.mqttPublishTopic}", config->getMqttPublishTopic());
html.replace("${config.mqttSubscribeTopic}", config->getMqttSubscribeTopic());
html.replace("${config.mqttUser}", config->getMqttUser());
html.replace("${config.mqttPassword}", config->getMqttPassword());
html.replace("${config.mqttPayloadFormat}", String(config->getMqttPayloadFormat()));
server.setContentLength(html.length());
server.send(200, "text/html", html);
@@ -459,14 +464,14 @@ void AmsWebServer::handleSave() {
if(server.hasArg("mqttConfig") && server.arg("mqttConfig") == "true") {
if(server.hasArg("mqtt") && server.arg("mqtt") == "true") {
config->setMqttHost(server.arg("mqttHost"));
config->setMqttPort(server.arg("mqttPort").toInt());
int port = server.arg("mqttPort").toInt();
config->setMqttPort(port == 0 ? 1883 : port);
config->setMqttClientId(server.arg("mqttClientId"));
config->setMqttPublishTopic(server.arg("mqttPublishTopic"));
config->setMqttSubscribeTopic(server.arg("mqttSubscribeTopic"));
config->setMqttUser(server.arg("mqttUser"));
config->setMqttPassword(server.arg("mqttPassword"));
config->setAuthUser(server.arg("authUser"));
config->setAuthPassword(server.arg("authPassword"));
config->setMqttPayloadFormat(server.arg("mqttPayloadFormat").toInt());
} else {
config->clearMqtt();
}