Skip to content

Commit

Permalink
DVCC: switch off inverters when DCL=0
Browse files Browse the repository at this point in the history 
When you receive DCL=0, switch off inverters by setting /Mode=4.
When manual switch is used, the inverter disappears from dbus.
Hence we cannot accidentally turn an inverter on that was manually
off.

For Inverter-RS, simply copy DischargeCurrent across. Firmware already switches off.

victronenergy/venus#736
  • Loading branch information
@izak
izak committed Jun 4, 2021
1 parent 0f6af8a commit d47c0e3
Show file tree
Hide file tree
Showing 2 changed files with 187 additions and 12 deletions.
115 changes: 103 additions & 12 deletions delegates/dvcc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,87 @@ def update_values(self):
if v is not None:
self._smoothed_current += (v - self._smoothed_current) * self.OMEGA

class Inverter(SolarCharger):
""" Encapsulates an inverter object, currently the inverter RS, which has a solar
input and can charge the battery like a solar charger. """
class Inverter(object):
""" Encapsulates an inverter object. """
def __init__(self, monitor, service):
self.monitor = monitor
self.service = service

@property
def mode(self):
return self.monitor.get_value(self.service, '/Mode')

@mode.setter
def mode(self, m):
self.monitor.set_value(self.service, '/Mode', m)

def set_maxdischargecurrent(self, limit):
""" For plain inverters, a limit of zero turns it off, and a non-zero
limit turns it back on. """
m = 2 if limit > 0 else 4 # 2 == invert-only, 4 == off
if self.mode != m:
self.mode = m

class InverterCharger(SolarCharger, Inverter):
""" Encapsulates an inverter/charger object, currently the inverter RS,
which has a solar input and can charge the battery like a solar
charger, but is also an inverter.
"""
def __init__(self, monitor, service):
super(InverterCharger, self).__init__(monitor, service)

@property
def has_externalcontrol_support(self):
# Inverter RS always had support
return True

@property
def maxdischargecurrent(self):
""" Returns discharge current setting. This does nothing except
return the previously set value. """
return self.monitor.get_value(self.service, '/Link/DischargeCurrent')

@maxdischargecurrent.setter
def maxdischargecurrent(self, limit):
self.monitor.set_value(self.service, '/Link/DischargeCurrent', limit)

def set_maxdischargecurrent(self, limit):
""" Write the maximum discharge limit across. The firmware
already handles a zero by turning off. """
if self.maxdischargecurrent != limit:
self.maxdischargecurrent = limit

class InverterSubsystem(object):
""" Encapsulate collection of inverters. """
def __init__(self, monitor):
self.monitor = monitor
self._inverters = {}

def _add_inverter(self, ob):
self._inverters[ob.service] = ob
return ob

def add_inverter(self, service):
return self._add_inverter(Inverter(self.monitor, service))

def remove_inverter(self, service):
del self._inverters[service]

def __iter__(self):
return self._inverters.itervalues()

def __len__(self):
return len(self._inverters)

def __contains__(self, k):
return k in self._inverters

def set_maxdischargecurrent(self, limit):
# Inverters only care about limit=0, so simply send
# it to all.
for inverter in self:
inverter.set_maxdischargecurrent(limit)

class SolarChargerSubsystem(object):
""" Encapsulates a collection of solar chargers that collectively make up
a charging system (sans Multi). Properties related to the whole
Expand All @@ -268,8 +340,8 @@ def add_charger(self, service):
self._solarchargers[service] = charger = SolarCharger(self.monitor, service)
return charger

def add_inverter(self, service):
self._solarchargers[service] = inverter = Inverter(self.monitor, service)
def add_invertercharger(self, service):
self._solarchargers[service] = inverter = InverterCharger(self.monitor, service)
return inverter

def remove_charger(self, service):
Expand Down Expand Up @@ -684,7 +756,9 @@ def get_input(self):
'/Link/NetworkMode',
'/Link/ChargeVoltage',
'/Link/ChargeCurrent',
'/Link/DischargeCurrent',
'/Settings/ChargeCurrentLimit',
'/Mode',
'/State',
'/N2kDeviceInstance',
'/Mgmt/Connection']),
Expand All @@ -706,6 +780,7 @@ def set_sources(self, dbusmonitor, settings, dbusservice):
SystemCalcDelegate.set_sources(self, dbusmonitor, settings, dbusservice)
self._batterysystem = BatterySubsystem(dbusmonitor)
self._solarsystem = SolarChargerSubsystem(dbusmonitor)
self._inverters = InverterSubsystem(dbusmonitor)
self._multi = Multi(dbusmonitor, dbusservice)

self._dbusservice.add_path('/Control/SolarChargeVoltage', value=0)
Expand All @@ -724,8 +799,15 @@ def device_added(self, service, instance, do_service_change=True):
service_type = service.split('.')[2]
if service_type == 'solarcharger':
self._solarsystem.add_charger(service)
elif service_type == 'inverter' and self._dbusmonitor.get_value(service, '/IsInverterCharger') == 1:
self._solarsystem.add_inverter(service)
elif service_type == 'inverter':
if self._dbusmonitor.get_value(service, '/IsInverterCharger') == 1:
# Add to both the solarcharger and inverter collections.
# add_invertercharger returns an object that can be directly
# added to the inverter collection.
self._inverters._add_inverter(
self._solarsystem.add_invertercharger(service))
else:
self._inverters.add_inverter(service)
elif service_type == 'vecan':
self._vecan_services.append(service)
elif service_type == 'battery':
Expand All @@ -739,10 +821,15 @@ def device_added(self, service, instance, do_service_change=True):
def device_removed(self, service, instance):
if service in self._solarsystem:
self._solarsystem.remove_charger(service)
# Some solar chargers are inside an inverter
if service in self._inverters:
self._inverters.remove_inverter(service)
elif service in self._vecan_services:
self._vecan_services.remove(service)
elif service in self._batterysystem:
self._batterysystem.remove_battery(service)
elif service in self._inverters:
self._inverters.remove_inverter(service)
if len(self._solarsystem) == 0 and len(self._vecan_services) == 0 and \
len(self._batterysystem) == 0 and self._timer is not None:
gobject.source_remove(self._timer)
Expand Down Expand Up @@ -930,9 +1017,8 @@ def _adjust_battery_operational_limits(self, bms_service, feedback_allowed):

def _update_battery_operational_limits(self, bms_service, cv, mcc):
""" This function writes the bms parameters across to the Multi
if it exists. The parameters may be modified before being
copied across. The modified current value is returned to be
used elsewhere. """
if it exists. Also communicate DCL=0 to inverters. """
written = 0
if self._multi.active:
if cv is not None:
self._multi.bol.chargevoltage = cv
Expand All @@ -943,9 +1029,14 @@ def _update_battery_operational_limits(self, bms_service, cv, mcc):
# Copy the rest unmodified
self._multi.bol.maxdischargecurrent = bms_service.maxdischargecurrent
self._multi.bol.batterylowvoltage = bms_service.batterylowvoltage
return 1
written = 1

# Also control inverters if BMS stops discharge
if len(self._inverters):
self._inverters.set_maxdischargecurrent(bms_service.maxdischargecurrent)
written = 1

return 0
return written

@property
def feedback_allowed(self):
Expand Down
84 changes: 84 additions & 0 deletions tests/hub_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,7 @@ def test_inverter_rs_remote_control(self):
'/Link/NetworkMode': 0,
'/Link/ChargeVoltage': None,
'/Link/ChargeCurrent': None,
'/Link/DischargeCurrent': None,
'/Settings/ChargeCurrentLimit': 100},
product_name='Inverter RS', connection='VE.Direct')

Expand Down Expand Up @@ -1663,6 +1664,7 @@ def test_inverter_rs_remote_control_2(self):
'/Link/NetworkMode': 0,
'/Link/ChargeVoltage': None,
'/Link/ChargeCurrent': None,
'/Link/DischargeCurrent': None,
'/Settings/ChargeCurrentLimit': 100},
product_name='Inverter RS', connection='VE.Direct')

Expand Down Expand Up @@ -1792,3 +1794,85 @@ def test_quirk_lynx_smart_bms(self):
'/Link/ChargeCurrent': 0, # Shut down
}
})

def test_inverter_rs_discharge_current(self):
# Add inverter
self._add_device('com.victronenergy.inverter.ttyO1', {
'/Ac/Out/L1/P': 2000,
'/Ac/Out/L1/V': 234.2,
'/Dc/0/Voltage': 53.1,
'/Dc/0/Current': 40.0,
'/DeviceInstance': 278,
'/Soc': 53.2,
'/State': 9,
'/IsInverterCharger': 1,
'/Link/NetworkMode': 0,
'/Link/ChargeVoltage': None,
'/Link/ChargeCurrent': None,
'/Link/DischargeCurrent': None,
'/Settings/ChargeCurrentLimit': 100},
product_name='Inverter RS', connection='VE.Direct')

# Battery
self._add_device('com.victronenergy.battery.ttyO2',
product_name='battery',
values={
'/Dc/0/Voltage': 53.2,
'/Dc/0/Current': 80.0,
'/Dc/0/Power': 4000,
'/Soc': 43.2,
'/DeviceInstance': 512,
'/Info/BatteryLowVoltage': 47,
'/Info/MaxChargeCurrent': 100,
'/Info/MaxChargeVoltage': 58.2,
'/Info/MaxDischargeCurrent': 0})

self._update_values(interval=3000)

self._check_external_values({
'com.victronenergy.inverter.ttyO1': {
'/Link/DischargeCurrent': 0.0}})

def test_inverter_switchoff_bms(self):
# Add inverter
self._add_device('com.victronenergy.inverter.ttyO1', {
'/Ac/Out/L1/P': 2000,
'/Ac/Out/L1/V': 234.2,
'/Dc/0/Voltage': 53.1,
'/Dc/0/Current': 40.0,
'/DeviceInstance': 278,
'/Soc': 53.2,
'/State': 9,
'/Mode': 2, # InvertOnly
'/IsInverterCharger': 0, # Dumb inverter
'/Link/NetworkMode': 0,
'/Link/ChargeVoltage': None,
'/Link/ChargeCurrent': None,
'/Link/DischargeCurrent': None,
'/Settings/ChargeCurrentLimit': 100},
product_name='Inverter RS', connection='VE.Direct')

# Battery
self._add_device('com.victronenergy.battery.ttyO2',
product_name='battery',
values={
'/Dc/0/Voltage': 53.2,
'/Dc/0/Current': 80.0,
'/Dc/0/Power': 4000,
'/Soc': 43.2,
'/DeviceInstance': 512,
'/Info/BatteryLowVoltage': 47,
'/Info/MaxChargeCurrent': 100,
'/Info/MaxChargeVoltage': 58.2,
'/Info/MaxDischargeCurrent': 0.0})

self._update_values(interval=3000)
self._check_external_values({
'com.victronenergy.inverter.ttyO1': {
'/Mode': 4}}) # OFF

self._monitor.set_value('com.victronenergy.battery.ttyO2', '/Info/MaxDischargeCurrent', 100.0)
self._update_values(interval=3000)
self._check_external_values({
'com.victronenergy.inverter.ttyO1': {
'/Mode': 2}}) # InvertOnly

0 comments on commit d47c0e3

Please sign in to comment.