Skip to content

Commit 600e87a

Browse files
committed
Revert "updated Readme and fixed path in install.sh"
This reverts commit fc1b56d.
1 parent fc1b56d commit 600e87a

2 files changed

Lines changed: 3 additions & 67 deletions

File tree

constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
DTUVARIANT_TEMPLATE = "template"
88
PRODUCTNAME = "henne49_dbus-opendtu"
99
CONNECTION = "TCP/IP (HTTP)"
10-
CONNECTION_TIMEOUT = 60
1110

1211

1312
VICTRON_PATHS = {

dbus_service.py

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ def fetch_url(self, url, try_number=1):
460460
# check for response
461461
if not json_str:
462462
logging.info("No Response from DTU")
463-
raise ConnectionError("No valid response from DTU - ", self.host)
463+
raise ConnectionError("No response from DTU - ", self.host)
464464

465465
json = None
466466
try:
@@ -537,7 +537,6 @@ def sign_of_life(self):
537537
logging.debug("Last inverter #%d _update() call: %s", self.pvinverternumber, self._last_update)
538538
logging.info("[%s] Last inverter #%d '/Ac/Power': %s", self._servicename,
539539
self.pvinverternumber, self._dbusservice["/Ac/Power"])
540-
#self.check_dbus_connectionproblem()
541540
return True
542541

543542
def update(self):
@@ -559,8 +558,7 @@ def update(self):
559558
Attributes:
560559
successful (bool): Indicates whether the update was successful.
561560
"""
562-
logging.debug("_update: last update: %s", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self._last_update)))
563-
561+
logging.debug("_update")
564562
successful = False
565563
try:
566564
# update data from DTU once per _update call:
@@ -571,23 +569,20 @@ def update(self):
571569
logging.info("DRY RUN. No data is sent!!")
572570
else:
573571
self.set_dbus_values()
574-
self._update_index()
572+
self._update_index()
575573
successful = True
576574
except requests.exceptions.RequestException as exception:
577575
if self.last_update_successful:
578576
logging.warning(f"HTTP Error at _update for inverter "
579577
f"{self.pvinverternumber} ({self._get_name()}): {str(exception)}")
580-
self.check_dbus_connectionproblem()
581578
except ValueError as error:
582579
if self.last_update_successful:
583580
logging.warning(f"Error at _update for inverter "
584581
f"{self.pvinverternumber} ({self._get_name()}): {str(error)}")
585-
self.check_dbus_connectionproblem()
586582
except Exception as error: # pylint: disable=broad-except
587583
if self.last_update_successful:
588584
logging.warning(f"Error at _update for inverter "
589585
f"{self.pvinverternumber} ({self._get_name()})", exc_info=error)
590-
self.check_dbus_connectionproblem()
591586
finally:
592587
if successful:
593588
if not self.last_update_successful:
@@ -694,8 +689,6 @@ def set_dbus_values(self):
694689
logging.debug(f"Inverter #{self.pvinverternumber} Current (/State): {state}")
695690
logging.debug("---")
696691
else:
697-
self._dbusservice["/StatusCode"] = 7 # 0=Startup 0; 1=Startup 1; 2=Startup 2; 3=Startup 3; 4=Startup 4; 5=Startup 5; 6=Startup 6; 7=Running; 8=Standby; 9=Boot loading; 10=Error
698-
699692
# three-phase inverter: split total power equally over all three phases
700693
if "3P" == self.pvinverterphase:
701694
powerthird = power/3
@@ -741,59 +734,3 @@ def set_dbus_values(self):
741734
logging.debug(f"Inverter #{self.pvinverternumber} Power (/Ac/Power): {power}")
742735
logging.debug(f"Inverter #{self.pvinverternumber} Energy (/Ac/Energy/Forward): {pvyield}")
743736
logging.debug("---")
744-
745-
def check_dbus_connectionproblem(self):
746-
'''zero power data and cleat connection status and set dbus values'''
747-
update_age = (time.time() - self._last_update)
748-
logging.debug("Last update %d s ago", update_age)
749-
750-
if (update_age > constants.CONNECTION_TIMEOUT ):
751-
# This will be refactored later in classes
752-
if self._servicename == "com.victronenergy.inverter":
753-
# see https://github.com/victronenergy/venus/wiki/dbus#inverter
754-
self._dbusservice["/Ac/Out/L1/V"] = 0
755-
self._dbusservice["/Ac/Out/L1/I"] = 0
756-
self._dbusservice["/Ac/Out/L1/P"] = 0
757-
self._dbusservice["/Dc/0/Voltage"] = 0
758-
self._dbusservice["/Ac/Power"] = 0
759-
760-
#self._dbusservice["/State"] = 2 # 2=Fault
761-
#self._dbusservice["/Mode"] = 2 # Switch position: 2=Inverter on; 4=Off; 5=Low Power/ECO
762-
763-
self._dbusservice["/Ac/L1/Current"] = 0
764-
self._dbusservice["/Ac/L1/Power"] = 0
765-
self._dbusservice["/Ac/L1/Voltage"] = 0
766-
767-
logging.debug(f"Inverter #{self.pvinverternumber} Voltage (/Ac/Out/L1/V): {voltage}")
768-
logging.debug(f"Inverter #{self.pvinverternumber} Current (/Ac/Out/L1/I): {current}")
769-
770-
logging.debug(f"Inverter #{self.pvinverternumber} Current (/Dc/0/Voltage): {dc_voltage}")
771-
logging.debug(f"Inverter #{self.pvinverternumber} Voltage (/Ac/Power): {power}")
772-
logging.debug(f"Inverter #{self.pvinverternumber} Current (/State): {state}")
773-
logging.debug("---")
774-
else:
775-
self._dbusservice["/StatusCode"] = 10 # 0=Startup 0; 1=Startup 1; 2=Startup 2; 3=Startup 3; 4=Startup 4; 5=Startup 5; 6=Startup 6; 7=Running; 8=Standby; 9=Boot loading; 10=Error
776-
777-
# three-phase inverter: split total power equally over all three phases
778-
if "3P" == self.pvinverterphase:
779-
780-
self._dbusservice["/Ac/L1/Voltage"] = 0
781-
self._dbusservice["/Ac/L1/Current"] = 0
782-
self._dbusservice["/Ac/L1/Power"] = 0
783-
self._dbusservice["/Ac/L2/Voltage"] = 0
784-
self._dbusservice["/Ac/L2/Current"] = 0
785-
self._dbusservice["/Ac/L2/Power"] = 0
786-
self._dbusservice["/Ac/L3/Voltage"] = 0
787-
self._dbusservice["/Ac/L3/Current"] = 0
788-
self._dbusservice["/Ac/L3/Power"] = 0
789-
self._dbusservice["/Ac/Power"] = 0
790-
791-
else:
792-
pre = "/Ac/" + self.pvinverterphase
793-
self._dbusservice[pre + "/Voltage"] = 0
794-
self._dbusservice[pre + "/Current"] = 0
795-
self._dbusservice[pre + "/Power"] = 0
796-
self._dbusservice["/Ac/Power"] = 0
797-
798-
logging.debug(f"Inverter #{self.pvinverternumber} Power (/Ac/Power): 0")
799-
logging.debug("---")

0 commit comments

Comments
 (0)