various tidyups

packages/waste_collection.yaml

@@ -1,40 +1,52 @@
 #:########################################################################################:#
-# Auckland Council Waste Collection Package                                             #
+# Council Waste Collection Package                                                       #
 #:########################################################################################:#
 #
 # TITLE:
-#   Auckland Council Waste Collection
+#   Council Waste Collection
 #
 # FILE:
 #   packages/waste_collection.yaml
 #
 # VERSION:
-#   V1.1 2026-07-20
+#   V1.4 2026-07-22
 #
 # VERSION HISTORY:
+#   V1.4 2026-07-22
+#     - Fixed waste type names to match Auckland Council source output (recycling, food scraps)
+#     - Resolved P013-F019: Recycling and food-waste sensors were unknown due to type mismatch
+#
+#   V1.3 2026-07-22
+#     - Moved the source identifier to !secret council_name.
+#     - Changed source documentation and MQTT unique IDs to generic wording.
+#
+#   V1.2 2026-07-22
+#     - Moved the source area number to !secret council_area.
+#     - Changed package and schedule display names to generic council wording.
+#
 #   V1.1 2026-07-20
 #     - Added source setup, schedule, MQTT, and maintenance documentation.
 #
 #   V1.0
-#     - Initial Auckland Council schedules and MQTT bin-status sensors.
+#     - Initial council schedules and MQTT bin-status sensors.
 #
 # PURPOSE:
-#   Provides Auckland Council rubbish, recycling, and food-waste collection
-#   schedules, plus independent MQTT sensors indicating whether bins are out.
+#   Provides council rubbish, recycling, and food-waste collection schedules,
+#   plus independent MQTT sensors indicating whether bins are out.
 #
 # DEPENDENCY:
-#   Requires the Waste Collection Schedule custom integration and its
-#   aucklandcouncil_govt_nz source.
+#   Requires the Waste Collection Schedule custom integration and its configured
+#   council source.
 #
 # AREA NUMBER SETUP:
-#   - Open the Auckland Council rubbish and recycling collection-day finder.
+#   - Open the council rubbish and recycling collection-day finder.
 #   - Select the property address.
-#   - Use the displayed assessment number as area_number below.
+#   - Store the displayed assessment number as council_area in secrets.yaml.
 #   - Source documentation:
-#     https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/aucklandcouncil_govt_nz.md
+#     https://github.com/mampfes/hacs_waste_collection_schedule
 #
 # SCHEDULE SENSORS:
-#   - Types are rubbish, recycle, and food-waste.
+#   - Types are rubbish, recycling, and food scraps (matching Auckland source output).
 #   - Each sensor returns one upcoming collection with a one-day lead time.
 #   - details_format is upcoming and add_days_to adds relative-day text.
 #
@@ -48,19 +60,20 @@
 #   - As of 2026-07-20, the rubbish schedule resolves correctly.
 #   - Recycling and food-waste report unknown; review the source type names when
 #     investigating those schedules.
+#   - As of 2026-07-22, fixed type names to match Auckland Council source output.
 #
 #:########################################################################################:#
 
 waste_collection_schedule:
   sources:
-    - name: aucklandcouncil_govt_nz
+    - name: !secret council_name
       args:
-        area_number: 12344403722 # Auckland Council assessment number.
+        area_number: !secret council_area
 
 sensor:
   - platform: waste_collection_schedule
     #source_index: 0
-    name: Auckland Council Waste
+    name: "Council Waste"
     details_format: upcoming
     count: 1
     leadtime: 1
@@ -72,7 +85,7 @@ sensor:
       - rubbish
   - platform: waste_collection_schedule
     #source_index: 0
-    name: Auckland Council Recycling
+    name: "Council Recycling"
     details_format: upcoming
     count: 1
     leadtime: 1
@@ -81,10 +94,10 @@ sensor:
     add_days_to: true
     #event_index: EVENT_INDEX
     types:
-      - recycle
+      - recycling
   - platform: waste_collection_schedule
     #source_index: 0
-    name: Auckland Council Food-Waste
+    name: "Council Food-Waste"
     details_format: upcoming
     count: 1
     leadtime: 1
@@ -93,16 +106,16 @@ sensor:
     add_days_to: true
     #event_index: EVENT_INDEX
     types:
-      - food-waste
+      - food scraps
 
 mqtt:
   sensor:
-    - unique_id: auckland_council_red_waste_bin_out
+    - unique_id: council_red_waste_bin_out
       name: "Red Waste Bin Out"
       state_topic: "viewroad-status/rubbishbinstatus/redbin-out"
-    - unique_id: auckland_council_green_recycling_bin_out
+    - unique_id: council_green_recycling_bin_out
       name: "Green Recycling Bin Out"
       state_topic: "viewroad-status/rubbishbinstatus/greenbin-out"
-    - unique_id: auckland_council_food_waste_bin_out
+    - unique_id: council_food_waste_bin_out
       name: "Food Waste Bin Out"
-      state_topic: "viewroad-status/rubbishbinstatus/foodbin-out"
+      state_topic: "viewroad-status/rubbishbinstatus/foodbin-out"