Lokaler Tracker funktionsfähig. Bugfixes.
This commit is contained in:
14
obp60v.py
14
obp60v.py
@@ -115,7 +115,7 @@ import pages
|
||||
|
||||
__author__ = "Thomas Hooge"
|
||||
__copyright__ = "Copyleft 2024-2025, all rights reversed"
|
||||
__version__ = "0.2"
|
||||
__version__ = "0.3"
|
||||
__email__ = "thomas@hoogi.de"
|
||||
__status__ = "Development"
|
||||
|
||||
@@ -128,7 +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',
|
||||
'histpath': '~/.local/lib/obp60v',
|
||||
'deviceid': 100,
|
||||
'manufcode': 2046, # Open Boat Projects (OBP)
|
||||
'devfunc': 120, # Display
|
||||
@@ -749,6 +749,7 @@ if __name__ == "__main__":
|
||||
cfg['tracker']['mqtt_pass'] = config.get('tracker', 'mqtt_pass')
|
||||
cfg['tracker']['logdir'] = cfg['logdir']
|
||||
cfg['tracker']['trace'] = config.getboolean('tracker', 'trace')
|
||||
cfg['tracker']['interval'] = config.getint('tracker', 'interval')
|
||||
|
||||
# Boat data
|
||||
cfg['boat']['name'] = config.get('boat', 'name')
|
||||
@@ -806,14 +807,15 @@ 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'])
|
||||
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()
|
||||
t_tracker.start()
|
||||
elif cfg['tracker']['type'] in ['LOCAL', 'SDCARD']:
|
||||
t_tracker = threading.Thread(target=appdata.track.local_tracker, args=(cfg,appdata,boatdata))
|
||||
t_tracker.start()
|
||||
if not cfg['simulation']:
|
||||
if cfg['bme280']:
|
||||
log.info("Environment sensor enabled")
|
||||
|
||||
Reference in New Issue
Block a user