Merge branch 'development' into prerelease-13.4

arendst · Feb 14, 2024 · e617328 · e617328
2 parents 99e44a1 + f98c66f
commit e617328
Show file tree

Hide file tree

Showing 8 changed files with 442 additions and 417 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,9 +9,10 @@ All notable changes to this project will be documented in this file.
 ## [13.3.0.5] 20240214
 ### Added
 - Internal support for persistent JSON settings using single file
-- Command ``SetOption158`` to publish or suppress ModbusReceived MQTT messages (#20678)
+- Command ``SetOption158 1`` to disable publish of ModbusReceived MQTT messages (#20678)
 - ESP32 Core3 support for SPI ethernet on DM9051, W5500 and KSZ8851
 - Berry option to invert serial
+- Command ``SetOption159 1`` to enable counting on both rising and falling edge (#20712)
 
 ### Breaking Changed
 - ESP32 LVGL library from v8.3.11 to v9.0.0, some small breaking changes in C, none in HASPmota (#20659)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -119,7 +119,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ## Changelog v13.4.0 Quinta
 ### Added
 - Command ``TimedPower<index> <milliseconds>[,ON|OFF|TOGGLE|BLINK]`` executes ``Power<index> [ON|OFF|TOGGLE|BLINK] `` and after <millisecond> executes ``Power<index> [OFF|ON|TOGGLE|OFF]``
-- Command ``SetOption158`` to publish or suppress ModbusReceived MQTT messages [#20678](https://github.com/arendst/Tasmota/issues/20678)
+- Command ``SetOption158 1`` to disable publish of ModbusReceived MQTT messages [#20678](https://github.com/arendst/Tasmota/issues/20678)
+- Command ``SetOption159 1`` to enable counting on both rising and falling edge [#20712](https://github.com/arendst/Tasmota/issues/20712)
 - Display of active drivers using command ``status 4``
 - GPIO Viewer to see realtime GPIO states using assets from `https://ota.tasmota.com/tasmota/gpioviewer/gpio_viewer_13_4_0/` v2.0.8
 - Support for CST816S touch interface [#20213](https://github.com/arendst/Tasmota/issues/20213)

diff --git a/lib/libesp32/berry_matter/src/be_matter_module.c b/lib/libesp32/berry_matter/src/be_matter_module.c
@@ -52,6 +52,7 @@ static const uint8_t MATTER_ADD_ENDPOINT_HINTS_JS[] =
   "function otm(arg_name,val){"
   "var s=eb(arg_name);"
   "s.placeholder=(val in hm)?hl[hm[val]]:\"\";"
+  "s.title=s.placeholder;"
   "};"
   "</script>";
 

diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_UI.be b/lib/libesp32/berry_matter/src/embedded/Matter_UI.be
@@ -329,20 +329,22 @@ class Matter_UI
 
       var cl = self.device.plugins_classes.find(typ)
       var arg = ""
+      var arg_hint = ""
       if cl != nil
         arg = cl.ui_conf_to_string(cl, conf)
+        arg_hint = cl.ARG_HINT
       end
 
       found = true
       webserver.content_send(f"<tr><td style='font-size:smaller;'><b>{ep:i}</b></td>")
       webserver.content_send(format("<td style='font-size:smaller;'><input type='text' name='nam%i' size='1' value='%s'></td>",
                              ep, webserver.html_escape(conf.find('name', ''))))
       webserver.content_send(f"<td style='font-size:smaller;'><b>{self.plugin_name(conf.find('type', ''))}</b></td>")
-      webserver.content_send(format("<td style='font-size:smaller;'><input type='text' name='arg%i' size='1' value='%s' placeholder='%s'></td>",
-                             ep, webserver.html_escape(arg), cl ? webserver.html_escape(cl.ARG_HINT) : ''))
-      webserver.content_send(f"<td style='text-align:center;'><button name='del{ep:i}' "
+      webserver.content_send(format("<td style='font-size:smaller;'><input type='text' name='arg%i' size='1' value='%s' placeholder='%s' title='%s'></td>",
+                             ep, webserver.html_escape(arg), webserver.html_escape(arg_hint), webserver.html_escape(arg_hint)))
+      webserver.content_send(f"<td style='text-align:center;'><button name='del{ep:i}' title='Delete Endpoint {ep:i}' "
                               "style='background:none;border:none;line-height:1;'"
-                              " onclick=\"return confirm('Confirm removing endpoint')\""
+                              " onclick=\"return confirm('Confirm removing endpoint {ep:i}')\""
                               ">"
                               "&#128293;</button></td></tr>")
       i += 1
@@ -395,8 +397,10 @@ class Matter_UI
 
         var cl = self.device.plugins_classes.find(typ)
         var arg = ""
+        var arg_hint = ""
         if cl != nil
           arg = cl.ui_conf_to_string(cl, conf)
+          arg_hint = cl.ARG_HINT
         end
 
         found = true
@@ -405,8 +409,8 @@ class Matter_UI
                                ep, webserver.html_escape(conf.find('name', ''))))
 
         webserver.content_send(format("<td width='115' style='font-size:smaller;'><b>%s</b></select></td>", self.plugin_name(conf.find('type', ''))))
-        webserver.content_send(format("<td style='font-size:smaller;'><input type='text' name='arg%i' size='8' value='%s'></td>",
-                              ep, webserver.html_escape(arg)))
+        webserver.content_send(format("<td style='font-size:smaller;'><input type='text' name='arg%i' size='8' value='%s' title='%s'></td>",
+                              ep, webserver.html_escape(arg), webserver.html_escape(arg_hint)))
         webserver.content_send(f"<td width='15' style='text-align:center;'><button name='del{ep:i}' "
                                 "style='background:none;border:none;line-height:1;'"
                                 " onclick=\"return confirm('Confirm removing endpoint')\""
@@ -442,7 +446,7 @@ class Matter_UI
                            "</tr>")
 
     webserver.content_send("<tr>"
-                           "<td style='font-size:smaller;'><input type='text' name='nam' size='1' value='' placeholder='(optional)'></td>"
+                           "<td style='font-size:smaller;'><input type='text' name='nam' size='1' value='' placeholder='(optional)' title=''></td>"
                            "<td style='font-size:smaller;'><select id='pi' name='pi' onchange='otm(\"arg\",this.value)'>")
     self.plugin_option('', self._CLASSES_TYPES)
     webserver.content_send("</select></td>")
@@ -667,17 +671,19 @@ class Matter_UI
 
         var cl = self.device.plugins_classes.find(typ)
         var arg = ""
+        var arg_hint = ""
         if cl != nil
           arg = cl.ui_conf_to_string(cl, config)
+          arg_hint = cl.ARG_HINT
         end
 
         webserver.content_send(format("<tr><td style='font-size:smaller;'><input type='text' name='nam%i' size='1' value='' placeholder='(optional)'></td>", i))
         webserver.content_send(format("<td style='font-size:smaller;'><select name='pi%i' onchange='otm(\"arg%i\",this.value)'>", i, i))
         self.plugin_option(typ, self._CLASSES_TYPES2)
         webserver.content_send("</select></td>"
                                "<td style='font-size:smaller;'>")
-        webserver.content_send(format("<input type='text' id='arg%i' name='arg%i' size='1' value='%s' placeholder='%s'>",
-                               i, i, webserver.html_escape(arg), cl ? webserver.html_escape(cl.ARG_HINT) : ''))
+        webserver.content_send(format("<input type='text' id='arg%i' name='arg%i' size='1' value='%s' placeholder='%s' title='%s'>",
+                               i, i, webserver.html_escape(arg), webserver.html_escape(arg_hint), webserver.html_escape(arg_hint)))
         webserver.content_send("</td></tr>")
         i += 1
       end