Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed explorer publishing

Browse source
This commit is contained in:
DJ2LS 2023-11-19 12:31:56 +01:00
parent 129b7f6029
commit 225af9e8b5
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modem/explorer.py
View file

@ -15,8 +15,9 @@ import structlog
log = structlog.get_logger("explorer") log = structlog.get_logger("explorer")
class explorer(): class explorer():
def __init__(self, config, states): def __init__(self, app, config, states):
self.config = config self.config = config
self.app = app
self.states = states self.states = states
self.explorer_url = "https://api.freedata.app/explorer.php" self.explorer_url = "https://api.freedata.app/explorer.php"
self.publish_interval = 120 self.publish_interval = 120
@ -39,7 +40,7 @@ class explorer():
band = "USB" band = "USB"
callsign = str(self.config['STATION']['mycall']) callsign = str(self.config['STATION']['mycall'])
gridsquare = str(self.config['STATION']['mygrid']) gridsquare = str(self.config['STATION']['mygrid'])
version = str(self.states.modem_version) version = str(self.app.MODEM_VERSION)
bandwidth = str(self.config['MODEM']['enable_low_bandwidth_mode']) bandwidth = str(self.config['MODEM']['enable_low_bandwidth_mode'])
beacon = str(self.states.is_beacon_running) beacon = str(self.states.is_beacon_running)
strength = str(self.states.radio_strength) strength = str(self.states.radio_strength)

10
modem/server.py
View file

@ -16,9 +16,11 @@ app = Flask(__name__)
CORS(app) CORS(app)
CORS(app, resources={r"/*": {"origins": "*"}}) CORS(app, resources={r"/*": {"origins": "*"}})
sock = Sock(app) sock = Sock(app)
app.config['SOCK_SERVER_OPTIONS'] = {'ping_interval': 5} app.config['SOCK_SERVER_OPTIONS'] = {'ping_interval': 10}
print(app.config)
print(app.config['SOCK_SERVER_OPTIONS']) # define global MODEM_VERSION
app.MODEM_VERSION = "0.12.0-alpha"
# set config file to use # set config file to use
def set_config(): def set_config():
if 'FREEDATA_CONFIG' in os.environ: if 'FREEDATA_CONFIG' in os.environ:
@ -62,6 +64,7 @@ def index():
return api_response({'name': 'FreeDATA API', return api_response({'name': 'FreeDATA API',
'description': '', 'description': '',
'api_version': 1, 'api_version': 1,
'modem_version': app.MODEM_VERSION,
'license': 'GPL3.0', 'license': 'GPL3.0',
'documentation': 'https://wiki.freedata.app', 'documentation': 'https://wiki.freedata.app',
}) })
@ -198,7 +201,6 @@ def transmit_sock_data_worker(client_list, event_queue):
client_list.remove(client) client_list.remove(client)
def sock_watchdog(sock, client_list, event_queue): def sock_watchdog(sock, client_list, event_queue):
event_queue.put(json.dumps({"freedata-message": "hello-client"})) event_queue.put(json.dumps({"freedata-message": "hello-client"}))

2
modem/service_manager.py
View file

@ -27,7 +27,7 @@ class SM:
# optionally start explorer module # optionally start explorer module
if self.config['STATION']['enable_explorer']: if self.config['STATION']['enable_explorer']:
explorer.explorer(self.config, self.states) explorer.explorer(self.app, self.config, self.states)
def runner(self): def runner(self):
while True: while True:

3
modem/state_manager.py
View file

@ -3,8 +3,6 @@ import ujson as json
class STATES: class STATES:
def __init__(self, statequeue): def __init__(self, statequeue):
self.modem_version = 0.0
# state related settings # state related settings
self.statequeue = statequeue self.statequeue = statequeue
self.newstate = None self.newstate = None
@ -67,7 +65,6 @@ class STATES:
def getAsJSON(self, isChangedState): def getAsJSON(self, isChangedState):
msgtype = "state-change" msgtype = "state-change"
if (not isChangedState): if (not isChangedState):
msgtype = "state" msgtype = "state"