diff --git a/custom_cards/custom_card_andyblac_room/custom_card_andyblac_room.yaml b/custom_cards/custom_card_andyblac_room/custom_card_andyblac_room.yaml
index b0441d1..54159df 100644
--- a/custom_cards/custom_card_andyblac_room/custom_card_andyblac_room.yaml
+++ b/custom_cards/custom_card_andyblac_room/custom_card_andyblac_room.yaml
@@ -1,6 +1,6 @@
---
custom_card_andyblac_room:
- # v2.0.1
+ # v2.0.2
template:
- "ulm_translation_engine"
@@ -66,8 +66,16 @@ custom_card_andyblac_room:
return getState(variables.sensor_label_1) + spacer + getState(variables.sensor_label_2) + spacer + getState(variables.sensor_label_3);
} else if (variables.sensor_label_1 && variables.sensor_label_2) {
return getState(variables.sensor_label_1) + spacer + getState(variables.sensor_label_2);
+ } else if (variables.sensor_label_1 && variables.sensor_label_3) {
+ return getState(variables.sensor_label_1) + spacer + getState(variables.sensor_label_3);
+ } else if (variables.sensor_label_2 && variables.sensor_label_3) {
+ return getState(variables.sensor_label_2) + spacer + getState(variables.sensor_label_3);
} else if (variables.sensor_label_1) {
return getState(variables.sensor_label_1);
+ } else if (variables.sensor_label_2) {
+ return getState(variables.sensor_label_2);
+ } else if (variables.sensor_label_3) {
+ return getState(variables.sensor_label_3);
} else if (entity?.entity_id) {
return getState(entity.entity_id);
}
@@ -491,6 +499,19 @@ custom_card_andyblac_room_widget_icon:
action: "toggle"
hold_action:
action: "more-info"
+ ulm_active_state: >
+ [[[
+ let not_active = ['0','disarmed','off','closed','not_home','standby','idle','docked','unknown','unavailable','paused']
+ function containsNumbers(str) {
+ return /\d/.test(str);
+ }
+ if (!not_active.includes(entity.state)) {
+ if (containsNumbers(entity.state)) {
+ return entity?.state;
+ }
+ return entity?.state;
+ }
+ ]]]
tap_action:
action: "[[[ return variables?.tap_action?.action ? variables.tap_action.action : 'none'; ]]]"
navigation_path: "[[[ return variables.tap_action.navigation_path; ]]]"
@@ -552,7 +573,7 @@ custom_card_andyblac_room_widget_icon:
- margin-left: "10px"
- line-height: 0
- background-color: "[[[ return 'rgba(var(--color-red),1)'; ]]]"
- - value: "on"
+ - value: "[[[ return variables?.ulm_active_state ]]]"
styles:
icon:
- color: "[[[ return variables.ulm_custom_card_andyblac_room_use_light_color ? 'var(--button-card-light-color)' : (variables.ulm_custom_card_andyblac_room_icon_color_on ? 'rgba(var(--color-'+variables.ulm_custom_card_andyblac_room_icon_color_on+'),1)' : 'rgba(var(--color-theme),0.7)'); ]]]"
diff --git a/docs/assets/img/Example_Dashboard_Dark.png b/docs/assets/img/Example_Dashboard_Dark.png
index ff100a4..93b38dc 100644
Binary files a/docs/assets/img/Example_Dashboard_Dark.png and b/docs/assets/img/Example_Dashboard_Dark.png differ
diff --git a/docs/usage/custom_cards/custom_card_andyblac_room.md b/docs/usage/custom_cards/custom_card_andyblac_room.md
index b799447..92143d8 100644
--- a/docs/usage/custom_cards/custom_card_andyblac_room.md
+++ b/docs/usage/custom_cards/custom_card_andyblac_room.md
@@ -29,6 +29,15 @@ Initial release
2.0.1
Rename variable 'ulm_custom_card_room_use_light_color' to 'ulm_custom_card_andyblac_room_use_light_color'
+
+2.0.2
+fix state detection for room entity objects
+add support for more sensor label variations
+sensor_label_1 and sensor_label_3
+sensor_label_2 and sensor_label_3
+sensor_label_2 by-self
+sensor_label_3 by-self
+
## Room Variables