Merge pull request #12 from atbore-phx/fix/capacity-reserve

fix(schedule): fixing ratio of charge when reserve is not full
atbore-phx · Mar 5, 2024 · 010ca1e · 010ca1e
2 parents 31cfc7a + 1d2a5d4
commit 010ca1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/fronius/fronius_test.go b/pkg/fronius/fronius_test.go
@@ -297,7 +297,7 @@ func TestBatteryChargeError3(t *testing.T) {
 	setup()
 
 	result, err := fronius.SetFroniusChargeBatteryMode(1000, 11000, -11000, 9000, 3500, 0, "00:00", "23:59", modbus_ip, modbus_port)
-	assert.Equal(int16(-31), result, "SetFroniusChargeBatteryMode returned wrong value")
+	assert.Equal(int16(-200), result, "SetFroniusChargeBatteryMode returned wrong value")
 	assert.Error(err)
 
 	teardown()

diff --git a/pkg/fronius/schedule.go b/pkg/fronius/schedule.go
@@ -25,7 +25,8 @@ func SetFroniusChargeBatteryMode(pw_forecast float64, pw_batt2charge float64, pw
 	case pw_batt2charge == 0: // battery 100% => do not charge
 		u.Log.Info("Battery is full charged")
 	case pw_batt < pw_batt_reserve: // battery is less than reserve => charge
-		ch_pc = SetChargePower(pw_batt_max, pw_batt_reserve, max_charge)
+		u.Log.Infof("battery %f W < reserve %f W", pw_batt, pw_batt_reserve)
+		ch_pc = SetChargePower(pw_batt_max, pw_batt_reserve-pw_batt, max_charge)
 	default:
 		pw_grid, charge_enabled := ChargeBattery(pw_pv_net, pw_batt)
 		if charge_enabled {