Fix long-standing issue with internet ping readout on main dashboard

main_dashboard.yaml

@@ -245,9 +245,10 @@ views:
               - entity: binary_sensor.internet
                 name: Internet (Min/Avg/Max)
                 secondary_info: >-
-                  {{ states('sensor.min_ping') | round }}ms/{{
+                  {{ states('sensor.internet_round_trip_time_minimum') | round
-                  states('sensor.avg_ping') | round }}ms/{{
+                  }}ms/{{ states('sensor.internet_round_trip_time_average') |
-                  states('sensor.max_ping') | round }}ms
+                  round }}ms/{{
+                  states('sensor.internet_round_trip_time_maximum') | round }}ms
                 tap_action:
                   action: navigate
                   navigation_path: /lovelace/house-stats

mobile_dashboard.yaml

@@ -166,6 +166,16 @@ streamline_templates:
           show_state: false
           tap_action:
             action: toggle
+      modules:
+        - badgy-condition-helper
+      badgy-condition-helper:
+        entity_badges:
+          '1':
+            entity: '[[floor_lights_count]]'
+            condition:
+              - condition: state
+                entity_id: '[[lights_entity]]'
+                state: 'on'
   popup_temperature_button:
     defaults:
       - name: ''
@@ -989,10 +999,11 @@ views:
           - type: custom:streamline-card
             template: floors_separator
             variables:
-              - name: Basement
+              name: Basement
-              - icon: mdi:home-floor-b
+              icon: mdi:home-floor-b
-              - power_entity: sensor.basement_total_power_sensor
+              power_entity: sensor.basement_total_power_sensor
-              - lights_entity: light.basement_lights
+              lights_entity: light.basement_lights
+              floor_lights_count: sensor.basement_lights_on
           - type: custom:streamline-card
             template: main_button_floors
             variables:
@@ -1007,10 +1018,11 @@ views:
           - type: custom:streamline-card
             template: floors_separator
             variables:
-              - name: First Floor
+              name: First Floor
-              - icon: mdi:home-floor-1
+              icon: mdi:home-floor-1
-              - power_entity: sensor.first_floor_total_power_sensor
+              power_entity: sensor.first_floor_total_power_sensor
-              - lights_entity: light.first_floor_lights
+              lights_entity: light.first_floor_lights
+              floor_lights_count: sensor.first_floor_lights_on
           - type: custom:streamline-card
             template: main_button_floors
             variables:
@@ -1086,10 +1098,11 @@ views:
           - type: custom:streamline-card
             template: floors_separator
             variables:
-              - name: Second Floor
+              name: Second Floor
-              - icon: mdi:home-floor-2
+              icon: mdi:home-floor-2
-              - power_entity: sensor.second_floor_total_power_sensor
+              power_entity: sensor.second_floor_total_power_sensor
-              - lights_entity: light.second_floor_lights
+              lights_entity: light.second_floor_lights
+              floor_lights_count: sensor.second_floor_lights_on
           - type: custom:streamline-card
             template: main_button_floors
             variables:
@@ -1451,7 +1464,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.basement_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: button
                     button_type: switch
@@ -2658,7 +2679,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.master_bedroom_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:bubble-card
@@ -2824,7 +2853,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.kallen_bedroom_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: button
                     button_type: switch
@@ -3772,7 +3809,6 @@ views:
             state: active
       - type: custom:mushroom-template-badge
         content: Tornado Possible
-        icon: mdi:weather-tornado
         color: red
         label: Stay Alert
         tap_action:
@@ -3786,6 +3822,7 @@ views:
           - condition: state
             entity: binary_sensor.tornado_possible
             state: 'on'
+        icon: '{{ state_attr(''binary_sensor.tornado_possible'',''icon'') }}'
       - type: custom:mushroom-template-badge
         content: >-
           {{
@@ -3993,10 +4030,10 @@ views:
                 entity: sensor.spc_outlook_day_1
                 state_not: No Risk
       - type: custom:mushroom-template-badge
-        content: '{{ state_attr(entity,''wind_probability'') }}'
+        content: '{{ states(entity) }}'
         icon: mdi:weather-windy
         color: '{{ state_attr(entity,''wind_fill'') }}'
-        entity: sensor.spc_outlook_day_1
+        entity: sensor.spc_wind_risk_day_1
         label: SPC Wind Risk
         tap_action:
           action: more-info
@@ -4008,22 +4045,19 @@ views:
           - condition: and
             conditions:
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_wind_risk_day_1
                 state_not: unavailable
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_wind_risk_day_1
                 state_not: unknown
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_wind_risk_day_1
                 state_not: No Risk
-              - condition: state
-                entity: sensor.spc_outlook_day_1
-                state_not: General Thunderstorms Risk
       - type: custom:mushroom-template-badge
-        content: '{{ state_attr(entity,''torn_probability'') }}'
+        content: '{{ states(entity) }}'
         icon: mdi:weather-tornado
         color: '{{ state_attr(entity,''torn_fill'') }}'
-        entity: sensor.spc_outlook_day_1
+        entity: sensor.spc_tornado_risk_day_1
         label: SPC Tornado Risk
         tap_action:
           action: more-info
@@ -4035,22 +4069,19 @@ views:
           - condition: and
             conditions:
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_tornado_risk_day_1
                 state_not: unavailable
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_tornado_risk_day_1
                 state_not: unknown
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_tornado_risk_day_1
                 state_not: No Risk
-              - condition: state
-                entity: sensor.spc_outlook_day_1
-                state_not: General Thunderstorms Risk
       - type: custom:mushroom-template-badge
-        content: '{{ state_attr(entity,''hail_probability'') }}'
+        content: '{{ states(entity) }}'
         icon: mdi:weather-hail
         color: '{{ state_attr(entity,''hail_fill'') }}'
-        entity: sensor.spc_outlook_day_1
+        entity: sensor.spc_hail_risk_day_1
         label: SPC Hail Risk
         tap_action:
           action: more-info
@@ -4062,17 +4093,14 @@ views:
           - condition: and
             conditions:
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_hail_risk_day_1
                 state_not: unavailable
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_hail_risk_day_1
                 state_not: unknown
               - condition: state
-                entity: sensor.spc_outlook_day_1
+                entity: sensor.spc_hail_risk_day_1
                 state_not: No Risk
-              - condition: state
-                entity: sensor.spc_outlook_day_1
-                state_not: General Thunderstorms Risk
       - type: custom:mushroom-template-badge
         content: |-
           {% if is_state(entity,'on') %}
@@ -6393,6 +6421,7 @@ views:
               icon: mdi:home-floor-1
               power_entity: sensor.first_floor_total_power_sensor
               lights_entity: light.first_floor_lights
+              floor_lights_count: sensor.first_floor_lights_on
           - type: custom:streamline-card
             template: state_color_button
             variables:
@@ -6549,6 +6578,16 @@ views:
                 show_state: false
                 tap_action:
                   action: toggle
+            modules:
+              - badgy-condition-helper
+            badgy-condition-helper:
+              entity_badges:
+                '1':
+                  entity: sensor.first_floor_lights_on
+                  condition:
+                    - condition: state
+                      entity_id: light.first_floor_lights
+                      state: 'on'
           - type: custom:bubble-card
             card_type: button
             button_type: state