Tracker verbessert, lokales Tracking vorbereitet
This commit is contained in:
@@ -120,6 +120,7 @@ __email__ = "thomas@hoogi.de"
|
||||
__status__ = "Development"
|
||||
|
||||
# Standardkonfiguration, kann durch Konfigdatei überschrieben werden
|
||||
# TODO prüfen ob defaults ziehen wenn kein Eintrag in Konfigdatei
|
||||
cfg = {
|
||||
'cfgfile': 'obp60v.conf',
|
||||
'logdir': '~/.local/share/obp60v',
|
||||
@@ -127,6 +128,7 @@ cfg = {
|
||||
'loglevel': 3,
|
||||
'imgpath': os.path.join(sys.path[0], 'images'),
|
||||
'audiopath': os.path.join(sys.path[0], 'audio'),
|
||||
'histpath' = '~/.local/lib/obp60v',
|
||||
'deviceid': 100,
|
||||
'manufcode': 2046, # Open Boat Projects (OBP)
|
||||
'devfunc': 120, # Display
|
||||
@@ -804,10 +806,13 @@ if __name__ == "__main__":
|
||||
log.info("Networking enabled")
|
||||
t_rxd_net = threading.Thread(target=rxd_network, args=(cfg['net_port'],cfg['net_addr']))
|
||||
t_rxd_net.start()
|
||||
if cfg['tracker']['type'] != 'NONE':
|
||||
if cfg['tracker']['type'] == 'NONE':
|
||||
log.info(f"Tracking enabled, mode {cfg['tracker']['type']}")
|
||||
#appdata.track.set_type( cfg['tracker']['type'])
|
||||
t_tracker = threading.Thread(target=appdata.track.mqtt_tracker, args=(cfg['tracker'],cfg['boat'],appdata,boatdata))
|
||||
if cfg['tracker']['type'] == 'HERO':
|
||||
t_tracker = threading.Thread(target=appdata.track.mqtt_tracker, args=(cfg['tracker'],cfg['boat'],appdata,boatdata))
|
||||
elif cfg['tracker']['type'] IN ['LOCAL', 'SDCARD']:
|
||||
t_tracker = threading.Thread(target=appdata.track.local_tracker, args=(cfg['tracker'],cfg['boat'],appdata,boatdata))
|
||||
t_tracker.start()
|
||||
if not cfg['simulation']:
|
||||
if cfg['bme280']:
|
||||
|
||||
Reference in New Issue
Block a user