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

Переименовал файлы присетов! Добавил присет для модуля uart

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-24 15:54:15 +02:00
parent 90a342bc27
commit 5643804d77
51 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Init.cpp
View File

@@ -60,14 +60,14 @@ void Device_init() {
removeFile("/layout.txt");
#endif
txtExecution("firmware.c.txt");
txtExecution("100с.txt");
//outcoming_date();
}
//-------------------------------сценарии-----------------------------------------------------
void Scenario_init() {
if (jsonReadStr(configSetupJson, "scen") == "1") {
scenario = readFile("firmware.s.txt", 2048);
scenario = readFile("100s.txt", 2048);
}
}

4
src/MqttClient.cpp
View File

@@ -148,10 +148,10 @@ void handleSubscribedUpdates(char* topic, uint8_t* payload, size_t length) {
upgrade = true;
}
} else if (topicStr.indexOf("devc")) {
writeFile("firmware.c.txt", payloadStr);
writeFile("100с.txt", payloadStr);
Device_init();
} else if (topicStr.indexOf("devs")) {
writeFile("firmware.s.txt", payloadStr);
writeFile("100s.txt", payloadStr);
Scenario_init();
}
}

8
src/Upgrade.cpp
View File

@@ -28,8 +28,8 @@ void upgrade_firmware() {
String scenario_for_update;
String config_for_update;
String configSetup_for_update;
scenario_for_update = readFile("firmware.s.txt", 4000);
config_for_update = readFile("firmware.c.txt", 4000);
scenario_for_update = readFile("100s.txt", 4000);
config_for_update = readFile("100с.txt", 4000);
configSetup_for_update = configSetupJson;
Serial.println("Start upgrade SPIFFS, please wait...");
@@ -46,8 +46,8 @@ void upgrade_firmware() {
#endif
if (ret == HTTP_UPDATE_OK) {
writeFile("firmware.s.txt", scenario_for_update);
writeFile("firmware.c.txt", config_for_update);
writeFile("100s.txt", scenario_for_update);
writeFile("100с.txt", config_for_update);
writeFile("config.json", configSetup_for_update);
saveConfig();

8
src/Web.cpp
View File

@@ -22,11 +22,11 @@ void web_init() {
server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) {
uint8_t preset;
if (parseRequestForPreset(request, preset)) {
String srcMacro = preset == 21 ? "configs/firmware.c.txt" : getPresetFile(preset, CT_MACRO);
String srcScenario = preset == 21 ? "configs/firmware.s.txt" : getPresetFile(preset, CT_SCENARIO);
String srcMacro = preset == 21 ? "configs/100с.txt" : getPresetFile(preset, CT_MACRO);
String srcScenario = preset == 21 ? "configs/100s.txt" : getPresetFile(preset, CT_SCENARIO);
pm.info("activate " + getItemName(getPresetItem(preset)));
copyFile(srcMacro, "firmware.c.txt");
copyFile(srcScenario, "firmware.s.txt");
copyFile(srcMacro, "100с.txt");
copyFile(srcScenario, "100s.txt");
Device_init();
Scenario_init();