Merge remote-tracking branch 'Tasmota/development' into work

Jason2866 · Jan 2, 2025 · 5d8df0a · 5d8df0a
2 parents b38db20 + d5d757f
commit 5d8df0a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 ### Fixed
+- Shutter discovery message regression from v14.4.1 (#22730)
 
 ### Removed
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -138,6 +138,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - HASPmota support for `tabview` [#22707](https://github.com/arendst/Tasmota/issues/22707)
 
 ### Fixed
+- Shutter discovery message regression from v14.4.1 [#22730](https://github.com/arendst/Tasmota/issues/22730)
 - Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
 - Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
 - Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)

diff --git a/lib/libesp32/berry_tasmota/src/embedded/leds.be b/lib/libesp32/berry_tasmota/src/embedded/leds.be
@@ -8,18 +8,14 @@
 # 01 : begin        void -> void
 # 02 : show         void -> void
 # 03 : CanShow      void -> bool
-# 04 : IsDirty      void -> bool
-# 05 : Dirty        void -> void
+# 04 : IsDirty      void -> bool (deprecated)
+# 05 : Dirty        void -> void (deprecated)
 # 06 : Pixels       void -> bytes() (mapped to the buffer)
 # 07 : PixelSize    void -> int
 # 08 : PixelCount   void -> int
-# 09 : ClearTo      (color:??) -> void
-# 10 : SetPixelColor (idx:int, color:??) -> void
-# 11 : GetPixelColor (idx:int) -> color:??
-# 20 : RotateLeft   (rot:int [, first:int, last:int]) -> void
-# 21 : RotateRight  (rot:int [, first:int, last:int]) -> void
-# 22 : ShiftLeft    (rot:int [, first:int, last:int]) -> void
-# 23 : ShiftRight   (rot:int [, first:int, last:int]) -> void
+# 09 : ClearTo      (color:0xRRGGBB or 0xWWRRGGBB) -> void
+# 10 : SetPixelColor (idx:int, color:0xRRGGBB or 0xWWRRGGBB) -> void
+# 11 : GetPixelColor (idx:int) -> color:0xRRGGBB or 0xWWRRGGBB
 
 class Leds_ntv end
 
@@ -116,10 +112,10 @@ class Leds : Leds_ntv
   def can_show()
     return self.call_native(3)
   end
-  def is_dirty()
+  def is_dirty()                ## DEPRECATED
     return self.call_native(4)
   end
-  def dirty()
+  def dirty()                   ## DEPRECATED
     self.call_native(5)
   end
   def pixels_buffer(old_buf)
@@ -216,10 +212,10 @@ class Leds : Leds_ntv
       def can_show()
         return self.strip.can_show()
       end
-      def is_dirty()
+      def is_dirty()                ## DEPRECATED
         return self.strip.is_dirty()
       end
-      def dirty()
+      def dirty()                   ## DEPRECATED
         self.strip.dirty()
       end
       def pixels_buffer()
@@ -303,10 +299,10 @@ class Leds : Leds_ntv
       def can_show()
         return self.strip.can_show()
       end
-      def is_dirty()
+      def is_dirty()                ## DEPRECATED
         return self.strip.is_dirty()
       end
-      def dirty()
+      def dirty()                   ## DEPRECATED
         self.strip.dirty()
       end
       def pixels_buffer()

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
@@ -2383,7 +2383,7 @@ bool Xdrv27(uint32_t function)
         }
         break;
       case FUNC_JSON_APPEND:
-        if (!ShutterGlobal.sensor_data_reported || TasmotaGlobal.tele_period == 0) {
+        if (!ShutterGlobal.sensor_data_reported || TasmotaGlobal.tele_period != 2) {          
           ShutterGlobal.sensor_data_reported = true;
           for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
             ResponseAppend_P(",");

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
@@ -1974,7 +1974,7 @@ bool Xdrv27(uint32_t function)
         }
         break;
       case FUNC_JSON_APPEND:
-        if (!sensor_data_reported || TasmotaGlobal.tele_period == 0) {
+        if (!sensor_data_reported || TasmotaGlobal.tele_period != 2) {
           sensor_data_reported = true;
           for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
             uint8_t position = ShutterRealToPercentPosition(Shutter[i].real_position, i);

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_leds.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_leds.ino
@@ -59,18 +59,14 @@ extern "C" {
   // # 01 : begin        void -> void
   // # 02 : show         void -> void
   // # 03 : CanShow      void -> bool
-  // # 04 : IsDirty      void -> bool
-  // # 05 : Dirty        void -> void
+  // # 04 : IsDirty      void -> bool (deprecated)
+  // # 05 : Dirty        void -> void (deprecated)
   // # 06 : Pixels       void -> bytes() (mapped to the buffer)
   // # 07 : PixelSize    void -> int
   // # 08 : PixelCount   void -> int
-  // # 09 : ClearTo      (color:??) -> void
-  // # 10 : SetPixelColor (idx:int, color:??) -> void
-  // # 11 : GetPixelColor (idx:int) -> color:??
-  // # 20 : RotateLeft   (rot:int [, first:int, last:int]) -> void
-  // # 21 : RotateRight  (rot:int [, first:int, last:int]) -> void
-  // # 22 : ShiftLeft    (rot:int [, first:int, last:int]) -> void
-  // # 23 : ShiftRight   (rot:int [, first:int, last:int]) -> void
+  // # 09 : ClearTo      (color:0xRRGGBB or 0xWWRRGGBB) -> void
+  // # 10 : SetPixelColor (idx:int, color:0xRRGGBB or 0xWWRRGGBB) -> void
+  // # 11 : GetPixelColor (idx:int) -> color:0xRRGGBB or 0xWWRRGGBB
 
   void * be_get_tasmotaled(bvm *vm) {
     be_getmember(vm, 1, "_p");