Skip to content

Fix #1552: Publish ActiveSocLimit in KeepCharged state #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drurew wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #1552: Publish ActiveSocLimit in KeepCharged state #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ecec14
Fix #1590: Publish 0 for ConsumptionOnInput when no AC loads present
drurew Feb 15, 2026
3b3cff3
Fix #1552: Publish ActiveSocLimit in KeepCharged state
drurew Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dbus_systemcalc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,10 +1051,12 @@ def _updatevalues(self):
if has_ac_in_system:
newvalues[_AC_PATHS[(phase, 'cons_in_p')]] = consumption[phase]
newvalues[_AC_PATHS[(phase, 'cons_in_i')]] = currentconsumption[phase]

self._compute_number_of_phases('/Ac/Consumption', newvalues)
self._compute_number_of_phases('/Ac/ConsumptionOnOutput', newvalues)
else:
newvalues[_AC_PATHS[(phase, 'cons_in_p')]] = 0
newvalues[_AC_PATHS[(phase, 'cons_in_i')]] = 0
self._compute_number_of_phases('/Ac/ConsumptionOnInput', newvalues)
self._compute_number_of_phases('/Ac/ConsumptionOnOutput', newvalues)
self._compute_number_of_phases('/Ac/Consumption', newvalues)

for m in self._modules:
m.update_values(newvalues)
Expand Down
2 changes: 1 addition & 1 deletion delegates/batterylife.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def update_values(self, newvalues):
elif newstate > State.KeepCharged:
self._dbusservice['/Control/ActiveSocLimit'] = self.minsoclimit
else:
self._dbusservice['/Control/ActiveSocLimit'] = None
self._dbusservice['/Control/ActiveSocLimit'] = self.minsoclimit

def _on_timer(self):
now = self._get_time()
Expand Down
4 changes: 2 additions & 2 deletions tests/systemcalc_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,8 +1559,8 @@ def test_no_input_acloads_in_system(self):
'/Ac/Consumption/L1/Current': 5.1 - 0.6 + 0.4,
'/Ac/ConsumptionOnOutput/L1/Power': 100,
'/Ac/ConsumptionOnOutput/L1/Current': 0.4,
'/Ac/ConsumptionOnInput/L1/Power': None,
'/Ac/ConsumptionOnInput/L1/Current': None
'/Ac/ConsumptionOnInput/L1/Power': 0,
'/Ac/ConsumptionOnInput/L1/Current': 0
})

def test_battery_capacity(self):
Expand Down