Merge branch 'develop' into csdr++
This commit is contained in:
commit
483d954b95
@ -376,7 +376,10 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
|
||||
self.send(bytes([0x04]) + data)
|
||||
|
||||
def write_s_meter_level(self, level):
|
||||
try:
|
||||
self.send({"type": "smeter", "value": level})
|
||||
except ValueError:
|
||||
logger.warning("unable to send smeter value: %s", str(level))
|
||||
|
||||
def write_cpu_usage(self, usage):
|
||||
self.mp_send({"type": "cpuusage", "value": usage})
|
||||
|
@ -122,6 +122,7 @@ class DStarEnricher(Enricher):
|
||||
loc = LatLngLocation(meta["lat"], meta["lon"])
|
||||
Map.getSharedInstance().updateLocation(meta["ourcall"], loc, "D-Star", self.parser.getBand())
|
||||
if "dprs" in meta:
|
||||
try:
|
||||
# we can send the DPRS stuff through our APRS parser to extract the information
|
||||
# TODO: only third-party parsing accepts this format right now
|
||||
# TODO: we also need to pass a handler, which is not needed
|
||||
@ -138,6 +139,8 @@ class DStarEnricher(Enricher):
|
||||
# send location info to map as well (it will show up with the correct symbol there!)
|
||||
loc = AprsLocation(data)
|
||||
Map.getSharedInstance().updateLocation(meta["ourcall"], loc, "DPRS", self.parser.getBand())
|
||||
except Exception:
|
||||
logger.exception("Error while parsing DPRS data")
|
||||
|
||||
return meta
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user