diff --git a/Cmd.ino b/Cmd.ino index ddba2acd..96ba6e1f 100644 --- a/Cmd.ino +++ b/Cmd.ino @@ -1,4 +1,16 @@ 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); @@ -21,7 +33,7 @@ void CMD_init() { sCmd.addCommand("valueUpSet", valueUpSet); sCmd.addCommand("valueDownSet", valueDownSet); - sCmd.addCommand("input_new", input_new); + sCmd.addCommand("text", text); sCmd.addCommand("textSet", textSet); diff --git a/ESP32FS-1.0.zip b/ESP32FS-1.0.zip new file mode 100644 index 00000000..53320e4d Binary files /dev/null and b/ESP32FS-1.0.zip differ diff --git a/data/vigets/viget.alertbg.json b/data/vigets/old/viget.alertbg.json similarity index 100% rename from data/vigets/viget.alertbg.json rename to data/vigets/old/viget.alertbg.json diff --git a/data/vigets/viget.alertsm.json b/data/vigets/old/viget.alertsm.json similarity index 100% rename from data/vigets/viget.alertsm.json rename to data/vigets/old/viget.alertsm.json diff --git a/data/vigets/viget.button.json b/data/vigets/old/viget.button.json similarity index 100% rename from data/vigets/viget.button.json rename to data/vigets/old/viget.button.json diff --git a/data/vigets/viget.chart.json b/data/vigets/old/viget.chart.json similarity index 100% rename from data/vigets/viget.chart.json rename to data/vigets/old/viget.chart.json diff --git a/data/vigets/viget.fillgauge.json b/data/vigets/old/viget.fillgauge.json similarity index 100% rename from data/vigets/viget.fillgauge.json rename to data/vigets/old/viget.fillgauge.json diff --git a/data/vigets/viget.gauge.json b/data/vigets/old/viget.gauge.json similarity index 100% rename from data/vigets/viget.gauge.json rename to data/vigets/old/viget.gauge.json diff --git a/data/vigets/viget.input_new.json b/data/vigets/old/viget.input_new.json similarity index 100% rename from data/vigets/viget.input_new.json rename to data/vigets/old/viget.input_new.json diff --git a/data/vigets/viget.led.json b/data/vigets/old/viget.led.json similarity index 100% rename from data/vigets/viget.led.json rename to data/vigets/old/viget.led.json diff --git a/data/vigets/viget.range.json b/data/vigets/old/viget.range.json similarity index 100% rename from data/vigets/viget.range.json rename to data/vigets/old/viget.range.json diff --git a/data/vigets/viget.status.json b/data/vigets/old/viget.status.json similarity index 100% rename from data/vigets/viget.status.json rename to data/vigets/old/viget.status.json diff --git a/data/vigets/viget.termometr.json b/data/vigets/old/viget.termometr.json similarity index 100% rename from data/vigets/viget.termometr.json rename to data/vigets/old/viget.termometr.json diff --git a/data/vigets/viget.toggle.json b/data/vigets/old/viget.toggle.json similarity index 100% rename from data/vigets/viget.toggle.json rename to data/vigets/old/viget.toggle.json diff --git a/data/vigets/viget.inputdate.json b/data/vigets/viget.inputdate.json new file mode 100644 index 00000000..e69de29b diff --git a/data/vigets/vigets2.0.txt b/data/vigets/vigets2.0.txt new file mode 100644 index 00000000..9ccbf94d --- /dev/null +++ b/data/vigets/vigets2.0.txt @@ -0,0 +1,107 @@ +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/vigets/vigets_2.0.txt b/data/vigets/vigets_2.0.txt new file mode 100644 index 00000000..9ccbf94d --- /dev/null +++ b/data/vigets/vigets_2.0.txt @@ -0,0 +1,107 @@ +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