diff --git a/data/configs/firmware.c.txt b/data/100c.txt similarity index 100% rename from data/configs/firmware.c.txt rename to data/100c.txt diff --git a/data/configs/firmware.s.txt b/data/100s.txt similarity index 100% rename from data/configs/firmware.s.txt rename to data/100s.txt diff --git a/data/configs/1-relay.c.txt b/data/configs/001c.txt similarity index 100% rename from data/configs/1-relay.c.txt rename to data/configs/001c.txt diff --git a/data/configs/1-relay.s.txt b/data/configs/001s.txt similarity index 100% rename from data/configs/1-relay.s.txt rename to data/configs/001s.txt diff --git a/data/configs/2-relay.c.txt b/data/configs/002c.txt similarity index 100% rename from data/configs/2-relay.c.txt rename to data/configs/002c.txt diff --git a/data/configs/2-relay.s.txt b/data/configs/002s.txt similarity index 100% rename from data/configs/2-relay.s.txt rename to data/configs/002s.txt diff --git a/data/configs/3-relay.c.txt b/data/configs/003c.txt similarity index 100% rename from data/configs/3-relay.c.txt rename to data/configs/003c.txt diff --git a/data/configs/3-relay.s.txt b/data/configs/003s.txt similarity index 100% rename from data/configs/3-relay.s.txt rename to data/configs/003s.txt diff --git a/data/configs/4-relay.c.txt b/data/configs/004c.txt similarity index 100% rename from data/configs/4-relay.c.txt rename to data/configs/004c.txt diff --git a/data/configs/4-relay.s.txt b/data/configs/004s.txt similarity index 100% rename from data/configs/4-relay.s.txt rename to data/configs/004s.txt diff --git a/data/configs/5-relay.c.txt b/data/configs/005c.txt similarity index 100% rename from data/configs/5-relay.c.txt rename to data/configs/005c.txt diff --git a/data/configs/5-relay.s.txt b/data/configs/005s.txt similarity index 100% rename from data/configs/5-relay.s.txt rename to data/configs/005s.txt diff --git a/data/configs/6-relay.c.txt b/data/configs/006c.txt similarity index 100% rename from data/configs/6-relay.c.txt rename to data/configs/006c.txt diff --git a/data/configs/6-relay.s.txt b/data/configs/006s.txt similarity index 100% rename from data/configs/6-relay.s.txt rename to data/configs/006s.txt diff --git a/data/configs/7-relay.c.txt b/data/configs/007c.txt similarity index 100% rename from data/configs/7-relay.c.txt rename to data/configs/007c.txt diff --git a/data/configs/7-relay.s.txt b/data/configs/007s.txt similarity index 100% rename from data/configs/7-relay.s.txt rename to data/configs/007s.txt diff --git a/data/configs/8-pwm.c.txt b/data/configs/008c.txt similarity index 100% rename from data/configs/8-pwm.c.txt rename to data/configs/008c.txt diff --git a/data/configs/10-dht22.s.txt b/data/configs/008s.txt similarity index 100% rename from data/configs/10-dht22.s.txt rename to data/configs/008s.txt diff --git a/data/configs/9-dht11.c.txt b/data/configs/009c.txt similarity index 100% rename from data/configs/9-dht11.c.txt rename to data/configs/009c.txt diff --git a/data/configs/11-analog.s.txt b/data/configs/009s.txt similarity index 100% rename from data/configs/11-analog.s.txt rename to data/configs/009s.txt diff --git a/data/configs/10-dht22.c.txt b/data/configs/010c.txt similarity index 100% rename from data/configs/10-dht22.c.txt rename to data/configs/010c.txt diff --git a/data/configs/12-bmp280.s.txt b/data/configs/010s.txt similarity index 100% rename from data/configs/12-bmp280.s.txt rename to data/configs/010s.txt diff --git a/data/configs/11-analog.c.txt b/data/configs/011c.txt similarity index 100% rename from data/configs/11-analog.c.txt rename to data/configs/011c.txt diff --git a/data/configs/13-bme280.s.txt b/data/configs/011s.txt similarity index 100% rename from data/configs/13-bme280.s.txt rename to data/configs/011s.txt diff --git a/data/configs/12-bmp280.c.txt b/data/configs/012c.txt similarity index 100% rename from data/configs/12-bmp280.c.txt rename to data/configs/012c.txt diff --git a/data/configs/14-dallas.s.txt b/data/configs/012s.txt similarity index 100% rename from data/configs/14-dallas.s.txt rename to data/configs/012s.txt diff --git a/data/configs/13-bme280.c.txt b/data/configs/013c.txt similarity index 100% rename from data/configs/13-bme280.c.txt rename to data/configs/013c.txt diff --git a/data/configs/8-pwm.s.txt b/data/configs/013s.txt similarity index 100% rename from data/configs/8-pwm.s.txt rename to data/configs/013s.txt diff --git a/data/configs/14-dallas.c.txt b/data/configs/014c.txt similarity index 100% rename from data/configs/14-dallas.c.txt rename to data/configs/014c.txt diff --git a/data/configs/9-dht11.s.txt b/data/configs/014s.txt similarity index 100% rename from data/configs/9-dht11.s.txt rename to data/configs/014s.txt diff --git a/data/configs/15-termostat.c.txt b/data/configs/015c.txt similarity index 100% rename from data/configs/15-termostat.c.txt rename to data/configs/015c.txt diff --git a/data/configs/15-termostat.s.txt b/data/configs/015s.txt similarity index 100% rename from data/configs/15-termostat.s.txt rename to data/configs/015s.txt diff --git a/data/configs/16-ultrasonic.c.txt b/data/configs/016c.txt similarity index 100% rename from data/configs/16-ultrasonic.c.txt rename to data/configs/016c.txt diff --git a/data/configs/16-ultrasonic.s.txt b/data/configs/016s.txt similarity index 100% rename from data/configs/16-ultrasonic.s.txt rename to data/configs/016s.txt diff --git a/data/configs/17-motion.c.txt b/data/configs/017c.txt similarity index 100% rename from data/configs/17-motion.c.txt rename to data/configs/017c.txt diff --git a/data/configs/17-motion.s.txt b/data/configs/017s.txt similarity index 100% rename from data/configs/17-motion.s.txt rename to data/configs/017s.txt diff --git a/data/configs/18-motion.c.txt b/data/configs/018c.txt similarity index 100% rename from data/configs/18-motion.c.txt rename to data/configs/018c.txt diff --git a/data/configs/18-motion.s.txt b/data/configs/018s.txt similarity index 100% rename from data/configs/18-motion.s.txt rename to data/configs/018s.txt diff --git a/data/configs/19-stepper.c.txt b/data/configs/019c.txt similarity index 100% rename from data/configs/19-stepper.c.txt rename to data/configs/019c.txt diff --git a/data/configs/19-stepper.s.txt b/data/configs/019s.txt similarity index 100% rename from data/configs/19-stepper.s.txt rename to data/configs/019s.txt diff --git a/data/configs/20-servo.c.txt b/data/configs/020c.txt similarity index 100% rename from data/configs/20-servo.c.txt rename to data/configs/020c.txt diff --git a/data/configs/20-servo.s.txt b/data/configs/020s.txt similarity index 100% rename from data/configs/20-servo.s.txt rename to data/configs/020s.txt diff --git a/data/configs/021c.txt b/data/configs/021c.txt new file mode 100644 index 00000000..e69de29b diff --git a/data/configs/021s.txt b/data/configs/021s.txt new file mode 100644 index 00000000..e69de29b diff --git a/data/firmware.c.txt b/data/configs/100c.txt similarity index 100% rename from data/firmware.c.txt rename to data/configs/100c.txt diff --git a/data/firmware.s.txt b/data/configs/100s.txt similarity index 100% rename from data/firmware.s.txt rename to data/configs/100s.txt diff --git a/data/set.device.json b/data/set.device.json index 2b1dd17a..7206dbc0 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -55,27 +55,28 @@ "style": "display:inline", "title": { "#": "{{SetDevPreset}}", - "/set?preset=1": "1.Вкл. выкл. локального реле", - "/set?preset=2": "2.Вкл. выкл. локального реле в определенное время", - "/set?preset=3": "3.Вкл. выкл. локального реле на определенный период времени", - "/set?preset=4": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении", - "/set?preset=5": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)", - "/set?preset=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)", - "/set?preset=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)", - "/set?preset=8": "8.Широтно импульсная модуляция", - "/set?preset=9": "9.Сенсор DHT11 (темп, влажность) и логгирование", - "/set?preset=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 (темп, влажность) и логгирование", - "/set?preset=11": "11.Аналоговый сенсор и логгирование", - "/set?preset=12": "12.Cенсор bmp280 (темп, давление) и логгирование", - "/set?preset=13": "13.Cенсор bme280 (темп, давление, влажность, высота) и логгирование", - "/set?preset=14": "14.Сенсор DS18B20 (темп) и логгирование", - "/set?preset=15": "15.Термостат на DS18B20 с переключением в ручной режим и логгированием", - "/set?preset=16": "16.Котроль уровня в баке (датчик расстояния) на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование", - "/set?preset=17": "17.Датчик движения включающий свет", - "/set?preset=18": "18.Охранный датчик движения", - "/set?preset=19": "19.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", - "/set?preset=20": "20.Система управления сервоприводами", - "/set?preset=21": "21.Настройки по умолчанию" + "/set?preset=001": "1.Вкл. выкл. локального реле", + "/set?preset=002": "2.Вкл. выкл. локального реле в определенное время", + "/set?preset=003": "3.Вкл. выкл. локального реле на определенный период времени", + "/set?preset=004": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении", + "/set?preset=005": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)", + "/set?preset=006": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)", + "/set?preset=007": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)", + "/set?preset=008": "8.Широтно импульсная модуляция", + "/set?preset=009": "9.Сенсор DHT11 (темп, влажность) и логгирование", + "/set?preset=010": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 (темп, влажность) и логгирование", + "/set?preset=011": "11.Аналоговый сенсор и логгирование", + "/set?preset=012": "12.Cенсор bmp280 (темп, давление) и логгирование", + "/set?preset=013": "13.Cенсор bme280 (темп, давление, влажность, высота) и логгирование", + "/set?preset=014": "14.Сенсор DS18B20 (темп) и логгирование", + "/set?preset=015": "15.Термостат на DS18B20 с переключением в ручной режим и логгированием", + "/set?preset=016": "16.Котроль уровня в баке (датчик расстояния) на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование", + "/set?preset=017": "17.Датчик движения включающий свет", + "/set?preset=018": "18.Охранный датчик движения", + "/set?preset=019": "19.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", + "/set?preset=020": "20.Система управления сервоприводами", + "/set?preset=021": "21.Модуль uart (serial). Двухстороняя связь с устройством через uart. Получение данных и отправка команд", + "/set?preset=100": "22.Настройки по умолчанию" } }, { @@ -84,7 +85,7 @@ }, { "type": "file", - "state": "firmware.c.txt", + "state": "100с.txt", "style": "width:100%;height:350px", "title": "Сохранить", "action": "/set?devinit", @@ -103,7 +104,7 @@ }, { "type": "file", - "state": "firmware.s.txt", + "state": "100s.txt", "style": "width:100%;height:350px", "title": "Сохранить", "action": "/set?sceninit", diff --git a/src/Init.cpp b/src/Init.cpp index 48f9d69e..f2dc3952 100644 --- a/src/Init.cpp +++ b/src/Init.cpp @@ -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); } } diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index 3d1bb95e..df61092d 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -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(); } } diff --git a/src/Upgrade.cpp b/src/Upgrade.cpp index 4f9877b2..0c2ab7c8 100644 --- a/src/Upgrade.cpp +++ b/src/Upgrade.cpp @@ -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(); diff --git a/src/Web.cpp b/src/Web.cpp index 5f940a7d..3f54d76b 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -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();