From 69cb07f72131aff0856dbbbc2415816190da312f Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Fri, 17 Feb 2023 10:08:02 +0300 Subject: [PATCH] Minor changes --- data/function.js | 16 ++++++++-------- src/main.cpp | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/function.js b/data/function.js index e037c42..4393e98 100755 --- a/data/function.js +++ b/data/function.js @@ -52,14 +52,14 @@ function sendRequest(submit, server) { function saveSetting(submit) { server = "/setting?ssid=" + getValue('ssid') + "&password=" + encodeURIComponent(getValue('password')) - + "&host=" + getValue('mqttHostName') + "&port=" + getValue('mqttHostPort') - + "&login=" + getValue('mqttUserLogin') + "&pass=" + encodeURIComponent(getValue('mqttUserPassword')) - + "&prefix=" + getValue('topicPrefix') - + "&name=" + getValue('deviceName') - + "&net=" + getValue('espnowNetName') - + "&mode=" + getSelectValue('workModeSelect') - + "&ntp=" + getValue('ntpHostName') - + "&zone=" + getValue('gmtOffset'); + + "&mqttHostName=" + getValue('mqttHostName') + "&mqttHostPort=" + getValue('mqttHostPort') + + "&mqttUserLogin=" + getValue('mqttUserLogin') + "&mqttUserPassword=" + encodeURIComponent(getValue('mqttUserPassword')) + + "&topicPrefix=" + getValue('topicPrefix') + + "&deviceName=" + getValue('deviceName') + + "&espnowNetName=" + getValue('espnowNetName') + + "&workMode=" + getSelectValue('workModeSelect') + + "&ntpHostName=" + getValue('ntpHostName') + + "&gmtOffset=" + getValue('gmtOffset'); sendRequest(submit, server); alert("Please restart device for changes apply."); } diff --git a/src/main.cpp b/src/main.cpp index f64b758..3916f83 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -628,16 +628,16 @@ void setupWebServer() { ssid = request->getParam("ssid")->value(); password = request->getParam("password")->value(); - mqttHostName = request->getParam("host")->value(); - mqttHostPort = request->getParam("port")->value().toInt(); - mqttUserLogin = request->getParam("login")->value(); - mqttUserPassword = request->getParam("pass")->value(); - topicPrefix = request->getParam("prefix")->value(); - deviceName = request->getParam("name")->value(); - espnowNetName = request->getParam("net")->value(); - workMode = request->getParam("mode")->value().toInt(); - ntpHostName = request->getParam("ntp")->value(); - gmtOffset = request->getParam("zone")->value().toInt(); + mqttHostName = request->getParam("mqttHostName")->value(); + mqttHostPort = request->getParam("mqttHostPor")->value().toInt(); + mqttUserLogin = request->getParam("mqttUserLogin")->value(); + mqttUserPassword = request->getParam("mqttUserPassword")->value(); + topicPrefix = request->getParam("topicPrefix")->value(); + deviceName = request->getParam("deviceName")->value(); + espnowNetName = request->getParam("espnowNetName")->value(); + workMode = request->getParam("workMode")->value().toInt(); + ntpHostName = request->getParam("ntpHostName")->value(); + gmtOffset = request->getParam("gmtOffset")->value().toInt(); request->send(200); saveConfig(); });