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 Projects Releases Packages Wiki Activity

adjusted radio events

Browse source
This commit is contained in:
DJ2LS 2024-04-26 21:06:21 +02:00
parent 6b78a7f42e
commit 412a797a9c
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
freedata_server/radio_manager.py
View file

@ -47,6 +47,7 @@ class RadioManager:
def update_parameters(self): def update_parameters(self):
while not self.stop_event.is_set(): while not self.stop_event.is_set():
parameters = self.radio.get_parameters() parameters = self.radio.get_parameters()
self.state_manager.set_radio("radio_frequency", parameters['frequency']) self.state_manager.set_radio("radio_frequency", parameters['frequency'])
self.state_manager.set_radio("radio_mode", parameters['mode']) self.state_manager.set_radio("radio_mode", parameters['mode'])
self.state_manager.set_radio("radio_bandwidth", parameters['bandwidth']) self.state_manager.set_radio("radio_bandwidth", parameters['bandwidth'])

12
freedata_server/state_manager.py
View file

@ -59,8 +59,8 @@ class StateManager:
self.statequeue.put(currentState) self.statequeue.put(currentState)
return currentState return currentState
def sendStateUpdate (self): def sendStateUpdate (self, state):
self.statequeue.put(self.newstate) self.statequeue.put(state)
def set(self, key, value): def set(self, key, value):
setattr(self, key, value) setattr(self, key, value)
@ -69,7 +69,7 @@ class StateManager:
new_state = self.get_state_event(True) new_state = self.get_state_event(True)
if new_state != self.newstate: if new_state != self.newstate:
self.newstate = new_state self.newstate = new_state
self.sendStateUpdate() self.sendStateUpdate(new_state)
def set_radio(self, key, value): def set_radio(self, key, value):
setattr(self, key, value) setattr(self, key, value)
@ -78,14 +78,14 @@ class StateManager:
new_radio = self.get_radio_event(True) new_radio = self.get_radio_event(True)
if new_radio != self.newradio: if new_radio != self.newradio:
self.newradio = new_radio self.newradio = new_radio
self.sendStateUpdate() self.sendStateUpdate(new_radio)
def set_channel_slot_busy(self, array): def set_channel_slot_busy(self, array):
for i in range(0,len(array),1): for i in range(0,len(array),1):
if not array[i] == self.channel_busy_slot[i]: if not array[i] == self.channel_busy_slot[i]:
self.channel_busy_slot = array self.channel_busy_slot = array
self.newstate = self.get_state_event(True) self.newstate = self.get_state_event(True)
self.sendStateUpdate() self.sendStateUpdate(self.newstate)
continue continue
def get_state_event(self, isChangedState): def get_state_event(self, isChangedState):
@ -211,7 +211,7 @@ class StateManager:
if 'frequency' not in activity_data: if 'frequency' not in activity_data:
activity_data['frequency'] = self.radio_frequency activity_data['frequency'] = self.radio_frequency
self.activities_list[activity_id] = activity_data self.activities_list[activity_id] = activity_data
self.sendStateUpdate() self.sendStateUpdate(self.newstate)
def calculate_channel_busy_state(self): def calculate_channel_busy_state(self):
if self.channel_busy_condition_traffic.is_set() and self.channel_busy_condition_codec2.is_set(): if self.channel_busy_condition_traffic.is_set() and self.channel_busy_condition_codec2.is_set():