joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config migration for receiver_gps

Browse Source
This commit is contained in:
Jakob Ketterl
2020-03-29 18:08:26 +02:00
parent 2b7d6738f1
commit fd9e913a49
7 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
owrx/controllers/status.py
View File

@ -10,6 +10,8 @@ import json
class StatusController(Controller):
def indexAction(self):
pm = Config.get()
# convert to old format
gps = (pm["receiver_gps"]["lat"], pm["receiver_gps"]["lon"])
# TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
vars = {
"status": "active",
@ -17,7 +19,7 @@ class StatusController(Controller):
"op_email": pm["receiver_admin"],
"users": ClientRegistry.getSharedInstance().clientCount(),
"users_max": pm["max_clients"],
"gps": pm["receiver_gps"],
"gps": gps,
"asl": pm["receiver_asl"],
"loc": pm["receiver_location"],
"sw_version": openwebrx_version,
@ -44,12 +46,11 @@ class StatusController(Controller):
def jsonAction(self):
pm = Config.get()
gps = pm["receiver_gps"]
status = {
"receiver": {
"name": pm["receiver_name"],
"admin": pm["receiver_admin"],
"gps": {"lat": gps[0], "lon": gps[1]},
"gps": pm["receiver_gps"],
"asl": pm["receiver_asl"],
"location": pm["receiver_location"],
},