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

fix big size

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-02-10 23:30:40 +03:00
parent 883ec12216
commit 88cc2764f8
13 changed files with 19 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Init.ino
View File

@@ -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);
}
}

BIN
data/ace.js.gz
View File

Binary file not shown.

1
data/config-my.json Normal file
View File

@@ -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"}

2
data/config.json
View File

@@ -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"}
{"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"}

4
data/config.all.json → data/configuration.json
View File

@@ -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",

BIN
data/edit.htm.gz
View File

Binary file not shown.

0
data/config.all.txt → data/firmware.config.txt
View File

0
data/scenario.all.txt → data/firmware.scenario.txt
View File

14
data/index.json
View File

@@ -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"
}
]
}

BIN
data/mode-html.js.gz
View File

Binary file not shown.

159
data/vigets/vigets_2.0.txt
View File

@@ -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"
<range
*ngIf="item.widget === 'range'"
[descr]="item.descr"
[descrColor]="item.descrColor"
[descrIcon]="item.descrIcon"
[color]="item.color"
[icon]="item.icon"
[licon]="item.licon"
[lsize]="item.lsize"
[rsize]="item.rsize"
[ricon]="item.ricon"
[min]="item.min"
[max]="item.max"
[topic]="item.topic"
[disabled]="item.disabled"
[debounce]="item.debounce"
[before]="item.before"
[status]="item.status"
[after]="item.after"
></range>
<progress-round
*ngIf="item.widget === 'progress-round'"
[descr]="item.descr"
[descrColor]="item.descrColor"
[color]="item.color"
[icon]="item.icon"
[max]="item.max"
[background]="item.background"
[stroke]="item.stroke"
[topic]="item.topic"
[disabled]="item.disabled"
[before]="item.before"
[status]="item.status"
[]="item.after"
></progress-round>
<progress-line
*ngIf="item.widget === 'progress-line'"
[descr]="item.descr"
[descrColor]="item.descrColor"
[color]="item.color"
[icon]="item.icon"
[max]="item.max"
[topic]="item.topic"
[disabled]="item.disabled"
[before]="item.before"
[status]="item.status"
[after]="item.after"
></progress-line>

5
mqtt.ino
View File

@@ -26,7 +26,8 @@ void MQTT_init() {
jsonWrite(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>" + 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");

1
set.h
View File

@@ -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;