diff --git a/Cmd.ino b/Cmd.ino
index 96ba6e1f..8c944b17 100644
--- a/Cmd.ino
+++ b/Cmd.ino
@@ -1,16 +1,5 @@
void CMD_init() {
-
- //======новые виджеты ver2.0=======//
- sCmd.addCommand("inputNumber", inputNumber);
- sCmd.addCommand("inputText", inputText);
- sCmd.addCommand("inputTime", inputTime);
- sCmd.addCommand("inputDate", inputDate);
- sCmd.addCommand("inputDropdown", inputDropdown);
-
- //======новые виджеты ver2.0=======//
-
- sCmd.addCommand("input_new", input_new);
sCmd.addCommand("button", button);
sCmd.addCommand("buttonSet", buttonSet);
@@ -33,7 +22,7 @@ void CMD_init() {
sCmd.addCommand("valueUpSet", valueUpSet);
sCmd.addCommand("valueDownSet", valueDownSet);
-
+
sCmd.addCommand("text", text);
sCmd.addCommand("textSet", textSet);
@@ -49,18 +38,104 @@ void CMD_init() {
//!sCmd.addCommand("push", pushControl);
//handleCMD_ticker();
+
+
+ //======новые виджеты ver2.0=======//
+
+ sCmd.addCommand("inputNumber", inputNumber);
+ sCmd.addCommand("inputNumberSet", inputNumberSet);
+
+ sCmd.addCommand("inputText", inputText);
+ sCmd.addCommand("inputTextSet", inputTextSet);
+
+ sCmd.addCommand("inputTime", inputTime);
+ sCmd.addCommand("inputTimeSet", inputTimeSet);
+
+ sCmd.addCommand("inputDate", inputDate);
+ sCmd.addCommand("inputDateSet", inputDateSet);
+
+ //sCmd.addCommand("inputDropdown", inputDropdown);
+
+ //=================================//
+
}
-void input_new() {
-
- String input_number = sCmd.next();
+void inputNumber() {
+ String number = sCmd.next();
String viget_name = sCmd.next();
+ viget_name.replace("#", " ");
String page_name = sCmd.next();
+ page_name.replace("#", " ");
+ String start_state = sCmd.next();
String page_number = sCmd.next();
-
-
- createViget (viget_name, page_name, page_number, "vigets/viget.input_new.json", "inputSet" + input_number);
+ jsonWrite(configJson, "inputNumberSet" + number, start_state);
+ createViget (viget_name, page_name, page_number, "vigets/viget.inputNumber.json", "inputNumberSet" + number);
}
+void inputNumberSet() {
+ String number = sCmd.next();
+ String value = sCmd.next();
+ jsonWrite(configJson, "inputNumberSet" + number, value);
+ sendSTATUS("inputNumberSet" + number, value);
+}
+
+void inputText() {
+ String number = sCmd.next();
+ String viget_name = sCmd.next();
+ viget_name.replace("#", " ");
+ String page_name = sCmd.next();
+ page_name.replace("#", " ");
+ String start_state = sCmd.next();
+ String page_number = sCmd.next();
+ jsonWrite(configJson, "inputTextSet" + number, start_state);
+ createViget (viget_name, page_name, page_number, "vigets/viget.inputText.json", "inputTextSet" + number);
+}
+void inputTextSet() {
+ String number = sCmd.next();
+ String value = sCmd.next();
+ jsonWrite(configJson, "inputTextSet" + number, value);
+ sendSTATUS("inputTextSet" + number, value);
+}
+
+void inputTime() {
+ String number = sCmd.next();
+ String viget_name = sCmd.next();
+ viget_name.replace("#", " ");
+ String page_name = sCmd.next();
+ page_name.replace("#", " ");
+ String start_state = sCmd.next();
+ String page_number = sCmd.next();
+ jsonWrite(configJson, "inputTimeSet" + number, start_state);
+ createViget (viget_name, page_name, page_number, "vigets/viget.inputTime.json", "inputTimeSet" + number);
+}
+void inputTimeSet() {
+ String number = sCmd.next();
+ String value = sCmd.next();
+ value.replace(":", ".");
+ jsonWrite(configJson, "inputTimeSet" + number, value);
+ value.replace(".", ":");
+ sendSTATUS("inputTimeSet" + number, value);
+}
+
+void inputDate() {
+ String number = sCmd.next();
+ String viget_name = sCmd.next();
+ viget_name.replace("#", " ");
+ String page_name = sCmd.next();
+ page_name.replace("#", " ");
+ String start_state = sCmd.next();
+ String page_number = sCmd.next();
+ jsonWrite(configJson, "inputDateSet" + number, start_state);
+ createViget (viget_name, page_name, page_number, "vigets/viget.inputDate.json", "inputDateSet" + number);
+}
+void inputDateSet() {
+ String number = sCmd.next();
+ String value = sCmd.next();
+ jsonWrite(configJson, "inputDateSet" + number, value);
+ sendSTATUS("inputDateSet" + number, value);
+}
+
+
+
//==========================================================================================================
@@ -416,7 +491,7 @@ void createViget (String viget_name, String page_name, String page_number, Stri
page_name.replace("#", " ");
jsonWrite(viget, "page", page_name);
- jsonWrite(viget, "pageId", page_number);
+ jsonWrite(viget, "id", page_number);//"pageId"
jsonWrite(viget, "descr", viget_name);
jsonWrite(viget, "topic", prex + "/" + topic);
all_vigets += viget + "\r\n";
diff --git a/data/config.all.txt b/data/config.all.txt
index c66ef541..ff35eee3 100644
--- a/data/config.all.txt
+++ b/data/config.all.txt
@@ -1,19 +1,5 @@
-button 1 na Включить#все Освещение 0 1
-button 2 13 Прихожая Освещение 0 2
-button 3 14 Кухня Освещение 0 3
-pwm 1 3 Яркость#коредор: Освещение 1023 4
-pwm 2 4 Яркость#ванная: Освещение 510 5
-analog Аналоговый#вход,#% Датчики text 1 1024 1 1024 6
-logging analog 1 144 график Датчики 7
-input value1 20.0 5 порог.#значение Датчики 8
-button 4 na Вкл#по#analog>20 Датчики 0 11
-//dallas 2 Водонагреватель,#t°C Датчики termometr 14
-//level Вода#в#баке,#% Датчики gauge 125 20 15
-//ph pH Датчики text 0 16
-input value2 8.0 1 период#сек Таймер 117
-button 5 na Вкл#обратный#таймер Таймер 0 20
-button 6 5 Включится#по#таймеру Таймер 0 21
-switch 1 0 20
-text 1 Квартира Двери 22
-button 7 scenario Сценарии Настройки 1 23
-button 8 line1,line2, 2строки#сценариев Освещение 1 24
\ No newline at end of file
+inputNumber 1 Температура#максимальная moscow 60 1
+inputNumber 2 Температура#минимальная moscow 30 2
+inputText 1 Введите#текст moscow привет 3
+inputTime 1 Введите#время moscow 12.00 4
+inputDate 1 Введите#дату novorossiysk 10-01-2020 5
\ No newline at end of file
diff --git a/data/config.json b/data/config.json
index 7e08ab5b..8ff7a6f3 100644
--- a/data/config.json
+++ b/data/config.json
@@ -1 +1 @@
-{"SSDP":"MODULES","chipID":"12884479-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"MGTS_GPON_DC15","password":"HKC4MRE4","timezone":3,"mqttServer":"91.204.228.124","mqttPort":1883,"mqttUser":"rise","mqttPass":"23ri22se32","scenario":"1","timers":"0","pushingbox_id":"v670C4F8A2581A11"}
\ No newline at end of file
+{"SSDP":"MODULES","chipID":"4039078204","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":"v670C4F8A2581A11"}
\ No newline at end of file
diff --git a/data/scenario.all.txt b/data/scenario.all.txt
index 54a790b1..8b137891 100644
--- a/data/scenario.all.txt
+++ b/data/scenario.all.txt
@@ -1,31 +1 @@
-button1 = 1
-buttonSet 2 1
-buttonSet 3 1
-pwmSet 2 1024
-end
-button1 = 0
-buttonSet 2 0
-buttonSet 3 0
-pwmSet 2 0
-end
-analog > value1
-buttonSet 4 1
-end
-button5 = 1
-timerStart 1 value2 sec
-end
-button5 = 0
-timerStart 2 value2 sec
-end
-timer1 = 0
-buttonSet 6 1
-end
-timer2 = 0
-buttonSet 6 0
-end
-switch1 = 1
-textSet 1 закрыто-time
-end
-switch1 = 0
-textSet 1 открыто-time
-end
\ No newline at end of file
+
diff --git a/data/vigets/viget.inputNumber.json b/data/vigets/viget.inputNumber.json
new file mode 100644
index 00000000..d67a7e69
--- /dev/null
+++ b/data/vigets/viget.inputNumber.json
@@ -0,0 +1,6 @@
+{
+ "widget" : "input",
+ "size" : "small",
+ "color" : "orange",
+ "type" : "number"
+}
\ No newline at end of file
diff --git a/data/vigets/viget.inputText.json b/data/vigets/viget.inputText.json
new file mode 100644
index 00000000..3484d53b
--- /dev/null
+++ b/data/vigets/viget.inputText.json
@@ -0,0 +1,6 @@
+{
+ "widget" : "input",
+ "size" : "small",
+ "color" : "orange",
+ "type" : "text"
+}
\ No newline at end of file
diff --git a/data/vigets/viget.inputTime.json b/data/vigets/viget.inputTime.json
new file mode 100644
index 00000000..241a37fc
--- /dev/null
+++ b/data/vigets/viget.inputTime.json
@@ -0,0 +1,6 @@
+{
+ "widget" : "input",
+ "size" : "small",
+ "color" : "orange",
+ "type" : "time"
+}
\ No newline at end of file
diff --git a/data/vigets/viget.inputdate.json b/data/vigets/viget.inputdate.json
index e69de29b..ecc3113d 100644
--- a/data/vigets/viget.inputdate.json
+++ b/data/vigets/viget.inputdate.json
@@ -0,0 +1,6 @@
+{
+ "widget" : "input",
+ "size" : "small",
+ "color" : "orange",
+ "type" : "date"
+}
\ No newline at end of file
diff --git a/data/vigets/viget.select.json b/data/vigets/viget.select.json
new file mode 100644
index 00000000..c6531b70
--- /dev/null
+++ b/data/vigets/viget.select.json
@@ -0,0 +1,7 @@
+{
+ "widget" : "select",
+ "size" : "small",
+ "fill" : "outline",
+ "options" : "["Zero item", "First item", "Second item"]",
+ "status" : 2
+}
\ No newline at end of file
diff --git a/data/vigets/vigets2.0.txt b/data/vigets/vigets2.0.txt
deleted file mode 100644
index 9ccbf94d..00000000
--- a/data/vigets/vigets2.0.txt
+++ /dev/null
@@ -1,107 +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/data_new/ace.js.gz b/data_new/ace.js.gz
deleted file mode 100644
index 7b175c1c..00000000
Binary files a/data_new/ace.js.gz and /dev/null differ
diff --git a/data_new/chart.json.gz b/data_new/chart.json.gz
deleted file mode 100644
index c0df7c39..00000000
Binary files a/data_new/chart.json.gz and /dev/null differ
diff --git a/data_new/config.all.json b/data_new/config.all.json
deleted file mode 100644
index b01644ad..00000000
--- a/data_new/config.all.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- "configs": [
-
- "/config.live.json",
- "/config.setup.json",
- "/config.option.json"
- ],
- "class":"col-sm-offset-1 col-sm-10",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
-{
- "type": "h4",
- "title": "Device ID: {{chipID}}"
- },
-{
- "type": "h4",
- "title": "IP address: {{ip}}"
- },
- {
- "type": "hr"
- },
-{
- "type": "h2",
- "title": "Конфигурация устройства"
- },
- {
- "type":"file",
- "state":"config.all.txt",
- "style":"width:100%;height:400px",
- "title": "Сохранить",
- "action": "/all_modules_init",
- "class":"btn btn-block btn-success"
- },
- {
- "type": "link",
- "title": "Инструкция",
- "action": "https://github.com/DmitryBorisenko33/esp8266_iot-manager_modules_firmware/wiki/Instruction",
- "class": "btn btn-block btn-primary"
- },
-{
- "type": "h2",
- "title": "Сценарии"
- },
-{
-"type": "checkbox",
-"name":"scenario",
-"title": "Включить сценарии",
-"action": "/scenario?status=[[scenario]]",
-"state": "{{scenario}}"
-},
-{
- "type": "h6",
- "title": ""
- },
-{
- "type":"file",
- "state":"scenario.all.txt",
- "style":"width:100%;height:400px",
- "title": "Сохранить и включить",
- "action": "/scenario?status=1",
- "class":"btn btn-block btn-success"
- },
-{
- "type": "h2",
-"title": "Данные модулей"
- },
-{
- "type": "hr"
- },
-{
- "type": "h4",
- "title": "Модуль уровня воды (level)",
-"style": "width:100%"
- },
-
- {
- "type": "h6",
- "title": "Расстояние от датчика до воды: {{level_in}} см"
- },
-{
- "type": "h6",
- "title": " Заполнение бака: {{level}} %"
- },
-{
- "type": "hr"
- },
-{
- "type": "h4",
- "title": "Модуль аналогового входа (analog)",
-"style": "width:100%"
- },
-{
- "type": "h6",
- "title": "Прочитанное значение: {{analog_in}}"
- },
-{
- "type": "h6",
- "title": "Преобразованное значение: {{analog}}"
- },
- {
- "type": "hr"
- },
-{
- "type": "h4",
- "title": "Модуль температурного датчика (dallas)",
-"style": "width:100%"
- },
-{
- "type": "h6",
- "title": "Текущее значение: {{dallas}} °C"
- },
-{
- "type": "hr"
- },
-{
- "type": "h4",
- "title": "Модуль pH сенсора от df robot (ph)",
-"style": "width:100%"
- },
-{
- "type": "h6",
- "title": "Текущее значение: {{ph}}"
- },
-{
- "type": "hr"
- },
- {
- "type": "link",
- "title": "Очистить все логи",
- "action": "/cleanlog",
- "class": "btn btn-block btn-success"
- },
- {
- "type": "link",
- "title": "Главная",
- "action": "/page.htm?index",
- "class": "btn btn-block btn-danger btn-sm"
- }
- ]
-}
diff --git a/data_new/config.all.txt b/data_new/config.all.txt
deleted file mode 100644
index c66ef541..00000000
--- a/data_new/config.all.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-button 1 na Включить#все Освещение 0 1
-button 2 13 Прихожая Освещение 0 2
-button 3 14 Кухня Освещение 0 3
-pwm 1 3 Яркость#коредор: Освещение 1023 4
-pwm 2 4 Яркость#ванная: Освещение 510 5
-analog Аналоговый#вход,#% Датчики text 1 1024 1 1024 6
-logging analog 1 144 график Датчики 7
-input value1 20.0 5 порог.#значение Датчики 8
-button 4 na Вкл#по#analog>20 Датчики 0 11
-//dallas 2 Водонагреватель,#t°C Датчики termometr 14
-//level Вода#в#баке,#% Датчики gauge 125 20 15
-//ph pH Датчики text 0 16
-input value2 8.0 1 период#сек Таймер 117
-button 5 na Вкл#обратный#таймер Таймер 0 20
-button 6 5 Включится#по#таймеру Таймер 0 21
-switch 1 0 20
-text 1 Квартира Двери 22
-button 7 scenario Сценарии Настройки 1 23
-button 8 line1,line2, 2строки#сценариев Освещение 1 24
\ No newline at end of file
diff --git a/data_new/config.json b/data_new/config.json
deleted file mode 100644
index dfa5acfd..00000000
--- a/data_new/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"SSDP":"MODULES","chipID":"12884479-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"MGTS_GPON_1002","password":"TTNYJ4QJ","timezone":3,"mqttServer":"91.204.228.124","mqttPort":1883,"mqttUser":"rise","mqttPass":"23ri22se32","scenario":"1","timers":"0","pushingbox_id":"v670C4F8A2581A11"}
\ No newline at end of file
diff --git a/data_new/configclient.json b/data_new/configclient.json
deleted file mode 100644
index f9082e7c..00000000
--- a/data_new/configclient.json
+++ /dev/null
@@ -1 +0,0 @@
-{"SSDP":"MODULES","ssidAP":"WiFi","passwordAP":"","ssid":"MGTS_GPON_10B0","password":"8ed76da8","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","chipID":"9139530-1458400","scenario":"1","timers":"1","pushHost":"api.pushbullet.com","pushPort":443,"pushAccessToken":"","module_push":"0","pushFingerprint":"fef1573c6feeef932eaed0228e91878e048e73a2"}
diff --git a/data_new/configevery.json b/data_new/configevery.json
deleted file mode 100644
index 8079a30f..00000000
--- a/data_new/configevery.json
+++ /dev/null
@@ -1 +0,0 @@
-{"SSDP":"MODULES","ssidAP":"WiFi","passwordAP":"","ssid":"your_ssid","password":"your_password","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","chipID":"9139530-1458400","scenario":"1","timers":"1","pushHost":"api.pushbullet.com","pushPort":443,"pushAccessToken":"","module_push":"0","pushFingerprint":"fef1573c6feeef932eaed0228e91878e048e73a2"}
diff --git a/data_new/css/build.css.gz b/data_new/css/build.css.gz
deleted file mode 100644
index 469e6d32..00000000
Binary files a/data_new/css/build.css.gz and /dev/null differ
diff --git a/data_new/donate.htm.gz b/data_new/donate.htm.gz
deleted file mode 100644
index d6af4a9e..00000000
Binary files a/data_new/donate.htm.gz and /dev/null differ
diff --git a/data_new/edit.htm.gz b/data_new/edit.htm.gz
deleted file mode 100644
index 00861394..00000000
Binary files a/data_new/edit.htm.gz and /dev/null differ
diff --git a/data_new/ext-searchbox.js.gz b/data_new/ext-searchbox.js.gz
deleted file mode 100644
index cf5b49f6..00000000
Binary files a/data_new/ext-searchbox.js.gz and /dev/null differ
diff --git a/data_new/favicon.ico b/data_new/favicon.ico
deleted file mode 100644
index 198474d2..00000000
Binary files a/data_new/favicon.ico and /dev/null differ
diff --git a/data_new/img/swatches.png b/data_new/img/swatches.png
deleted file mode 100644
index b0648e11..00000000
Binary files a/data_new/img/swatches.png and /dev/null differ
diff --git a/data_new/img/swatches1.png b/data_new/img/swatches1.png
deleted file mode 100644
index fedee0af..00000000
Binary files a/data_new/img/swatches1.png and /dev/null differ
diff --git a/data_new/index.htm b/data_new/index.htm
deleted file mode 100644
index e7d22ef5..00000000
--- a/data_new/index.htm
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/data_new/index.htm.gz b/data_new/index.htm.gz
deleted file mode 100644
index a1caf8cf..00000000
Binary files a/data_new/index.htm.gz and /dev/null differ
diff --git a/data_new/index.json b/data_new/index.json
deleted file mode 100644
index 567cc9c4..00000000
--- a/data_new/index.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "configs": [
- "/config.live.json",
- "/config.setup.json"
- ],
- "title": "Главная",
- "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class": "alert-warning"
- },
- {
- "type": "h4",
- "title": "Device ID: {{chipID}}"
- },
- {
- "type": "h4",
- "title": "IP address: {{ip}}"
- },
- {
- "type": "link",
- "title": "Конфигурация устройства",
- "action": "/page.htm?config.all",
- "class": "btn btn-block btn-primary"
- },
- {
- "type": "hr"
- },
- {
- "type": "link",
- "title": "Конфигурация WIFI",
- "action": "/page.htm?setup",
- "class": "btn btn-block btn-success"
- },
- {
- "type": "link",
- "title": "Конфигурация MQTT",
- "action": "/page.htm?mqtt",
- "class": "btn btn-block btn-success"
- },
- {
- "type": "link",
- "title": "Конфигурация push",
- "action": "/page.htm?pushingbox",
- "class": "btn btn-block btn-success"
- },
- {
- "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"
- }
- ]
-}
diff --git a/data_new/js/build.chart.js.gz b/data_new/js/build.chart.js.gz
deleted file mode 100644
index fface5cd..00000000
Binary files a/data_new/js/build.chart.js.gz and /dev/null differ
diff --git a/data_new/js/function.js.gz b/data_new/js/function.js.gz
deleted file mode 100644
index 7079411b..00000000
Binary files a/data_new/js/function.js.gz and /dev/null differ
diff --git a/data_new/lang/lang.en.json.gz b/data_new/lang/lang.en.json.gz
deleted file mode 100644
index 36a64bf8..00000000
Binary files a/data_new/lang/lang.en.json.gz and /dev/null differ
diff --git a/data_new/lang/lang.lv.json.gz b/data_new/lang/lang.lv.json.gz
deleted file mode 100644
index 75a2a524..00000000
Binary files a/data_new/lang/lang.lv.json.gz and /dev/null differ
diff --git a/data_new/lang/lang.ru.json.gz b/data_new/lang/lang.ru.json.gz
deleted file mode 100644
index 2ce395ac..00000000
Binary files a/data_new/lang/lang.ru.json.gz and /dev/null differ
diff --git a/data_new/lang/lang.ua.json.gz b/data_new/lang/lang.ua.json.gz
deleted file mode 100644
index 8a7e31dc..00000000
Binary files a/data_new/lang/lang.ua.json.gz and /dev/null differ
diff --git a/data_new/mode-css.js.gz b/data_new/mode-css.js.gz
deleted file mode 100644
index ebd6fe94..00000000
Binary files a/data_new/mode-css.js.gz and /dev/null differ
diff --git a/data_new/mode-html.js.gz b/data_new/mode-html.js.gz
deleted file mode 100644
index 26b53532..00000000
Binary files a/data_new/mode-html.js.gz and /dev/null differ
diff --git a/data_new/mode-javascript.js.gz b/data_new/mode-javascript.js.gz
deleted file mode 100644
index c0451c1c..00000000
Binary files a/data_new/mode-javascript.js.gz and /dev/null differ
diff --git a/data_new/mqtt.json b/data_new/mqtt.json
deleted file mode 100644
index cf7d98da..00000000
--- a/data_new/mqtt.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
- {
- "type": "h4",
- "title": "Server name:"
- },
-{
- "type": "input",
- "title": "",
- "name":"1",
- "state": "{{mqttServer}}"
- },
-{
- "type": "h4",
- "title": "Port:"
- },
-{
- "type": "input",
- "title": "",
- "name":"2",
- "state": "{{mqttPort}}"
- },
-{
- "type": "h4",
- "title": "User name:"
- },
-{
- "type": "input",
- "title": "",
- "name":"3",
- "state": "{{mqttUser}}"
- },
-{
- "type": "h4",
- "title": "Password:"
- },
-{
- "type": "input",
- "title": "",
- "name":"4",
- "state": "{{mqttPass}}"
- },
-{
- "type":"h3",
- "name":"my-block",
-"style":"position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;",
- "class":"hidden"
- },
-{
- "type": "button",
- "title":"Сохранить и проверить соединение",
- "action": "mqttSave?mqttServer=[[1]]&mqttPort=[[2]]&mqttUser=[[3]]&mqttPass=[[4]]",
- "response":"[[my-block]]",
- "class": "btn btn-block btn-success",
- "style": "width:100%;display:inline"
- },
- {
- "type": "link",
- "title": "Главная",
- "action": "/page.htm?index",
- "class": "btn btn-block btn-danger btn-sm"
- }
- ]
-}
diff --git a/data_new/page.htm.gz b/data_new/page.htm.gz
deleted file mode 100644
index b9bb8db1..00000000
Binary files a/data_new/page.htm.gz and /dev/null differ
diff --git a/data_new/push.json b/data_new/push.json
deleted file mode 100644
index 5ae4af98..00000000
--- a/data_new/push.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
- {
- "type": "h4",
- "title": "Host name:"
- },
-{
- "type": "input",
- "title": "",
- "name":"1",
- "state": "{{pushHost}}"
- },
-{
- "type": "h4",
- "title": "Port:"
- },
-{
- "type": "input",
- "title": "",
- "name":"2",
- "state": "{{pushPort}}"
- },
-{
- "type": "h4",
- "title": "Fingerprint:"
- },
-{
- "type": "input",
- "title": "",
- "name":"3",
- "state": "{{pushFingerprint}}"
- },
-{
- "type": "h4",
- "title": "Access Token:"
- },
-{
- "type": "input",
- "title": "",
- "name":"4",
- "state": "{{pushAccessToken}}"
- },
-{
- "type":"h3",
- "name":"my-block",
-"style":"position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;",
- "class":"hidden"
- },
-{
- "type": "button",
- "title":"Сохранить и проверить соединение",
- "action": "pushDate?pushHost=[[1]]&pushPort=[[2]]&pushFingerprint=[[3]]&pushAccessToken=[[4]]",
- "response":"[[my-block]]",
- "class": "btn btn-block btn-success",
- "style": "width:100%;display:inline"
- },
-{
- "type": "hr"
- },
-{
-"type": "checkbox",
-"name":"start-push",
-"title": "Отправлять push при включении устройства",
-"action": "startPush?status=[[start-push]]",
-"state": "{{startPush}}"
-},
-{
- "type": "hr"
- },
- {
- "type": "link",
- "title": "Перезагрузить устройство",
- "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
- "class": "btn btn-block btn-warning"
- },
- {
- "type": "link",
- "title": "Главная",
- "action": "/page.htm?index",
- "class": "btn btn-block btn-danger btn-sm"
- }
- ]
-}
diff --git a/data_new/pushingbox.json b/data_new/pushingbox.json
deleted file mode 100644
index 0679489a..00000000
--- a/data_new/pushingbox.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
- {
- "type": "h4",
- "title": "Device id:"
- },
-{
- "type": "input",
- "title": "",
- "name":"1",
- "state": "{{pushingbox_id}}"
- },
-
-{
- "type": "button",
- "title":"Сохранить",
- "action": "pushingboxDate?pushingbox_id=[[1]]",
- "class": "btn btn-block btn-success",
- "style": "width:100%;display:inline"
- },
-{
- "type": "hr"
- },
- {
- "type": "link",
- "title": "Перезагрузить устройство",
- "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
- "class": "btn btn-block btn-warning"
- },
- {
- "type": "link",
- "title": "Главная",
- "action": "/page.htm?index",
- "class": "btn btn-block btn-danger btn-sm"
- }
- ]
-}
diff --git a/data_new/scenario.all.txt b/data_new/scenario.all.txt
deleted file mode 100644
index 54a790b1..00000000
--- a/data_new/scenario.all.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-button1 = 1
-buttonSet 2 1
-buttonSet 3 1
-pwmSet 2 1024
-end
-button1 = 0
-buttonSet 2 0
-buttonSet 3 0
-pwmSet 2 0
-end
-analog > value1
-buttonSet 4 1
-end
-button5 = 1
-timerStart 1 value2 sec
-end
-button5 = 0
-timerStart 2 value2 sec
-end
-timer1 = 0
-buttonSet 6 1
-end
-timer2 = 0
-buttonSet 6 0
-end
-switch1 = 1
-textSet 1 закрыто-time
-end
-switch1 = 0
-textSet 1 открыто-time
-end
\ No newline at end of file
diff --git a/data_new/setup.json b/data_new/setup.json
deleted file mode 100644
index c6bb2fd4..00000000
--- a/data_new/setup.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "configs": [
- "/config.setup.json"
- ],
- "title": "Конфигурация",
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
- {
- "type": "link",
- "title": "Главная",
- "action": "/",
- "class": "btn btn-block btn-danger"
- },
- {
- "type": "hr"
- },
- {
- "type": "h2",
- "title": "Имя устройства"
- },
- {
- "type": "input",
- "title": "Имя устройства",
- "name":"ssdp",
- "state": "{{SSDP}}",
- "pattern": "[0-9a-zA-Zа-яА-Я.\\- ]{1,20}"
- },
- {
- "type": "button",
- "title": "Сохранить",
- "action": "ssdp?ssdp=[[ssdp]]",
- "class": "btn btn-block btn-success"
- },
- {
- "type": "hr"
- },
- {
- "type": "h2",
- "title": "Подключение к Wi-Fi роутеру"
- },
- {
- "type": "input",
- "title":"Сеть",
- "name":"ssid",
- "state": "{{ssid}}"
- },
- {
- "type": "password",
- "title": "Введите пароль",
- "name":"ssidPass",
- "state": "{{password}}",
- "pattern": ".{8,20}"
- },
- {
- "type": "button",
- "title": "Сохранить",
- "class": "btn btn-block btn-success",
- "action": "ssid?ssid=[[ssid]]&password=[[ssidPass]]"
- },
- {
- "type": "hr"
- },
- {
- "type": "h2",
- "title": "Временная зона GMT"
- },
- {
- "type": "input",
- "title": "{{LangSpace}}",
- "name":"timeZone",
- "state": "{{timezone}}",
- "pattern": "[0-9-]{1,3}"
- },
- {
- "type": "button",
- "module":"",
- "title": "Сохранить",
- "class": "btn btn-block btn-success",
- "action": "timeZone?timeZone=[[timeZone]]"
- },
- {
- "type": "link",
- "title": "Автоопределение зоны",
- "action": "javascript:set_time_zone(this);",
- "class": "btn btn-block btn-primary"
- },
- {
- "type": "time",
- "name":"times1",
- "title": "На устройстве сейчас",
- "state":"{{time}}"
- },
- {
- "type": "button",
- "response":"[[times1]]",
- "title": "Синхронизировать",
- "class": "btn btn-block btn-primary",
- "action": "Time"
- },
- {
- "type": "hr"
- },
- {
- "type": "h2",
- "title": "Точка доступа"
- },
- {
- "type": "text",
- "title": "После того как устройство подключается к роутеру, его Wi-Fi исчезнет.",
- "class": "alert alert-warning",
- "style": "width:45%;float:right;"
- },
- {
- "type": "input",
- "title": "Имя WI-FI сети",
- "name":"ssidap",
- "state": "{{ssidAP}}",
- "style": "width:50%;display:inline",
- "pattern": ".{1,20}"
- },
- {
- "type": "password",
- "title": "Пароль",
- "name":"ssidApPass",
- "state": "{{passwordAP}}",
- "style": "width:50%;display:inline",
- "pattern": ".{8,20}"
- },
- {
- "type": "button",
- "title": "Сохранить",
- "action": "ssidap?ssidAP=[[ssidap]]&passwordAP=[[ssidApPass]]",
- "class": "btn btn-block btn-success",
- "style": "width:50%;display:inline"
- },
- {
- "type": "hr"
- },
-{
- "type": "hr"
- },
- {
- "type": "link",
- "title": "Перезагрузить устройство",
- "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
- "class": "btn btn-block btn-warning"
- }
- ]
-}
diff --git a/data_new/soket.json b/data_new/soket.json
deleted file mode 100644
index 92b61373..00000000
--- a/data_new/soket.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "configs": [
-
- "/config.live.json",
- "/config.option.json",
- "/config.setup.json",
- "/lang/lang.ru.json",
- "socket {{ip}}:81/"
-
- ],
- "title": "Главная",
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
- {
- "type": "h5",
- "title": "{{SSDP}}",
- "class":"alert-warning"
- },
-{
- "type": "h4",
- "title": "Module tank level:",
- "style": "width:80%;float:left;"
- },
-{
- "type": "h4",
- "title": "{{module_tank_level_s}}",
- "style": "width:20%;float:right;"
- },
-{
- "type": "h4",
- "title": "Module analog:",
- "style": "width:80%;float:left;"
- },
-{
- "type": "h4",
- "title": "{{module_analog_s}}",
- "style": "width:20%;float:right;"
- },
-{
- "type": "h4",
- "title": "Module ds18b20:",
- "style": "width:80%;float:left;"
- },
-{
- "type": "h4",
- "title": "{{module_ds18b20_s}}",
- "style": "width:20%;float:right;"
- },
-{
- "type": "link",
- "title": "Главная",
- "action": "/page.htm?index",
- "class": "btn btn-block btn-danger btn-sm",
-"style": "width:100%;float:right;"
- }
- ]
-}
diff --git a/data_new/viget.alertbg.json b/data_new/viget.alertbg.json
deleted file mode 100644
index 13cd1cc7..00000000
--- a/data_new/viget.alertbg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "id" : "",
- "page" : "",
- "widget" : "anydata",
- "class1": "col-xs-4 text-center",
- "class2": "stable",
- "style2": "font-size:12px;float:center;",
- "class3":"stable",
- "style3": "font-size:25px;float:center;font-weight:bold;",
- "descr" : "",
- "topic" : ""
- }
diff --git a/data_new/viget.alertsm.json b/data_new/viget.alertsm.json
deleted file mode 100644
index 4ad91aa1..00000000
--- a/data_new/viget.alertsm.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "id" : "",
- "page" : "",
- "widget" : "anydata",
- "class1" : "item col-xs-12 text-center",
- "class2": "ballanced",
- "style2": "font-size:20px;float:left;font-weight:bold;",
- "class3":"ballanced",
- "style3": "font-size:17px;float:right;",
- "descr" : "",
- "topic" : ""
- }
diff --git a/data_new/viget.button.json b/data_new/viget.button.json
deleted file mode 100644
index d94276c1..00000000
--- a/data_new/viget.button.json
+++ /dev/null
@@ -1,18 +0,0 @@
- {
- "id": "",
- "pageId":"",
- "page": "",
- "widget": "simple-btn",
- "class1": "col-xs-4 text-center",
- "class2": "ballanced",
- "style2": "font-size:15px;float:left;font-weight:bold;",
- "topic": "",
- "class3": "button button-block",
- "style3": "float:right;",
- "widgetConfig": {
- "fill": "#F5F5F5",
- "fillPressed": "#4169E1",
- "title": "-",
- "delay":500
- }
- }
\ No newline at end of file
diff --git a/data_new/viget.chart.json b/data_new/viget.chart.json
deleted file mode 100644
index bb0ae087..00000000
--- a/data_new/viget.chart.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "id" : "",
- "pageId": "",
- "widget" : "chart",
- "topic" : "",
- "widgetConfig": {
-
- "maxCount": 200,
- "type": "line",
- "height": 200
-
- }
-}
\ No newline at end of file
diff --git a/data_new/viget.fillgauge.json b/data_new/viget.fillgauge.json
deleted file mode 100644
index c434d0e1..00000000
--- a/data_new/viget.fillgauge.json
+++ /dev/null
@@ -1,23 +0,0 @@
- {
- "id": "",
- "page": "",
- "pageId": "",
- "widget": "fillgauge",
- "descr": "",
- "class2": "text-center ballanced",
- "style2": "font-size:25px;font-weight:bold;padding-top:10px;padding-bottom:10px;",
- "class3" : "text-center",
- "style3": "padding-top:10px;padding-bottom:10px;",
- "topic": "",
- "width": "250px",
- "height": "250px",
- "widgetConfig": {
- "circleColor": "#228B22",
- "textColor": "#FFFFFF",
- "waveTextColor": "#050000",
- "waveColor": "#40E0D0",
- "circleThickness": 0.05,
- "textVertPosition": 0.5,
- "waveAnimateTime": 500
- }
- }
\ No newline at end of file
diff --git a/data_new/viget.gauge.json b/data_new/viget.gauge.json
deleted file mode 100644
index 6c6c14e2..00000000
--- a/data_new/viget.gauge.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id" : "",
- "pageId": "",
- "widget" : "gauge",
- "topic" : "",
- "class1" : "item no-border no-padding text-center",
- "descr" : "",
- "widgetConfig" : {
- "type" : "full",
- "cap" : "round",
- "append" : "",
- "size" : 300,
- "thick" : 20,
- "maximum": 1024,
- "color" : "#11c1f3",
- "backgroundColor": "rgba(0,0,0, 0.2)"
- }
-}
\ No newline at end of file
diff --git a/data_new/viget.led.json b/data_new/viget.led.json
deleted file mode 100644
index 6b392086..00000000
--- a/data_new/viget.led.json
+++ /dev/null
@@ -1,16 +0,0 @@
- {
- "id": "",
- "pageId": "",
- "descr": "",
- "class1": "col-xs-3 text-center",
- "page": "",
- "widget": "steel",
- "topic": "",
- "widgetConfig": {
- "width": 60,
- "height": 60,
- "type": "Led",
- "blink": false,
- "LedColor": "RED_LED"
- }
- }
diff --git a/data_new/viget.range.json b/data_new/viget.range.json
deleted file mode 100644
index cf8a12a6..00000000
--- a/data_new/viget.range.json
+++ /dev/null
@@ -1,13 +0,0 @@
- {
- "id": "",
- "page": "",
- "descr": "",
- "widget": "range",
- "class3": "ballanced",
- "style3": "font-size:25px;float:left;font-weight:bold;",
- "topic": "",
- "widgetConfig": {
- "maxValue": 1023,
- "minValue": 0
- }
- }
diff --git a/data_new/viget.status.json b/data_new/viget.status.json
deleted file mode 100644
index 618a05d2..00000000
--- a/data_new/viget.status.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "id" : "1",
- "page" : "",
- "pageId":"",
- "widget" : "anydata",
- "class1" : "item rounded text-center no-padding",
- "class2": "ballanced",
- "style2": "",
- "class3":"ballanced",
- "style3": "font-size:10px;float:right;",
- "descr" : "",
- "topic" : ""
- }
\ No newline at end of file
diff --git a/data_new/viget.termometr.json b/data_new/viget.termometr.json
deleted file mode 100644
index 0fed8f9d..00000000
--- a/data_new/viget.termometr.json
+++ /dev/null
@@ -1,15 +0,0 @@
- {
- "id": "",
- "page": "",
- "pageId": "",
- "widget": "steel",
- "topic": "/DS",
- "widgetConfig": {
- "width": "auto",
- "height": 150,
- "type": "Linear",
- "titleString": "Спальня",
- "unitString": "°C",
- "threshold": 30
- }
- }
\ No newline at end of file
diff --git a/data_new/viget.toggle.json b/data_new/viget.toggle.json
deleted file mode 100644
index cc554fb3..00000000
--- a/data_new/viget.toggle.json
+++ /dev/null
@@ -1,11 +0,0 @@
- {
- "id": "",
- "page": "",
- "pageId": "",
- "widget": "toggle",
- "descrStyle": "font-size:20px;float:left;font-weight:bold;",
- "descrStyleOff": "font-size:20px;float:left;",
- "color": "#8997ff",
- "descr": "",
- "topic": ""
- }
\ No newline at end of file
diff --git a/data_new/worker-html.js.gz b/data_new/worker-html.js.gz
deleted file mode 100644
index ec8aa87a..00000000
Binary files a/data_new/worker-html.js.gz and /dev/null differ
diff --git a/mqtt.ino b/mqtt.ino
index a202bcaf..bd151102 100644
--- a/mqtt.ino
+++ b/mqtt.ino
@@ -128,6 +128,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
if (str == "HELLO") outcoming_date();
//if (str == "work") outcoming_date(); //Для приема получения work и подтверждения связи (для приложения mqtt IOT MQTT Panel)
+
//превращает название топика в команду, а значение в параметр команды
if (topic_str.indexOf("control") > 0) { //IoTmanager/800324-1458415/RelaySet1/control 1 /IoTmanager/9139530-1458400/RelaySet1/control -> 1
@@ -222,7 +223,9 @@ void sendAllWigets() {
psn_2 = all_vigets.indexOf("\r\n", psn_1);
line = all_vigets.substring(psn_1, psn_2);
- jsonWrite(line, "id", String(counter));
+ line.replace("\r\n", "");
+ //jsonWrite(line, "id", String(counter));
+ //jsonWrite(line, "pageId", String(counter));
counter++;
sendMQTT("config", line);
Serial.println("[V] " + line);