Merge pull request #145 from vortigont/rel_4.1.0

Rel 4.1.0

platformio.ini

@@ -36,9 +36,8 @@ common =
     ;https://github.com/moononournation/Arduino_GFX#v1.4.7
 
 vortigont =
-    https://github.com/vortigont/EmbUI
-    ;https://github.com/vortigont/EmbUI#idf5.3
-    ;vortigont/EmbUI @ ~3.2
+    ;https://github.com/vortigont/EmbUI
+    vortigont/EmbUI @ ~4.2
     https://github.com/vortigont/LedFB
     https://github.com/vortigont/TM1637
     vortigont/ESPAsyncButton @ ~1.2
@@ -134,4 +133,4 @@ board_build.partitions = extra/default_8MB.csv
 ;; replace url with address of your esp32 device
 ;upload_port = http://firelamp/update
 ;extra_scripts =
-;    post:post_flashz.py
+;    post:extra/post_flashz.py

resources/html/index.html

@@ -50,15 +50,15 @@
 			</ul>
 		</div>
 		<div class="left-block">
-			<div><span class="menu-title" data-i18n="locale_time">Time:</span><span id="pTime" class="menu-value">{{value.pTime}}</span></div>
-			<div><span class="menu-title" data-i18n="locale_memory">Memory:</span><span id="pMem" class="menu-value">{{value.pMem}}</span></div>
-			<div><span class="menu-title" data-i18n="locale_uptime">Uptime:</span><span id="pUptime" class="menu-value">{{value.pUptime}}</span></div>
+			<div><span class="menu-title">Time:</span><span id="pTime" class="menu-value">{{value.pTime}}</span></div>
+			<div><span class="menu-title">Memory:</span><span id="pMem" class="menu-value">{{value.pMem}}</span></div>
+			<div><span class="menu-title">Uptime:</span><span id="pUptime" class="menu-value">{{value.pUptime}}</span></div>
 			<div><span class="menu-title">RSSI &#128246;:</span><span id="pRSSI" class="menu-value">{{value.pRSSI}}</span></div>
 			<div><span class="menu-title">ID:</span><span class="menu-value">{{macid}}</span></div>
-			<div><span class="menu-title" data-i18n="locale_version">EmbUI ver:</span><span class="menu-value">{{uiver}}</span></div>
+			<div><span class="menu-title">EmbUI ver:</span><span class="menu-value">{{uiver}}</span></div>
 			<div><span class="menu-title">FireLamp ver:</span><span id="fwver" class="menu-value">{{appver}}</span></div>
 			<div>
-				<span class="menu-title" data-i18n="locale_theme">Theme:</span><span class="menu-value">
+				<span class="menu-title">Theme:</span><span class="menu-value">
 					<button class="pure-menu-selected" onclick="setDynCSS('css/style.css');">C</button>
 					<button class="pure-menu-selected" onclick="setDynCSS('css/style_light.css');">L</button>
 					<button class="pure-menu-selected" onclick="setDynCSS('css/style_dark.css');">D</button>
@@ -127,7 +127,7 @@
 		    </div>
 		{{/if}}
 		{{#if html == "const"}}
-			<div id="{{id}}" class="pure-u-1 pure-button mr">{{#if2 fa}}<i class="{{fa}}"></i>{{/if2}}{{label}}{{#if2 value}}<input type="hidden" name="{{id}}" value="{{value}}">{{/if2}}</div>
+			<div id="{{id}}" class="pure-u-1 pure-button mr">{{label}}{{#if2 value}}<input type="hidden" name="{{id}}" value="{{value}}">{{/if2}}</div>
 		{{/if}}
 		{{#if html == "constbtn"}}
 			<input id="{{id}}" disabled {{#if2 color}}style="background-color: {{color}}"{{/if2}} class="pure-u-1 pure-button pure-button-primary mr" type="button" value="{{value}}"/>
@@ -142,8 +142,8 @@
 				value - becomes js-function name to call
 				label - becomes span "comment" element
 			-->
-			{{#if2 label}}<span class="comment">{{label}}</span>{{/if2}}
-			<div id="{{id}}" name="{{id}}" {{#if2 class}}class="{{class}}"{{/if2}}><img src onerror='{{value}}("{{id}}","{{params.arg1}}")'></div>
+			{{#if2 label}}<span id="{{id}}-lbl" class="comment">{{label}}</span>{{/if2}}
+			<div id="{{id}}" {{#if2 class}}class="{{class}}"{{/if2}}><img src onerror='{{value}}("{{id}}","{{params.arg1}}")'></div>
 		{{/if}}
 		{{#if html == "div" && type == "html"}}
 			<!-- Custom div with text content,
@@ -152,8 +152,8 @@
 				label - becomes div css class selector
 				param.* - reserved
 			-->
-			{{#if2 label}}<span class="comment">{{label}}</span>{{/if2}}
-			<div {{#if2 class}}class="{{class}}"{{/if2}}><div id="{{id}}">{{value}}</div></div>
+			{{#if2 label}}<span id="{{id}}-lbl" class="comment">{{label}}</span>{{/if2}}
+			<div id="{{id}}-out" {{#if2 class}}class="{{class}}"{{/if2}}><div id="{{id}}">{{value}}</div></div>
 		{{/if}}
 		{{#if html == "div" && type == "pbar"}}
 			<!-- live progressbar -->
@@ -183,6 +183,7 @@
 		{{#if html == "img"}}
 			<div class = "image"><img id="{{id}}" src = {{value}}></div>
 		{{/if}}
+
 		{{#if html == "input" && type != "checkbox"}}
 			<span>{{label}}</span>
 			{{#if2 type == "range" || type == "color"}}<span id="{{id}}-val">: {{value}}</span>{{/if2}}

resources/html/js/ui_lamp.json

@@ -1,6 +1,6 @@
 {
   "type":"interface",
-  "version":24,
+  "version":25,
   "descr":"FireLamp UI objects",
 
   "settings":{

src/interface.cpp

@@ -54,7 +54,7 @@ Copyright © 2020 Dmytro Korniienko (kDn)
 
 
 // версия ресурсов в стороннем джейсон файле
-#define UIDATA_VERSION      24
+#define UIDATA_VERSION      25
 
 #define DEMO_MIN_PERIOD     10
 #define DEMO_MAX_PERIOD     900

src/main.h

@@ -44,8 +44,8 @@ Copyright © 2020 Dmytro Korniienko (kDn)
 #include "config.h"
 
 #define LAMPFW_VERSION_MAJOR     4
-#define LAMPFW_VERSION_MINOR     0
-#define LAMPFW_VERSION_REVISION  1
+#define LAMPFW_VERSION_MINOR     1
+#define LAMPFW_VERSION_REVISION  0
 
 #define LAMPFW_VERSION_VALUE     (MAJ, MIN, REV) ((MAJ) << 16 | (MIN) << 8 | (REV))