Merge pull request #2258 from SmartThingsCommunity/staged_release/aqara_unoffical

greens · web-flow · commit 85a00554ba20 · 2025-07-21T11:59:00.000-07:00
Staged release/aqara unoffical
diff --git a/drivers/Aqara/aqara-cube/src/init.lua b/drivers/Aqara/aqara-cube/src/init.lua
@@ -125,7 +125,8 @@ local aqara_cube_t1_pro_handler = {
   lifecycle_handlers = {
     init = device_init,
     added = device_added
-  }
+  },
+  health_check = false,
 }
 
 local aqara_cube_t1_pro_driver = ZigbeeDriver("aqara_cube_t1_pro", aqara_cube_t1_pro_handler)
diff --git a/drivers/Aqara/aqara-feeder/src/init.lua b/drivers/Aqara/aqara-feeder/src/init.lua
@@ -184,6 +184,7 @@ local aqara_pet_feeder_handler = {
     infoChanged = device_info_changed,
     doConfigure = device_configure
   },
+  health_check = false,
   can_handle = function(opts, driver, device, ...)
     return device:get_model() == "aqara.feeder.acn001"
   end
diff --git a/drivers/Aqara/aqara-lock/src/init.lua b/drivers/Aqara/aqara-lock/src/init.lua
@@ -325,7 +325,8 @@ local aqara_locks_handler = {
   },
   secret_data_handlers = {
     [security.SECRET_KIND_AQARA] = my_secret_data_handler
-  }
+  },
+  health_check = false,
 }
 
 local aqara_locks_driver = ZigbeeDriver("aqara_locks_k100", aqara_locks_handler)
diff --git a/drivers/SmartThings/zigbee-bed/src/init.lua b/drivers/SmartThings/zigbee-bed/src/init.lua
@@ -23,6 +23,7 @@ local zigbee_bed_template = {
   sub_drivers = {
     require("shus-mattress"),
   },
+  health_check = false,
 }
 
 defaults.register_for_default_handlers(zigbee_bed_template, zigbee_bed_template.supported_capabilities)
diff --git a/drivers/Unofficial/tuya-zigbee/src/init.lua b/drivers/Unofficial/tuya-zigbee/src/init.lua
@@ -26,7 +26,9 @@ local unofficial_tuya_driver_template = {
     require("curtain"),
     require("motion-sensor"),
     require("smoke-detector"),
-    require("switch")}
+    require("switch")
+  },
+  health_check = false,
 }
 
 defaults.register_for_default_handlers(unofficial_tuya_driver_template, unofficial_tuya_driver_template.supported_capabilities)
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_meian_button.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_meian_button.lua
@@ -40,9 +40,7 @@ local mock_device_meian_button = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device_meian_button)
-  zigbee_test_utils.init_noop_health_check_timer()
-end
+  test.mock_device.add_test_device(mock_device_meian_button)end
 
 test.set_test_init_function(test_init)
 
@@ -79,44 +77,44 @@ test.register_message_test(
     }
 )
 
-test.register_coroutine_test(
-    "Health check should check all relevant attributes",
-    function()
-      test.socket.device_lifecycle:__queue_receive({ mock_device_meian_button.id, "added"})
-      test.socket.capability:__expect_send(
-        mock_device_meian_button:generate_test_message(
-          "main",
-          capabilities.button.supportedButtonValues({ "pushed" }, { visibility = { displayed = false } })
-        )
-      )
-      test.socket.capability:__expect_send(
-        mock_device_meian_button:generate_test_message(
-          "main",
-          capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
-        )
-      )
-      test.socket.capability:__expect_send({
-        mock_device_meian_button.id,
-        {
-          capability_id = "button", component_id = "main",
-          attribute_id = "button", state = { value = "pushed" }
-        }
-      })
-      test.socket.zigbee:__expect_send({ mock_device_meian_button.id, tuya_utils.build_tuya_magic_spell_message(mock_device_meian_button) })
-      test.socket.zigbee:__expect_send(
-          {
-            mock_device_meian_button.id,
-            PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device_meian_button)
-          }
-      )
-    end,
-    {
-      test_init = function()
-        test.mock_device.add_test_device(mock_device_meian_button)
-        test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "health_check")
-      end
-    }
-)
+-- test.register_coroutine_test(
+--     "Health check should check all relevant attributes",
+--     function()
+--       test.socket.device_lifecycle:__queue_receive({ mock_device_meian_button.id, "added"})
+--       test.socket.capability:__expect_send(
+--         mock_device_meian_button:generate_test_message(
+--           "main",
+--           capabilities.button.supportedButtonValues({ "pushed" }, { visibility = { displayed = false } })
+--         )
+--       )
+--       test.socket.capability:__expect_send(
+--         mock_device_meian_button:generate_test_message(
+--           "main",
+--           capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
+--         )
+--       )
+--       test.socket.capability:__expect_send({
+--         mock_device_meian_button.id,
+--         {
+--           capability_id = "button", component_id = "main",
+--           attribute_id = "button", state = { value = "pushed" }
+--         }
+--       })
+--       test.socket.zigbee:__expect_send({ mock_device_meian_button.id, tuya_utils.build_tuya_magic_spell_message(mock_device_meian_button) })
+--       test.socket.zigbee:__expect_send(
+--           {
+--             mock_device_meian_button.id,
+--             PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device_meian_button)
+--           }
+--       )
+--     end,
+--     {
+--       test_init = function()
+--         test.mock_device.add_test_device(mock_device_meian_button)
+--         test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "health_check")
+--       end
+--     }
+-- )
 
 test.register_coroutine_test(
     "Refresh necessary attributes",
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_button.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_button.lua
@@ -40,9 +40,7 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-    test.mock_device.add_test_device(mock_device)
-    zigbee_test_utils.init_noop_health_check_timer()
-end
+    test.mock_device.add_test_device(mock_device)end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua
@@ -39,9 +39,7 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)
-  zigbee_test_utils.init_noop_health_check_timer()
-end
+  test.mock_device.add_test_device(mock_simple_device)end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_motion_sensor.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_motion_sensor.lua
@@ -39,9 +39,7 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)
-  zigbee_test_utils.init_noop_health_check_timer()
-end
+  test.mock_device.add_test_device(mock_simple_device)end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_smoke_detector.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_smoke_detector.lua
@@ -39,9 +39,7 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)
-  zigbee_test_utils.init_noop_health_check_timer()
-end
+  test.mock_device.add_test_device(mock_simple_device)end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua
@@ -95,9 +95,7 @@ local function test_init()
   test.mock_device.add_test_device(second_mock_child_device)
   test.mock_device.add_test_device(third_mock_child_device)
   test.mock_device.add_test_device(fourth_mock_child_device)
-  test.mock_device.add_test_device(fifth_mock_child_device)
-  zigbee_test_utils.init_noop_health_check_timer()
-end
+  test.mock_device.add_test_device(fifth_mock_child_device)end
 
 test.set_test_init_function(test_init)
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ local aqara_cube_t1_pro_handler = {`
`125`	`125`	`lifecycle_handlers = {`
`126`	`126`	`init = device_init,`
`127`	`127`	`added = device_added`
`128`		`- }`
	`128`	`+ },`
	`129`	`+ health_check = false,`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`local aqara_cube_t1_pro_driver = ZigbeeDriver("aqara_cube_t1_pro", aqara_cube_t1_pro_handler)`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,8 @@ local aqara_locks_handler = {`
`325`	`325`	`},`
`326`	`326`	`secret_data_handlers = {`
`327`	`327`	`[security.SECRET_KIND_AQARA] = my_secret_data_handler`
`328`		`- }`
	`328`	`+ },`
	`329`	`+ health_check = false,`
`329`	`330`	`}`
`330`	`331`
`331`	`332`	`local aqara_locks_driver = ZigbeeDriver("aqara_locks_k100", aqara_locks_handler)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ local zigbee_bed_template = {`
`23`	`23`	`sub_drivers = {`
`24`	`24`	`require("shus-mattress"),`
`25`	`25`	`},`
	`26`	`+ health_check = false,`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`defaults.register_for_default_handlers(zigbee_bed_template, zigbee_bed_template.supported_capabilities)`