tuning palnneru

backend/services/control/inverter.py

@@ -25,7 +25,6 @@ from services.control.deye_helpers import (
     _DEYE_INACTIVE_TOU_REGISTERS,
     _deye_should_skip_time_sync_after_read,
     _prague_minute_start_utc,
-    battery_watts_to_amps,
     current_slot_hhmm,
     next_slot_hhmm,
 )
@@ -44,7 +43,7 @@ from services.control.setpoints import (
     _deye_tou_min_soc_pct,
     _deye_tou_params,
     _deye_tou_reserve_soc_pct,
-    _deye_zero_export_amps_for_passive,
+    deye_battery_charge_discharge_amps,
     get_deye_mode,
 )
 from services.modbus_client import get_modbus_client
@@ -78,25 +77,15 @@ async def write_inverter_setpoints(
         deye_mode = get_deye_mode(setpoints_now)
 
         bat_w = int(raw_bat) if raw_bat is not None else 0
-        if setpoints_now.lock_battery:
-            charge_a = 0
-            discharge_a = 0
-        elif deye_mode == "CHARGE":
-            charge_a = battery_watts_to_amps(bat_w, inv.max_charge_a)
-            discharge_a = 0
-        elif deye_mode == "SELL":
-            charge_a = 0
-            discharge_a = int(inv.max_discharge_a)
-        elif setpoints_now.self_sustain_local_use:
-            charge_a = int(inv.max_charge_a)
-            discharge_a = int(inv.max_discharge_a)
-        else:
-            charge_a, discharge_a = _deye_zero_export_amps_for_passive(
-                grid_w,
-                bat_w,
-                int(inv.max_charge_a),
-                int(inv.max_discharge_a),
-            )
+        charge_a, discharge_a = deye_battery_charge_discharge_amps(
+            lock_battery=setpoints_now.lock_battery,
+            deye_mode=deye_mode,
+            self_sustain_local_use=setpoints_now.self_sustain_local_use,
+            bat_w=bat_w,
+            grid_w=grid_w,
+            max_charge_a=int(inv.max_charge_a),
+            max_discharge_a=int(inv.max_discharge_a),
+        )
 
         zero_exp_mode = int(inv.deye_zero_export_mode or 1)
         selling_mode = 0 if deye_mode == "SELL" else zero_exp_mode