diff --git a/Init.ino b/Init.ino
index 1280d46d..b8825c02 100644
--- a/Init.ino
+++ b/Init.ino
@@ -40,13 +40,13 @@ void Device_init() {
//================
all_vigets = "";
- txtExecution("config.all.txt");
+ txtExecution("firmware.config.txt");
//outcoming_date();
}
//-------------------------------сценарии-----------------------------------------------------
void Scenario_init() {
if (jsonRead(configSetup, "scenario") == "1") {
- scenario = readFile(scenarioFileNameS, 2048);
+ scenario = readFile("firmware.scenario.txt", 2048);
}
}
diff --git a/data/ace.js.gz b/data/ace.js.gz
deleted file mode 100644
index 7b175c1c..00000000
Binary files a/data/ace.js.gz and /dev/null differ
diff --git a/data/config-my.json b/data/config-my.json
new file mode 100644
index 00000000..ae16f518
--- /dev/null
+++ b/data/config-my.json
@@ -0,0 +1 @@
+{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"rise","password":"hostel3333","timezone":3,"mqttServer":"m12.cloudmqtt.com","mqttPort":14053,"mqttUser":"lbscvzuj","mqttPass":"bLxlveOgaF8F","scenario":"1","timers":"0","pushingbox_id":"v7C133E426B0C69E","web_login":"admin","web_pass":"admin"}
\ No newline at end of file
diff --git a/data/config.json b/data/config.json
index ae16f518..0479064d 100644
--- a/data/config.json
+++ b/data/config.json
@@ -1 +1 @@
-{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"rise","password":"hostel3333","timezone":3,"mqttServer":"m12.cloudmqtt.com","mqttPort":14053,"mqttUser":"lbscvzuj","mqttPass":"bLxlveOgaF8F","scenario":"1","timers":"0","pushingbox_id":"v7C133E426B0C69E","web_login":"admin","web_pass":"admin"}
\ No newline at end of file
+{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"your_ssid","password":"your_pass","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","scenario":"1","timers":"0","pushingbox_id":"","web_login":"admin","web_pass":"admin"}
\ No newline at end of file
diff --git a/data/config.all.json b/data/configuration.json
similarity index 97%
rename from data/config.all.json
rename to data/configuration.json
index b01644ad..934d06c4 100644
--- a/data/config.all.json
+++ b/data/configuration.json
@@ -29,7 +29,7 @@
},
{
"type":"file",
- "state":"config.all.txt",
+ "state":"firmware.config.txt",
"style":"width:100%;height:400px",
"title": "Сохранить",
"action": "/all_modules_init",
@@ -58,7 +58,7 @@
},
{
"type":"file",
- "state":"scenario.all.txt",
+ "state":"firmware.scenario.txt",
"style":"width:100%;height:400px",
"title": "Сохранить и включить",
"action": "/scenario?status=1",
diff --git a/data/edit.htm.gz b/data/edit.htm.gz
deleted file mode 100644
index f1e48f7e..00000000
Binary files a/data/edit.htm.gz and /dev/null differ
diff --git a/data/config.all.txt b/data/firmware.config.txt
similarity index 100%
rename from data/config.all.txt
rename to data/firmware.config.txt
diff --git a/data/scenario.all.txt b/data/firmware.scenario.txt
similarity index 100%
rename from data/scenario.all.txt
rename to data/firmware.scenario.txt
diff --git a/data/index.json b/data/index.json
index 567cc9c4..e3da792c 100644
--- a/data/index.json
+++ b/data/index.json
@@ -22,7 +22,7 @@
{
"type": "link",
"title": "Конфигурация устройства",
- "action": "/page.htm?config.all",
+ "action": "/page.htm?configuration",
"class": "btn btn-block btn-primary"
},
{
@@ -48,9 +48,15 @@
},
{
"type": "link",
- "title": "Скачать приложение IoT Manager",
- "action": "https://github.com/DmitryBorisenko33/esp8266_iot-manager_modules_firmware/raw/master/iot_manager/IoT%20Manager%201.5.5.apk",
- "class": "btn btn-block btn-success"
+ "title": "Скачать приложение IoT Manager для android",
+ "action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager",
+ "class": "btn btn-block btn-warning"
+ },
+ {
+ "type": "link",
+ "title": "Скачать приложение IoT Manager для iphone",
+ "action": "https://apps.apple.com/ru/app/iot-manager/id1155934877",
+ "class": "btn btn-block btn-warning"
}
]
}
diff --git a/data/mode-html.js.gz b/data/mode-html.js.gz
deleted file mode 100644
index 26b53532..00000000
Binary files a/data/mode-html.js.gz and /dev/null differ
diff --git a/data/vigets/vigets_2.0.txt b/data/vigets/vigets_2.0.txt
deleted file mode 100644
index 26df9339..00000000
--- a/data/vigets/vigets_2.0.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-config[0] = {
- id : 0,
- widget : 'btn',
- descr : "Outline red button FA icon",
- topic : prefix + "/" + deviceID + "/btn0",
- faicon : "arrow-circle-left",
- iconslot: 'start',
- status : 'Back',
- color : 'red',
- fill : 'outline',
-};
-
-config[1] = {
- id : 1,
- widget : 'btn',
- descr : "Button with ion-icon",
- topic : prefix + "/" + deviceID + "/btn1",
- icon : "add",
- iconslot: "icon-only",
-};
-
-config[2] = {
- id : 2,
- widget : 'anydata',
- descr : "Anydata",
- topic : prefix + "/" + deviceID + "/anydata2",
- status : 123,
-};
-
-config[3] = {
- id : 3,
- widget : 'btn',
- descr : "Button with ion-icon",
- topic : prefix + "/" + deviceID + "/btn3",
- icon : "remove",
- iconslot : "icon-only",
-};
-
-config[4] = {
- id : 4,
- widget : 'btn',
- topic : prefix + "/" + deviceID + "/btn4" ,
- descr : "Large button",
- size : 'large',
- color : 'green',
- send : "any usefull data",
- status : 'press'
-};
-
-config[5] = {
- id : '5',
- widget : 'input',
- topic : prefix + "/" + deviceID + "/input5",
- descr : "Input number",
- size : 'small',
- color : 'orange',
- type : 'number',
- status : 321
-};
-
-config[6] = {
- id : '6',
- widget : 'input',
- topic : prefix + "/" + deviceID + "/input6",
- descr : "Input text",
- type : 'text',
- status : "some text"
-};
-
-config[7] = {
- id : 7,
- widget : 'input',
- topic : prefix + "/" + deviceID + "/input7",
- descr : "Input time",
- type : 'time',
- status : "10:00"
-};
-
-config[8] = {
- id : 8,
- widget : 'input',
- topic : prefix + "/" + deviceID + "/input8",
- descr : "Input date",
- type : 'date',
- size : 'small',
- status : "20.03.2020"
-};
-
-config[9] = {
- id : 9,
- widget : 'select',
- topic : prefix + "/" + deviceID + "/input9",
- descr : "Please, select",
- size : 'small',
- fill : 'outline',
- options: ['Zero item', 'First item', 'Second item'],
- status : 2,
-};
-
-Toggle:
- [descr]="item.descr"
- [descrColor]="item.descrColor"
- [color]="item.color"
- [status]="item.status"
- [icon]="item.icon"
- [iconOff]="item.iconOff"
- [disabled]="item.disabled"
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mqtt.ino b/mqtt.ino
index bcf1ffec..f2c13be1 100644
--- a/mqtt.ino
+++ b/mqtt.ino
@@ -26,7 +26,8 @@ void MQTT_init() {
jsonWrite(tmp, "title", "" + stateMQTT());
jsonWrite(tmp, "class", "pop-up");
- request->send(200, "text/text", tmp); // отправляем ответ о выполнении
+ request->send(200, "text/text", "ok");
+ //request->send(200, "text/text", tmp); // отправляем ответ о выполнении
});
@@ -310,7 +311,7 @@ String stateMQTT() {
//SCENARIO ANALOG > 5 800324-1458415 rel1 0
if (jsonRead(configSetup, "scenario") == "1") {
- //String all_text = readFile("scenario.all.txt", 1024) + "\r\n";
+ //String all_text = readFile("firmware.scenario.txt", 1024) + "\r\n";
String all_text = scenario + "\r\n";
all_text.replace("\r\n", "\n");
all_text.replace("\r", "\n");
diff --git a/set.h b/set.h
index a642e3ec..650e606a 100644
--- a/set.h
+++ b/set.h
@@ -116,7 +116,6 @@ const char* ntpServer = "pool.ntp.org";
const long gmtOffset_sec = 3600;
const int daylightOffset_sec = 3600;
-const String scenarioFileNameS = "scenario.all.txt";
const String ssdpS = "SSDP";
String current_time;