diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index a4f7f681..1558f234 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -14,52 +14,49 @@
#-------------------------------------------
sensor:
- platform: rest
- name: PowerWall House now
- resource: http://http://192.168.10.238/api/meters/aggregates
+ name: House now
+ resource: http://192.168.10.90/api/meters/aggregates
method: GET
value_template: '{{ value_json.load.instant_power / 1000 }}'
unit_of_measurement: kWh
- platform: rest
- name: PowerWall Grid now
- resource: http://http://192.168.10.238/api/meters/aggregates
+ name: Grid now
+ resource: http://192.168.10.90/api/meters/aggregates
method: GET
value_template: '{{ value_json.site.instant_power / 1000 }}'
unit_of_measurement: kWh
- platform: rest
- name: PowerWall Solar now
- resource: http://http://192.168.10.238/api/meters/aggregates
+ name: Solar now
+ resource: http://192.168.10.90/api/meters/aggregates
method: GET
value_template: '{{ value_json.solar.instant_power / 1000 }}'
unit_of_measurement: kWh
- platform: rest
name: PowerWall Battery now
- resource: http://http://192.168.10.238/api/meters/aggregates
+ resource: http://192.168.10.90/api/meters/aggregates
method: GET
value_template: '{{ value_json.battery.instant_power / 1000 }}'
unit_of_measurement: kWh
- platform: rest
name: PowerWall Battery Capacity
- resource: http://http://192.168.10.238/api/system_status/soe
+ resource: http://192.168.10.90/api/system_status/soe
method: GET
value_template: '{{ 13500 // (100 / value_json.percentage) }}'
unit_of_measurement: W
#-------------------------------------------
-# group:
-# pihole:
-# entities:
-# - sensor.carlopihole
-# - sensor.pi_hole_version
-# - sensor.pihole_dns_unique_clients
-# - sensor.pihole_dns_queries_today
-# - sensor.pihole_ads_blocked_today
-# - sensor.pihole_ads_percentage_today
-# - sensor.pihole_ads_percentage_blocked_today
-# - switch.pihole_temp_disable
+group:
+ Power:
+ entities:
+ - sensor.powerwall_battery_capacity
+ - sensor.powerwall_battery_now
+ - sensor.grid_now
+ - sensor.house_now
+ - sensor.solar_now
#-------------------------------------------
#
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index cff403ad..b8541483 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -156,7 +156,8 @@ automation:
image: >-
{% set pictures = [
"/config/www/custom_ui/floorplan/images/branding/repo_ad.png",
- "/config/www/custom_ui/floorplan/images/branding/repo_ad2.png"
+ "/config/www/custom_ui/floorplan/images/branding/repo_ad2.png",
+ "/config/www/custom_ui/floorplan/images/branding/repo_ad3.png"
] %}
{{ pictures|random }}
diff --git a/config/www/custom_ui/floorplan/images/branding/repo_ad2.png b/config/www/custom_ui/floorplan/images/branding/repo_ad2.png
index d6a51e08..db08eb23 100755
Binary files a/config/www/custom_ui/floorplan/images/branding/repo_ad2.png and b/config/www/custom_ui/floorplan/images/branding/repo_ad2.png differ
diff --git a/config/www/custom_ui/floorplan/images/branding/repo_ad3.png b/config/www/custom_ui/floorplan/images/branding/repo_ad3.png
new file mode 100755
index 00000000..b07fe0db
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/branding/repo_ad3.png differ
|