iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Добавил массив виджетов и реализовал их отправку

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-01-17 00:06:50 +01:00
parent ee322ce185
commit 775d7a11ad
39 changed files with 6648 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_svelte/build/bundle.css
View File

File diff suppressed because one or more lines are too long

6456
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

180
data_svelte/widgets.json Normal file
View File

@@ -0,0 +1,180 @@
[
{
"name": "anydataRed",
"rus": "Сообщение1",
"widget": "anydata",
"icon": "body",
"color": "red",
"descrColor": "red"
},
{
"name": "anydataDgr",
"rus": "Сообщение2",
"widget": "anydata",
"after": "",
"color": "red",
"icon": "walk"
},
{
"name": "anydataDef",
"rus": "Текст",
"widget": "anydata",
"after": "",
"icon": ""
},
{
"name": "anydataAmp",
"rus": "Амперы",
"widget": "anydata",
"after": "Amp",
"icon": "speedometer"
},
{
"name": "anydataHtz",
"rus": "Герцы",
"widget": "anydata",
"after": "Htz",
"icon": "speedometer"
},
{
"name": "anydataHum",
"rus": "Влажность",
"widget": "anydata",
"after": "%",
"icon": "water",
"color": "#88AADF"
},
{
"name": "anydataMm",
"rus": "Давление",
"widget": "anydata",
"after": "mm",
"icon": "speedometer"
},
{
"name": "anydataTm",
"rus": "Время",
"widget": "anydata",
"after": "",
"icon": "speedometer"
},
{
"name": "button",
"rus": "Кнопка",
"widget": "btn",
"size": "large",
"color": "green",
"send": "test"
},
{
"name": "toggle",
"rus": "Переключатель",
"widget": "toggle",
"icon": "",
"iconOff": ""
},
{
"name": "chart1",
"rus": "График1",
"widget": "chart",
"dateFormat": "HH:mm",
"pointRadius": 0
},
{
"name": "chart2",
"rus": "График2",
"widget": "chart",
"dateFormat": "HH:mm"
},
{
"name": "chart3",
"rus": "График3",
"widget": "chart",
"dateFormat": "DD.MM.YYYY",
"type": "bar"
},
{
"name": "chart4",
"rus": "График4",
"widget": "chart",
"dateFormat": "DD.MM.YYYY"
},
{
"name": "fillgauge",
"rus": "Бочка",
"widget": "fillgauge",
"circleColor": "#00FFFF",
"textColor": "#FFFFFF",
"waveTextColor": "#000000",
"waveColor": "#00FFFF"
},
{
"name": "inputDate",
"rus": "Ввод даты",
"widget": "input",
"size": "small",
"color": "orange",
"type": "date"
},
{
"name": "inputDgt",
"rus": "Ввод цифры",
"widget": "input",
"color": "blue",
"type": "number"
},
{
"name": "inputTxt",
"rus": "Ввод текста",
"widget": "input",
"size": "small",
"color": "orange",
"type": "text"
},
{
"name": "inputTm",
"rus": "Ввод времени",
"widget": "input",
"color": "blue",
"type": "time"
},
{
"name": "progressLine",
"rus": "Статус линия",
"widget": "progress-line",
"icon": "sunny",
"max": "100",
"stroke": "10"
},
{
"name": "progressRound",
"rus": "Статус круг",
"widget": "progress-round",
"max": "100",
"stroke": "20",
"color": "#45ccce",
"background": "#777",
"semicircle": "1"
},
{
"name": "range",
"rus": "Ползунок",
"widget": "range",
"descrColor": "red",
"after": "%",
"k": 0.0977,
"min": 0,
"max": 100,
"debounce": 500
},
{
"name": "select",
"rus": "Выпадающий",
"widget": "select",
"options": [
"Выключен",
"Включен"
],
"status": 0
}
]

6
data_svelte/widgets/alarm.json
View File

@@ -1,6 +0,0 @@
{
"widget": "anydata",
"icon": "body",
"color": "red",
"descrColor": "red"
}

5
data_svelte/widgets/anydata.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "",
"icon": ""
}

6
data_svelte/widgets/anydataAlarm.json
View File

@@ -1,6 +0,0 @@
{
"widget": "anydata",
"after": "",
"color":"red",
"icon": "walk"
}

5
data_svelte/widgets/anydataAmp.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "Amp",
"icon": "speedometer"
}

5
data_svelte/widgets/anydataHtz.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "Htz",
"icon": "speedometer"
}

6
data_svelte/widgets/anydataHum.json
View File

@@ -1,6 +0,0 @@
{
"widget": "anydata",
"after": "%",
"icon": "water",
"color": "#88AADF"
}

5
data_svelte/widgets/anydataPpb.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "ppb",
"icon": "body"
}

5
data_svelte/widgets/anydataPpm.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "ppm",
"icon": "body"
}

5
data_svelte/widgets/anydataPress.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "mm",
"icon": "speedometer"
}

16
data_svelte/widgets/anydataTemp.json
View File

@@ -1,16 +0,0 @@
{
"widget": "anydata",
"after": "°С",
"icon": "thermometer",
"font": "OCR A Std",
"color": [
{ "level": -20, "value": "#0000CC" },
{ "level": -10, "value": "#0000CC" },
{ "level": 0, "value": "#0000CC" },
{ "level": 12, "value": "#3366FF" },
{ "level": 16, "value": "#33CCFF" },
{ "level": 18, "value": "#009933" },
{ "level": 30, "value": "#FF9900" },
{ "level": 40, "value": "red" }
]
}

5
data_svelte/widgets/anydataTime.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "",
"icon": "speedometer"
}

5
data_svelte/widgets/anydataVlt.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "Vlt",
"icon": "speedometer"
}

5
data_svelte/widgets/anydataWhr.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "Whr",
"icon": "speedometer"
}

5
data_svelte/widgets/anydataWtt.json
View File

@@ -1,5 +0,0 @@
{
"widget": "anydata",
"after": "Wtt",
"icon": "speedometer"
}

6
data_svelte/widgets/btn.json
View File

@@ -1,6 +0,0 @@
{
"widget": "btn",
"size": "large",
"color": "green",
"send": "test"
}

5
data_svelte/widgets/chart.json
View File

@@ -1,5 +0,0 @@
{
"widget": "chart",
"dateFormat": "HH:mm",
"pointRadius": 0
}

4
data_svelte/widgets/chart2.json
View File

@@ -1,4 +0,0 @@
{
"widget": "chart",
"dateFormat": "HH:mm"
}

5
data_svelte/widgets/chart3.json
View File

@@ -1,5 +0,0 @@
{
"widget": "chart",
"dateFormat": "DD.MM.YYYY",
"type":"bar"
}

4
data_svelte/widgets/chart4.json
View File

@@ -1,4 +0,0 @@
{
"widget": "chart",
"dateFormat": "DD.MM.YYYY"
}

7
data_svelte/widgets/fillgauge.json
View File

@@ -1,7 +0,0 @@
{
"widget": "fillgauge",
"circleColor": "#00FFFF",
"textColor": "#FFFFFF",
"waveTextColor": "#000000",
"waveColor": "#00FFFF"
}

6
data_svelte/widgets/inputDate.json
View File

@@ -1,6 +0,0 @@
{
"widget" : "input",
"size" : "small",
"color" : "orange",
"type" : "date"
}

5
data_svelte/widgets/inputDigit.json
View File

@@ -1,5 +0,0 @@
{
"widget" : "input",
"color" : "blue",
"type" : "number"
}

7
data_svelte/widgets/inputDigitTemp.json
View File

@@ -1,7 +0,0 @@
{
"widget" : "input",
"color" : "green",
"type" : "number",
"size" : "small",
"icon": "thermometer"
}

6
data_svelte/widgets/inputText.json
View File

@@ -1,6 +0,0 @@
{
"widget" : "input",
"size" : "small",
"color" : "orange",
"type" : "text"
}

5
data_svelte/widgets/inputTime.json
View File

@@ -1,5 +0,0 @@
{
"widget" : "input",
"color" : "blue",
"type" : "time"
}

7
data_svelte/widgets/inputTimeClock.json
View File

@@ -1,7 +0,0 @@
{
"widget" : "input",
"color" : "orange",
"type" : "time",
"size" : "small",
"icon": "alarm-outline"
}

12
data_svelte/widgets/progress-line.json
View File

@@ -1,12 +0,0 @@
{
"widget": "progress-line",
"icon": "sunny",
"descrColor": "",
"color": "",
"max": "100",
"background": "",
"stroke": "10",
"disabled": "",
"before": "",
"after": ""
}

11
data_svelte/widgets/progress-round.json
View File

@@ -1,11 +0,0 @@
{
"widget": "progress-round",
"descrColor": "",
"max": "100",
"stroke": "20",
"color": "#45ccce",
"background": "#777",
"before": "",
"semicircle": "1",
"after": ""
}

9
data_svelte/widgets/range.json
View File

@@ -1,9 +0,0 @@
{
"widget" : "range",
"descrColor": "red",
"after" : "%",
"k" : 0.0977,
"min" : 0,
"max" : 100,
"debounce": 500
}

8
data_svelte/widgets/select.json
View File

@@ -1,8 +0,0 @@
{
"widget": "select",
"options": [
"Выключен",
"Включен"
],
"status": 0
}

5
data_svelte/widgets/toggle.json
View File

@@ -1,5 +0,0 @@
{
"widget": "toggle",
"icon": "",
"iconOff": ""
}

5
data_svelte/widgets/toggleSunMoon.json
View File

@@ -1,5 +0,0 @@
{
"widget": "toggle",
"icon": "sunny",
"iconOff": "moon"
}

3
include/classes/SendJson.h
View File

@@ -23,4 +23,5 @@ class SendJson {
String _path;
};
extern SendJson* mySendJson;
extern SendJson* sendConfigJson;
extern SendJson* sendWigdetsJson;

6
src/Main.cpp
View File

@@ -38,7 +38,8 @@ void setup() {
mqttInit();
//создаем объект класса выгружающего json массив из файла
mySendJson = new SendJson;
sendConfigJson = new SendJson;
sendWigdetsJson = new SendJson;
configure("/config.json");
@@ -61,7 +62,8 @@ void loop() {
ts.update();
//отправка json
if (mySendJson) mySendJson->loop();
if (sendConfigJson) sendConfigJson->loop();
if (sendWigdetsJson) sendWigdetsJson->loop();
#ifdef STANDARD_WEB_SERVER
//обработка web сервера

6
src/StandWebServer.cpp
View File

@@ -212,8 +212,10 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
payloadStr += (char)payload[i];
}
if (payloadStr.startsWith("/config")) { //если прилетел url страницы /config то отправим пакеты с меткой /config.json
if (mySendJson) mySendJson->sendFile("/config.json", num);
if (payloadStr.startsWith("/config")) {
//если прилетел url страницы /config то отправим widgets.json и config.json
if (sendWigdetsJson) sendWigdetsJson->sendFile("/widgets.json", num);
if (sendConfigJson) sendConfigJson->sendFile("/config.json", num);
}
if (payloadStr.startsWith("/gifnoc.json")) { //если прилетел измененный пакет с меткой /gifnoc (config наоборот) то перепишем файл, пока переписываем целеком

3
src/classes/SendJson.cpp
View File

@@ -24,4 +24,5 @@ void SendJson::sendMqtt(String& jsonArrayElement) {
// mqtt send to do
}
SendJson* mySendJson;
SendJson* sendConfigJson;
SendJson* sendWigdetsJson;