Fold esphome-dsmr into esphome_dsmr

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## esphome_dsmr 1.0.6
+
+The catalog entry `esphome-dsmr` is folded into this one: it was the same driver for the same device under a second id. `esphome_dsmr` declares `replaces = { "esphome-dsmr" }` in its `DRIVER` table, so a host can move a device that runs the old entry to this driver. Every published `esphome-dsmr` artifact stays in the signed channel's history, so an installed copy keeps running until then.
+
 ## esphome_dsmr 1.0.5
 
 Each field of the `DRIVER` table is on its own line, `host_api_min` and `host_api_max` included. FTW reads these fields line by line, so with both on the `DRIVER = {` line its bundled copy could not state its host API. No behaviour change.

SUPPORT_STATUS.md

@@ -48,10 +48,8 @@ Catalog source is not proof that a target can install or run a driver.
 | easee | 1.0.4 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
 | easee_cloud | 1.3.4 | ftw-core | not_assessed | — | not_recorded | not_assessed |
 | easee_cloud | 1.3.4 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
-| esphome-dsmr | 1.0.3 | ftw-core | not_assessed | — | not_recorded | not_assessed |
-| esphome-dsmr | 1.0.3 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
-| esphome_dsmr | 1.0.5 | ftw-core | not_assessed | — | not_recorded | not_assessed |
-| esphome_dsmr | 1.0.5 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
+| esphome_dsmr | 1.0.6 | ftw-core | not_assessed | — | not_recorded | not_assessed |
+| esphome_dsmr | 1.0.6 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
 | etrel | 1.0.3 | ftw-core | not_assessed | — | not_recorded | not_assessed |
 | etrel | 1.0.3 | blixt-l1 | not_assessed | — | not_recorded | not_assessed |
 | ferroamp | 2.1.2 | ftw-core | not_assessed | — | not_recorded | not_assessed |

devices.yaml

@@ -312,14 +312,9 @@ manufacturers:
         variants: [SlimmeLezer+, Sourceful Zap P1]
         regions: [BE, DK, NL, SE]
         protocols:
-          - protocol: http
-            driver: "esphome-dsmr"
-            version: "1.0.3"
-            ders: [meter]
-            control: false
           - protocol: http
             driver: "esphome_dsmr"
-            version: "1.0.5"
+            version: "1.0.6"
             ders: [meter]
             control: false
         firmware_versions: "DSMR 2022.10.1 on SlimmeLezer+; Sourceful Zap open firmware"

drivers/lua/esphome_dsmr.lua

@@ -62,9 +62,12 @@ DRIVER = {
   id           = "esphome_dsmr",
   name         = "ESPHome DSMR (P1)",
   manufacturer = "ESPHome",
-  version      = "1.0.5",
+  version      = "1.0.6",
   host_api_min = 1,
   host_api_max = 1,
+  -- This driver replaces the catalog entry of the same device published as
+  -- esphome-dsmr. A host moves a device that runs it to this one.
+  replaces     = { "esphome-dsmr" },
   protocols    = { "http" },
   capabilities = { "meter" },
   description  = "Smart meter via ESPHome web_server v3 + dsmr component (Sourceful Zap on open firmware, DIY ESP32+P1, etc.).",

drivers/tests/lua_harness/test_esphome_dsmr_aliases.lua

@@ -28,7 +28,7 @@ end
 
 dofile("drivers/lua/esphome_dsmr.lua")
 
-if type(DRIVER) ~= "table" or DRIVER.id ~= "esphome_dsmr" or DRIVER.version ~= "1.0.5" then
+if type(DRIVER) ~= "table" or DRIVER.id ~= "esphome_dsmr" or DRIVER.version ~= "1.0.6" then
     error("ESPHome DSMR identity metadata is wrong")
 end
 if DRIVER.host_api_min ~= 1 or DRIVER.host_api_max ~= 1 or DRIVER.read_only ~= true then

index.yaml

@@ -202,26 +202,16 @@ drivers:
     control: true
     size_bytes: 39308
     sha256: "46581eb77e9d7e5fc4b0937ea2c5fa560afef749b50a42dd0353682fada87624"
-  - name: "esphome-dsmr"
-    version: "1.0.3"
-    tier: community
-    protocol: http
-    connectivity: local
-    setup: [bridge]
-    ders: [meter]
-    control: false
-    size_bytes: 16772
-    sha256: "f91e7c1769c239020b94aa75555dcaf830449d60d2bbbe54d09a969d2a423382"
   - name: "esphome_dsmr"
-    version: "1.0.5"
+    version: "1.0.6"
     tier: core
     protocol: http
     connectivity: local
     setup: [bridge]
     ders: [meter]
     control: false
-    size_bytes: 16776
-    sha256: "cae8f72ad3ddf56e8c5be28fcbfa7218801f87bfe7552c4f04394a60ef55bb3f"
+    size_bytes: 16956
+    sha256: "fef22c0e3528c18c5ae27055fb79fa1e6e9a1563d18534753018b7c570227755"
   - name: "etrel"
     version: "1.0.3"
     tier: community

manifests/esphome_dsmr.yaml

@@ -1,5 +1,5 @@
 name: "esphome_dsmr"
-version: "1.0.5"
+version: "1.0.6"
 tier: core
 author: "Sourceful Labs AB"
 protocol: http
@@ -16,9 +16,9 @@ tested_devices:
     notes: "Name-derived phase object_ids live-validated on SlimmeLezer+; explicit Sourceful aliases retained."
     min_driver_version: "1.0.1"
 min_host_version: "2.0.0"
-size_bytes: 16776
+size_bytes: 16956
 dkb_id: "esphome_dsmr"
-sha256: "cae8f72ad3ddf56e8c5be28fcbfa7218801f87bfe7552c4f04394a60ef55bb3f"
+sha256: "fef22c0e3528c18c5ae27055fb79fa1e6e9a1563d18534753018b7c570227755"
 signature: ""
 
 bytecode_sha256: ""

support-status.json

@@ -464,28 +464,7 @@
     },
     {
       "catalog_source": true,
-      "catalog_version": "1.0.3",
-      "driver_id": "esphome-dsmr",
-      "targets": {
-        "blixt-l1": {
-          "hil": "not_recorded",
-          "historical_signed_beta_version": null,
-          "legacy_parity": "not_assessed",
-          "note": "",
-          "target_conformance": "not_assessed"
-        },
-        "ftw-core": {
-          "hil": "not_recorded",
-          "historical_signed_beta_version": null,
-          "legacy_parity": "not_assessed",
-          "note": "",
-          "target_conformance": "not_assessed"
-        }
-      }
-    },
-    {
-      "catalog_source": true,
-      "catalog_version": "1.0.5",
+      "catalog_version": "1.0.6",
       "driver_id": "esphome_dsmr",
       "targets": {
         "blixt-l1": {