iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 06:32:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

renaming

Browse Source
This commit is contained in:
Yuri Trikoz
2020-06-25 05:09:11 +03:00
parent 3daa517c7e
commit b50e1c9791
73 changed files with 260 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Web.cpp
View File

@@ -11,7 +11,7 @@ static const uint8_t MAX_PRESET = 21;
bool parseRequestForPreset(AsyncWebServerRequest* request, uint8_t& preset) {
if (request->hasArg("preset")) {
preset = request->getParam("preset")->value().toInt();
return (preset >= MIN_PRESET && preset <= MAX_PRESET) || preset == 100;
return true;
}
return false;
}
@@ -22,15 +22,13 @@ void web_init() {
server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) {
uint8_t preset;
if (parseRequestForPreset(request, preset)) {
pm.info("activate # " + String(preset, DEC) + "(" + getItemName(getPresetItem(preset)) + ")");
String srcMacro = preset == 21 ? "configs/100с.txt" : getPresetFile(preset, CT_MACRO);
String srcScenario = preset == 21 ? "configs/100s.txt" : getPresetFile(preset, CT_SCENARIO);
copyFile(srcMacro, "100с.txt");
copyFile(srcScenario, "100s.txt");
pm.info("activate #" + String(preset, DEC));
String configFile = DEVICE_CONFIG_FILE;
String scenarioFile = DEVICE_SCENARIO_FILE;
copyFile(getConfigFile(preset, CT_CONFIG), configFile);
copyFile(getConfigFile(preset, CT_SCENARIO), scenarioFile);
Device_init();
Scenario_init();
loadScenario();
request->redirect("/?set.device");
}
@@ -45,18 +43,18 @@ void web_init() {
if (value == "0") {
jsonWriteStr(configSetupJson, "scen", value);
saveConfig();
Scenario_init();
loadScenario();
}
if (value == "1") {
jsonWriteStr(configSetupJson, "scen", value);
saveConfig();
Scenario_init();
loadScenario();
}
request->send(200, "text/text", "OK");
}
//--------------------------------------------------------------------------------
if (request->hasArg("sceninit")) {
Scenario_init();
loadScenario();
request->send(200, "text/text", "OK");
}
//--------------------------------------------------------------------------------
@@ -72,12 +70,12 @@ void web_init() {
if (value == "0") {
jsonWriteStr(configSetupJson, "udponoff", value);
saveConfig();
Scenario_init();
loadScenario();
}
if (value == "1") {
jsonWriteStr(configSetupJson, "udponoff", value);
saveConfig();
Scenario_init();
loadScenario();
}
request->send(200, "text/text", "OK");
}
@@ -222,6 +220,11 @@ void web_init() {
i2c_scanning = true;
request->redirect("/?set.utilities");
}
if (request->hasArg("fscheck")) {
fscheck_flag = true;
request->redirect("/?set.utilities");
}
});
//==============================upgrade settings=============================================
server.on("/check", HTTP_GET, [](AsyncWebServerRequest* request) {