fix: Number platform - missing offset

davidrapan · Sep 26, 2024 · c0a3636 · c0a3636
1 parent 72c0639
commit c0a3636
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 9 deletions.
diff --git a/custom_components/solarman/inverter_definitions/deye_2mppt.yaml b/custom_components/solarman/inverter_definitions/deye_2mppt.yaml
@@ -333,7 +333,7 @@ parameters:
 
   - group: Settings
     items:
-      - name: "Start-up Self-checking Time"
+      - name: "Self-check time"
         platform: number
         uom: "s"
         rule: 1
@@ -388,6 +388,7 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
@@ -403,11 +404,42 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
 
-      - name: "Over-Frequency Load Reduction Starting Point"
+      - name: "Starting Voltage Upper Limit"
+        platform: number
+        class: "voltage"
+        state_class: "measurement"
+        uom: "V"
+        scale: 0.1
+        rule: 1
+        registers: [0x0020]
+        configurable:
+          min: 700
+          max: 900
+        range:
+          min: 7000
+          max: 9000
+
+      - name: "Starting Voltage Lower Limit"
+        platform: number
+        class: "voltage"
+        state_class: "measurement"
+        uom: "V"
+        scale: 0.1
+        rule: 1
+        registers: [0x0021]
+        configurable:
+          min: 700
+          max: 900
+        range:
+          min: 7000
+          max: 9000
+
+      - name: "Over-Frequency Load Reduction Start"
         platform: number
         class: "frequency"
         state_class: "measurement"
@@ -418,11 +450,12 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
 
-      - name: "Over-Frequency Load Reduction Percentage"
+      - name: "Over-Frequency Load Reduction"
         platform: number
         state_class: "measurement"
         uom: "%"
@@ -439,6 +472,10 @@ parameters:
         offset: 1000
         rule: 1
         registers: [0x0027]
+        configurable:
+          min: -1
+          max: 1
+          step: 0.001
         range:
           min: 0
           max: 2000
@@ -496,7 +533,7 @@ parameters:
         registers: [0x0036]
         lookup:
           - key: 0
-            value: "Normal operation"
+            value: "Normal"
           - key: 1
             value: "Initialize the control board EEPROM"
           - key: 2

diff --git a/custom_components/solarman/inverter_definitions/deye_4mppt.yaml b/custom_components/solarman/inverter_definitions/deye_4mppt.yaml
@@ -452,7 +452,7 @@ parameters:
 
   - group: Settings
     items:
-      - name: "Start-up Self-checking Time"
+      - name: "Self-check time"
         platform: number
         uom: "s"
         rule: 1
@@ -507,6 +507,7 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
@@ -522,11 +523,42 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
 
-      - name: "Over-Frequency Load Reduction Starting Point"
+      - name: "Starting Voltage Upper Limit"
+        platform: number
+        class: "voltage"
+        state_class: "measurement"
+        uom: "V"
+        scale: 0.1
+        rule: 1
+        registers: [0x0020]
+        configurable:
+          min: 700
+          max: 900
+        range:
+          min: 7000
+          max: 9000
+
+      - name: "Starting Voltage Lower Limit"
+        platform: number
+        class: "voltage"
+        state_class: "measurement"
+        uom: "V"
+        scale: 0.1
+        rule: 1
+        registers: [0x0021]
+        configurable:
+          min: 700
+          max: 900
+        range:
+          min: 7000
+          max: 9000
+
+      - name: "Over-Frequency Load Reduction Start"
         platform: number
         class: "frequency"
         state_class: "measurement"
@@ -537,11 +569,12 @@ parameters:
         configurable:
           min: 45
           max: 65
+          step: 0.01
         range:
           min: 4500
           max: 6500
 
-      - name: "Over-Frequency Load Reduction Percentage"
+      - name: "Over-Frequency Load Reduction"
         platform: number
         state_class: "measurement"
         uom: "%"
@@ -558,6 +591,10 @@ parameters:
         offset: 1000
         rule: 1
         registers: [0x0027]
+        configurable:
+          min: -1
+          max: 1
+          step: 0.001
         range:
           min: 0
           max: 2000
@@ -615,7 +652,7 @@ parameters:
         registers: [0x0036]
         lookup:
           - key: 0
-            value: "Normal operation"
+            value: "Normal"
           - key: 1
             value: "Initialize the control board EEPROM"
           - key: 2

diff --git a/custom_components/solarman/number.py b/custom_components/solarman/number.py
@@ -42,10 +42,17 @@ def __init__(self, coordinator, sensor):
         SolarmanEntity.__init__(self, coordinator, _PLATFORM, sensor)
         self._attr_entity_category = EntityCategory.CONFIG
 
+        if "mode" in sensor and (mode := sensor["mode"]):
+            self._attr_mode = mode
+
         self.scale = None
         if "scale" in sensor:
             self.scale = get_number(sensor["scale"])
 
+        self.offset = None
+        if "offset" in sensor:
+            self.offset = get_number(sensor["offset"])
+
         registers = sensor["registers"]
         registers_length = len(registers)
         if registers_length > 0:
@@ -69,7 +76,10 @@ def __init__(self, coordinator, sensor):
 
     async def async_set_native_value(self, value: float) -> None:
         """Update the setting."""
-        if await self.coordinator.inverter.call(CODE.WRITE_MULTIPLE_HOLDING_REGISTERS, self.register, [int(value if self.scale is None else value / self.scale),], ACTION_ATTEMPTS_MAX) > 0:
+        value_int = int(value if self.scale is None else value / self.scale)
+        if self.offset is not None:
+            value_int += self.offset
+        if await self.coordinator.inverter.call(CODE.WRITE_MULTIPLE_HOLDING_REGISTERS, self.register, [value_int,], ACTION_ATTEMPTS_MAX) > 0:
             self.set_state(get_number(value))
             self.async_write_ha_state()
             #await self.entity_description.update_fn(self.coordinator., int(value))