Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Tuya temp/humidity sensor quirks (_TZE200_upagmta9, ...) #3817

Merged
merged 4 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions tests/test_tuya_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,18 @@ async def test_handle_get_data(
@pytest.mark.parametrize(
"model,manuf,rh_scale,temp_scale,state_rpt",
[
("_TZE200_yjjdcqsq", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE200_9yapgbuv", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE204_yjjdcqsq", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE200_utkemkbs", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE204_utkemkbs", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE204_yjjdcqsq", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE204_ksz749x8", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT04),
("_TZE204_upagmta9", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE200_yjjdcqsq", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_yjjdcqsq", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE200_9yapgbuv", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_9yapgbuv", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE200_utkemkbs", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_utkemkbs", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_ksz749x8", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE200_upagmta9", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_upagmta9", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE200_cirvgep4", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_cirvgep4", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
("_TZE204_jygvp6fk", "TS0601", 100, 10, TUYA_TEMP01_HUM02_BAT03),
],
)
async def test_handle_get_data_enum_batt(
Expand Down
43 changes: 20 additions & 23 deletions zhaquirks/tuya/tuya_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,28 +253,6 @@ class NoManufTimeTuyaMCUCluster(TuyaMCUCluster):
)


(
TuyaQuirkBuilder("_TZE200_yjjdcqsq", "TS0601")
.applies_to("_TZE200_9yapgbuv", "TS0601")
.applies_to("_TZE204_9yapgbuv", "TS0601")
.applies_to("_TZE200_utkemkbs", "TS0601")
.applies_to("_TZE204_utkemkbs", "TS0601")
.applies_to("_TZE204_yjjdcqsq", "TS0601")
.applies_to("_TZE204_ksz749x8", "TS0601")
.tuya_temperature(dp_id=1, scale=10)
.tuya_humidity(dp_id=2)
.tuya_dp(
dp_id=4,
ep_attribute=TuyaPowerConfigurationCluster2AAA.ep_attribute,
attribute_name="battery_percentage_remaining",
converter=lambda x: {0: 50, 1: 100, 2: 200}[x],
)
.adds(TuyaPowerConfigurationCluster2AAA)
.skip_configuration()
.add_to_registry()
)


(
TuyaQuirkBuilder("_TZE284_aao3yzhs", "TS0601")
.applies_to("_TZE284_sgabhwa6", "TS0601")
Expand Down Expand Up @@ -302,7 +280,18 @@ class NoManufTimeTuyaMCUCluster(TuyaMCUCluster):


(
TuyaQuirkBuilder("_TZE204_upagmta9", "TS0601")
TuyaQuirkBuilder("_TZE200_upagmta9", "TS0601")
.applies_to("_TZE204_upagmta9", "TS0601")
.applies_to("_TZE200_cirvgep4", "TS0601")
.applies_to("_TZE204_cirvgep4", "TS0601")
.applies_to("_TZE204_jygvp6fk", "TS0601")
.applies_to("_TZE200_yjjdcqsq", "TS0601")
.applies_to("_TZE204_yjjdcqsq", "TS0601")
.applies_to("_TZE200_9yapgbuv", "TS0601")
.applies_to("_TZE204_9yapgbuv", "TS0601")
.applies_to("_TZE200_utkemkbs", "TS0601")
.applies_to("_TZE204_utkemkbs", "TS0601")
.applies_to("_TZE204_ksz749x8", "TS0601")
.tuya_temperature(dp_id=1, scale=10)
.tuya_humidity(dp_id=2)
.tuya_dp(
Expand All @@ -311,6 +300,14 @@ class NoManufTimeTuyaMCUCluster(TuyaMCUCluster):
attribute_name="battery_percentage_remaining",
converter=lambda x: {0: 50, 1: 100, 2: 200}[x],
)
.tuya_enum(
dp_id=9,
attribute_name="display_unit",
enum_class=TuyaTempUnitConvert,
entity_type=EntityType.CONFIG,
translation_key="display_unit",
fallback_name="Display unit",
)
.adds(TuyaPowerConfigurationCluster2AAA)
.tuya_enchantment(data_query_spell=True)
.skip_configuration()
Expand Down
Loading