annotate eprodbus.py @ 28:ea07d14075e6 default tip

Remove superfluous statement.
author Daniel O'Connor <darius@dons.net.au>
date Tue, 21 Dec 2021 15:06:13 +1030
parents 64d0d5aaf329
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
1 #!/usr/bin/env python
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
2
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
3 # Read enerdrive ePro packets from serial port and update DBus with them
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
4 # Also logs to an sqlite3 DB every 60 seconds
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
5
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
6 import datetime
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
7 from dbus.mainloop.glib import DBusGMainLoop
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
8 import epro
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
9 import gobject
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
10 import logging
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
11 import os
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
12 import serial
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
13 import signal
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
14 import sqlite3
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
15 import sys
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
16
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
17 sys.path.insert(1, os.path.join(os.path.dirname(__file__), 'velib_python'))
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
18 from vedbus import VeDbusService
21
625064987b7c Wrap gobject callbacks in exit_on_error to make more robust
Daniel O'Connor <darius@dons.net.au>
parents: 20
diff changeset
19 from ve_utils import exit_on_error
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
20
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
21 logger = logging.getLogger('eprodbus')
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
22 logger.setLevel(logging.INFO)
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
23
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
24 formatter = logging.Formatter('%(asctime)s - %(message)s')
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
25
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
26 ch = logging.StreamHandler()
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
27 ch.setFormatter(formatter)
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
28
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
29 logger.addHandler(ch)
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
30
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
31 logger.info(__file__ + " is starting up")
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
32
16
3338e666256b Move DB path to top of the file with the other knobs.
Daniel O'Connor <darius@dons.net.au>
parents: 15
diff changeset
33 dbpath = '/home/root/vanlogger/log.db'
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
34 instance = 0
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
35
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
36 class eProUpdater:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
37 def __init__(self, dbusservice, s, dbh):
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
38 self.log_queue = []
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
39 self.dbusservice = dbusservice
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
40 self.p = epro.Processor()
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
41 self.s = s
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
42 self.dbh = dbh
21
625064987b7c Wrap gobject callbacks in exit_on_error to make more robust
Daniel O'Connor <darius@dons.net.au>
parents: 20
diff changeset
43 gobject.io_add_watch(s.fileno(), gobject.IO_IN, lambda fd, userdata: exit_on_error(self.read_serial, fd, userdata))
625064987b7c Wrap gobject callbacks in exit_on_error to make more robust
Daniel O'Connor <darius@dons.net.au>
parents: 20
diff changeset
44 gobject.timeout_add(60000, exit_on_error, self.log_epro)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
45
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
46 def read_serial(self, fd, userdata):
22
02ba26698696 Change to run as a service by serial-starter.
Daniel O'Connor <darius@dons.net.au>
parents: 21
diff changeset
47 data = self.s.read(1024)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
48
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
49 logger.debug('Read %d bytes from serial port', len(data))
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
50 self.p.process(data)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
51
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
52 while len(self.p.packets) > 0:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
53 # Process oldest packets first
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
54 p = self.p.packets.pop(0)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
55 self.log_queue.append(p)
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
56 logger.debug('%s', str(p))
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
57 if type(p) == epro.StateOfCharge:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
58 self.dbusservice['/Soc'] = p.soc
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
59 elif type(p) == epro.MainVoltage:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
60 self.dbusservice['/Dc/0/Voltage'] = p.volts
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
61 elif type(p) == epro.BatteryCurrent:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
62 self.dbusservice['/Dc/0/Current'] = p.amps
19
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
63 elif type(p) == epro.BatteryTemperature:
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
64 self.dbusservice['/Dc/0/Temperature'] = p.temp
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
65 elif type(p) == epro.AmpHours:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
66 self.dbusservice['/ConsumedAmphours'] = p.amphrs
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
67 elif type(p) == epro.TimeRemaining:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
68 # ePro reports in minutes, Venus expects seconds
25
64d0d5aaf329 Report time remaining as None when charging, the value is apparently meaningless then.
Daniel O'Connor <darius@dons.net.au>
parents: 22
diff changeset
69 if p.time >= 0:
64d0d5aaf329 Report time remaining as None when charging, the value is apparently meaningless then.
Daniel O'Connor <darius@dons.net.au>
parents: 22
diff changeset
70 self.dbusservice['/TimeToGo'] = p.time * 60
64d0d5aaf329 Report time remaining as None when charging, the value is apparently meaningless then.
Daniel O'Connor <darius@dons.net.au>
parents: 22
diff changeset
71 else:
64d0d5aaf329 Report time remaining as None when charging, the value is apparently meaningless then.
Daniel O'Connor <darius@dons.net.au>
parents: 22
diff changeset
72 # Battery is charging
64d0d5aaf329 Report time remaining as None when charging, the value is apparently meaningless then.
Daniel O'Connor <darius@dons.net.au>
parents: 22
diff changeset
73 self.dbusservice['/TimeToGo'] = None
19
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
74 elif type(p) == epro.AuxVoltage:
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
75 self.dbusservice['/Dc/1/Voltage'] = p.volts
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
76 elif type(p) == epro.MonitorStatus:
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
77 self.dbusservice['/Alarms/LowVoltage'] = 2 if p.mainlv else 0
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
78 self.dbusservice['/Alarms/HighVoltage'] = 2 if p.mainhv else 0
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
79 self.dbusservice['/Alarms/LowStarterVoltage'] = 2 if p.auxlv else 0
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
80 self.dbusservice['/Alarms/HighStarterVoltage'] = 2 if p.auxhv else 0
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
81 self.dbusservice['/Alarms/LowSoc'] = 2 if p.batflat else 0
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
82 self.dbusservice['/Settings/HasTemperature'] = 1 if p.tempsense else 0
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
83 return True
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
84
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
85 def log_epro(self):
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
86 logger.debug('Logging epro data')
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
87 # Check we have all the packets we need in the queue
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
88 msgtypes = set([x.msgtype for x in self.log_queue])
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
89 wantedtypes = set([
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
90 epro.MainVoltage.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
91 epro.AmpHours.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
92 epro.BatteryCurrent.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
93 epro.StateOfCharge.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
94 epro.TimeRemaining.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
95 epro.BatteryTemperature.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
96 epro.MonitorStatus.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
97 epro.AuxVoltage.MSGTYPE,
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
98 ])
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
99 if msgtypes < wantedtypes:
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
100 logger.debug('Didn\'t get all packet types required to log')
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
101 return
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
102
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
103 row = {}
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
104 usedtypes = set()
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
105 while len(self.log_queue) > 0:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
106 pkt = self.log_queue.pop() # Read latest packets first
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
107 if pkt.msgtype == epro.MainVoltage.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
108 row['main_voltage'] = pkt.volts
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
109 elif pkt.msgtype == epro.AmpHours.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
110 row['amp_hours'] = pkt.amphrs
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
111 elif pkt.msgtype == epro.BatteryCurrent.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
112 row['battery_curr'] = pkt.amps
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
113 elif pkt.msgtype == epro.StateOfCharge.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
114 row['state_of_charge'] = pkt.soc
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
115 elif pkt.msgtype == epro.TimeRemaining.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
116 row['time_remaining'] = pkt.time
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
117 elif pkt.msgtype == epro.BatteryTemperature.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
118 row['battery_temp'] = pkt.temp
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
119 elif pkt.msgtype == epro.MonitorStatus.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
120 row['auto_sync_volts'] = pkt.autosyncvolt
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
121 row['auto_sync_curr'] = pkt.autosyncamp
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
122 row['e501'] = pkt.e501compat
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
123 row['alarm_test'] = pkt.alarmtst
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
124 row['light'] = pkt.backlight
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
125 row['display_test'] = pkt.disptst
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
126 row['temp_sensor'] = pkt.tempsense
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
127 row['aux_hv'] = pkt.auxhv
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
128 row['aux_lv'] = pkt.auxlv
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
129 row['installer_lock'] = pkt.lock
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
130 row['main_hv'] = pkt.mainhv
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
131 row['main_lv'] = pkt.mainlv
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
132 row['low_battery'] = pkt.lowbatalarm
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
133 row['battery_flat'] = pkt.batflat
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
134 row['battery_full'] = pkt.batfull
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
135 row['battery_charged'] = pkt.charged
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
136 row['no_sync'] = pkt.nosync
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
137 row['monitor_reset'] = pkt.monreset
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
138 elif pkt.msgtype == epro.AuxVoltage.MSGTYPE:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
139 row['aux_voltage'] = pkt.volts
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
140
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
141 usedtypes.add(pkt.msgtype)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
142 if usedtypes >= wantedtypes:
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
143 self.log_queue = []
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
144 break
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
145
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
146 logger.info('Got all packets, logging')
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
147 cur = self.dbh.cursor()
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
148 row['tstamp'] = int(datetime.datetime.now().strftime('%s'))
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
149 cur.execute('INSERT INTO eprolog VALUES (:tstamp, :main_voltage, :aux_voltage, :battery_curr, :amp_hours, :state_of_charge, :time_remaining, :battery_temp, :auto_sync_volts, :auto_sync_curr, :e501, :alarm_test, :light, :display_test, :temp_sensor, :aux_hv, :aux_lv, :installer_lock, :main_hv, :main_lv, :low_battery, :battery_flat, :battery_full, :battery_charged, :no_sync, :monitor_reset)', row)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
150 self.dbh.commit()
18
9c2e08444598 Make sure timer is called more than once.
Daniel O'Connor <darius@dons.net.au>
parents: 17
diff changeset
151 return True
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
152
17
3067bb98b482 Fix signal handling by using the correct function signature.
Daniel O'Connor <darius@dons.net.au>
parents: 16
diff changeset
153 def doexit(signum, frame):
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
154 sys.exit(1)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
155
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
156 def main():
22
02ba26698696 Change to run as a service by serial-starter.
Daniel O'Connor <darius@dons.net.au>
parents: 21
diff changeset
157 port = sys.argv[1]
02ba26698696 Change to run as a service by serial-starter.
Daniel O'Connor <darius@dons.net.au>
parents: 21
diff changeset
158 servicename = 'com.victronenergy.battery.' + port
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
159 # Add signal handler to exit, otherwise we have to press ctrl-c twice to quit
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
160 signal.signal(signal.SIGINT, doexit)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
161
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
162 DBusGMainLoop(set_as_default = True)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
163
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
164 dbusservice = VeDbusService(servicename)
20
8d48ca5294d3 Use add_mandatory_paths rather than rolling our own.
Daniel O'Connor <darius@dons.net.au>
parents: 19
diff changeset
165 dbusservice.add_mandatory_paths(__file__, '1.0', 'Serial ' + port, instance, 0, 'Enerdrive ePro', '1.0', '1.0', 1)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
166 dbusservice.add_path('/Dc/0/Voltage', value = None)
19
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
167 dbusservice.add_path('/Dc/0/Temperature', value = None)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
168 dbusservice.add_path('/Dc/0/Current', value = None)
19
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
169 dbusservice.add_path('/Dc/1/Voltage', value = None)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
170 dbusservice.add_path('/Soc', value = None)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
171 dbusservice.add_path('/TimeToGo', value = None)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
172 dbusservice.add_path('/ConsumedAmphours', value = None)
19
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
173 dbusservice.add_path('/Alarms/LowVoltage', value = 0)
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
174 dbusservice.add_path('/Alarms/HighVoltage', value = 0)
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
175 dbusservice.add_path('/Alarms/LowStarterVoltage', value = 0)
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
176 dbusservice.add_path('/Alarms/HighStarterVoltage', value = 0)
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
177 dbusservice.add_path('/Alarms/LowSoc', value = 0)
3a3dba401b4a Hook up more stuff..
Daniel O'Connor <darius@dons.net.au>
parents: 18
diff changeset
178 dbusservice.add_path('/Settings/HasTemperature', value = 0)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
179
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
180 s = serial.Serial('/dev/' + port, 2400, parity = 'E')
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
181 s.timeout = 0.1
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
182
16
3338e666256b Move DB path to top of the file with the other knobs.
Daniel O'Connor <darius@dons.net.au>
parents: 15
diff changeset
183 dbh = sqlite3.connect(dbpath)
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
184
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
185 updater = eProUpdater(dbusservice, s, dbh)
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
186
15
08b61687b75f Use logger better
Daniel O'Connor <darius@dons.net.au>
parents: 9
diff changeset
187 logger.info('Starting main loop')
9
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
188 mainloop = gobject.MainLoop()
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
189 mainloop.run()
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
190
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
191 if __name__ == '__main__':
446cfe74827b Add program to report epro status to DBus for Venus tools.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
192 main()