Fritz: make unit 1-based (BC) (#29741)

meter/fritz/smarthome/smarthome.go

@@ -88,10 +88,10 @@ func (c *Connection) resolveUnitUID(unit int) (string, error) {
 		if d.AIN != c.AIN {
 			continue
 		}
-		if len(d.UnitUids) < unit+1 {
+		if len(d.UnitUids) < unit {
 			return "", fmt.Errorf("invalid unit %d, got %v", unit, d.UnitUids)
 		}
-		return d.UnitUids[unit], nil
+		return d.UnitUids[unit-1], nil
 	}
 
 	return "", fmt.Errorf("ain not found: %s", c.AIN)

meter/fritzdect.go

@@ -18,7 +18,10 @@ func init() {
 
 // NewFritzDECTFromConfig creates a fritzdect meter from generic config
 func NewFritzDECTFromConfig(other map[string]any) (api.Meter, error) {
-	var cc fritz.Settings
+	cc := fritz.Settings{
+		Unit: 1,
+	}
+
 	if err := util.DecodeOther(other, &cc); err != nil {
 		return nil, err
 	}

templates/definition/charger/fritzdect.yaml

@@ -39,6 +39,7 @@ params:
   - name: unit
     advanced: true
     type: int
+    default: 1
     description:
       de: Einheit
       en: Unit

templates/definition/meter/fritzdect.yaml

@@ -40,6 +40,7 @@ params:
   - name: unit
     advanced: true
     type: int
+    default: 1
     description:
       de: Einheit
       en: Unit

templates/definition/meter/fritzgrid.yaml

@@ -18,6 +18,7 @@ params:
   - name: unit
     advanced: true
     type: int
+    default: 1
     description:
       de: Einheit
       en: Unit