epro: eprodbus.py annotate

annotate eprodbus.py @ 18:9c2e08444598

Make sure timer is called more than once. Not sure how this worked earlier..

author	Daniel O'Connor <darius@dons.net.au>
date	Mon, 06 Dec 2021 12:07:30 +1030
parents	3067bb98b482
children	3a3dba401b4a

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
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	19
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	20 logger = logging.getLogger('eprodbus')
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	21 logger.setLevel(logging.INFO)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	22
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	23 formatter = logging.Formatter('%(asctime)s - %(message)s')
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	24
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	25 #fh = logging.FileHandler('/var/log/eprodbus.log')
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	26 #fh.setLevel(logging.DEBUG)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	27 #fh.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 ch = logging.StreamHandler()
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	30 ch.setLevel(logging.INFO)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	31 ch.setFormatter(formatter)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	32
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	33 #logger.addHandler(fh)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	34 logger.addHandler(ch)
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	35
08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	36 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	37
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	38 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	39 port = 'ttyepro'
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	40 servicename = 'com.victronenergy.battery.' + port
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	41 instance = 0
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	42
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	43 class eProUpdater:
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	44 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	45 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	46 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	47 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	48 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	49 self.dbh = dbh
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	50 gobject.io_add_watch(s.fileno(), gobject.IO_IN, self.read_serial)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	51 gobject.timeout_add(60000, self.log_epro)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	52
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	53 def read_serial(self, fd, userdata):
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	54 try:
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	55 data = self.s.read(1024)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	56 except Exception as e:
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	57 logger.error('Failed to read from serial port: %s', str(e))
9 446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	58 return False
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	59
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	60 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	61 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	62
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	63 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	64 # 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	65 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	66 self.log_queue.append(p)
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	67 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	68 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	69 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	70 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	71 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	72 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	73 self.dbusservice['/Dc/0/Current'] = p.amps
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	74 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	75 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	76 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	77 # ePro reports in minutes, Venus expects seconds
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	78 self.dbusservice['/TimeToGo'] = p.time * 60
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	79 return True
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	80
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	81 def log_epro(self):
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	82 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	83 # 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	84 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	85 wantedtypes = set([
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	86 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	87 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	88 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	89 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	90 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	91 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	92 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	93 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	94 ])
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	95 if msgtypes < wantedtypes:
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	96 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	97 return
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 row = {}
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	100 usedtypes = set()
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	101 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	102 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	103 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	104 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	105 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	106 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	107 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	108 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	109 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	110 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	111 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	112 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	113 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	114 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	115 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	116 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	117 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	118 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	119 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	120 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	121 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	122 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	123 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	124 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	125 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	126 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	127 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	128 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	129 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	130 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	131 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	132 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	133 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	134 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	135 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	136
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	137 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	138 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	139 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	140 break
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	141
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	142 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	143 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	144 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	145 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	146 self.dbh.commit()
18 9c2e08444598 Make sure timer is called more than once. Daniel O'Connor <darius@dons.net.au> parents: 17 diff changeset	147 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	148
17 3067bb98b482 Fix signal handling by using the correct function signature. Daniel O'Connor <darius@dons.net.au> parents: 16 diff changeset	149 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	150 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	151
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	152 def main():
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	153 # 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	154 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	155
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	156 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	157
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	158 dbusservice = VeDbusService(servicename)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	159 dbusservice.add_path('/Connected', value = True)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	160 dbusservice.add_path('/ProductName', value = 'Enerdrive ePro')
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	161 dbusservice.add_path('/Mgmt/Connection', value = '/dev/' + port)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	162 dbusservice.add_path('/DeviceInstance', value = instance)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	163 dbusservice.add_path('/ProductId', value = 'unknown')
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	164 dbusservice.add_path('/Dc/0/Voltage', value = None)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	165 dbusservice.add_path('/Dc/0/Current', value = None)
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('/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	167 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	168 dbusservice.add_path('/ConsumedAmphours', value = None)
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	169
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	170 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	171 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	172
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	173 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	174
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	175 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	176
15 08b61687b75f Use logger better Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	177 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	178 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	179 mainloop.run()
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	180
446cfe74827b Add program to report epro status to DBus for Venus tools. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	181 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	182 main()

Mercurial > ~darius > hgwebdir.cgi > epro

annotate eprodbus.py @ 18:9c2e08444598