Merge pull request #2589 from FrankSpringfield/main

[PLM251120-09263][PLM251120-09698] Hide some specific events in history

Author: greens

drivers/SmartThings/zigbee-bed/src/shus-mattress/init.lua

@@ -36,7 +36,7 @@ end
 
 local function process_control_attr_factory(cmd)
   return function(driver, device, value, zb_rx)
-    device:emit_event(cmd.idle())
+    device:emit_event(cmd("idle", { visibility = { displayed = false }}))
   end
 end
 
@@ -129,7 +129,7 @@ local function process_capabilities_hardness_factory(cap,attrs,cap_attr)
     )
     --A button that can be triggered continuously
     local evt_ctrl = cap_attr.soft()
-    local evt_idle = cap_attr.idle()
+    local evt_idle = cap_attr("idle", { visibility = { displayed = false }})
     if cmd.args[cap] == "hard" then
       evt_ctrl = cap_attr.hard()
     end
@@ -148,7 +148,7 @@ local function device_init(driver, device)
 end
 
 local function device_added(driver, device)
-   device:emit_event(custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}))
+   device:emit_event(custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}, { visibility = { displayed = false }}))
    do_refresh(driver, device)
 end
 

drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua

@@ -59,7 +59,7 @@ test.register_coroutine_test(
   function()
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}) ))
+      custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}, { visibility = { displayed = false }}) ))
     local read_0x0006_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0006, MFG_CODE)
     local read_0x0007_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0007, MFG_CODE)
     local read_0x0009_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0009, MFG_CODE)
@@ -140,7 +140,7 @@ test.register_coroutine_test(
 )
 
 test.register_coroutine_test(
-  "Device reported leftback 0 and driver emit custom_capabilities.left_control.leftback.idle()",
+  "Device reported leftback 0 and driver emit custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0000, data_types.Uint8.ID, 0 }
@@ -150,12 +150,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftback.idle()))
+      custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftback 1 and driver emit custom_capabilities.left_control.leftback.idle()",
+  "Device reported leftback 1 and driver emit custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0000, data_types.Uint8.ID, 1 }
@@ -165,12 +165,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftback.idle()))
+      custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftwaist 0 and driver emit custom_capabilities.left_control.leftwaist.idle()",
+  "Device reported leftwaist 0 and driver emit custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0001, data_types.Uint8.ID, 0 }
@@ -180,12 +180,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftwaist.idle()))
+      custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftwaist 1 and driver emit custom_capabilities.left_control.leftwaist.idle()",
+  "Device reported leftwaist 1 and driver emit custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0001, data_types.Uint8.ID, 1 }
@@ -195,12 +195,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftwaist.idle()))
+      custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported lefthip 0 and driver emit custom_capabilities.left_control.lefthip.idle()",
+  "Device reported lefthip 0 and driver emit custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0002, data_types.Uint8.ID, 0 }
@@ -210,12 +210,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.lefthip.idle()))
+      custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported lefthip 1 and driver emit custom_capabilities.left_control.lefthip.idle()",
+  "Device reported lefthip 1 and driver emit custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0002, data_types.Uint8.ID, 1 }
@@ -225,12 +225,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.lefthip.idle()))
+      custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightback 0 and driver emit custom_capabilities.right_control.rightback.idle()",
+  "Device reported rightback 0 and driver emit custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0003, data_types.Uint8.ID, 0 }
@@ -240,12 +240,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightback.idle()))
+      custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightback 1 and driver emit custom_capabilities.right_control.rightback.idle()",
+  "Device reported rightback 1 and driver emit custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0003, data_types.Uint8.ID, 1 }
@@ -255,12 +255,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightback.idle()))
+      custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightwaist 0 and driver emit custom_capabilities.right_control.rightwaist.idle()",
+  "Device reported rightwaist 0 and driver emit custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0004, data_types.Uint8.ID, 0 }
@@ -270,12 +270,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightwaist.idle()))
+      custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightwaist 1 and driver emit custom_capabilities.right_control.rightwaist.idle()",
+  "Device reported rightwaist 1 and driver emit custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0004, data_types.Uint8.ID, 1 }
@@ -285,12 +285,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightwaist.idle()))
+      custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported righthip 0 and driver emit custom_capabilities.right_control.righthip.idle()",
+  "Device reported righthip 0 and driver emit custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0005, data_types.Uint8.ID, 0 }
@@ -300,12 +300,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.righthip.idle()))
+      custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported righthip 1 and driver emit custom_capabilities.right_control.righthip.idle()",
+  "Device reported righthip 1 and driver emit custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0005, data_types.Uint8.ID, 1 }
@@ -315,7 +315,7 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.righthip.idle()))
+      custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end
 )