diff --git a/freedata_server/rigctld.py b/freedata_server/rigctld.py index 796cfb1d..7111839a 100644 --- a/freedata_server/rigctld.py +++ b/freedata_server/rigctld.py @@ -249,7 +249,6 @@ class radio: self.get_rf() self.get_tuner() self.get_swr() - return self.parameters def get_frequency(self): diff --git a/freedata_server/rigdummy.py b/freedata_server/rigdummy.py index d1abbfd0..6dad910f 100644 --- a/freedata_server/rigdummy.py +++ b/freedata_server/rigdummy.py @@ -10,7 +10,9 @@ class radio: 'strength': '---', 'bandwidth': '---', 'rf': '---', - 'ptt': False # Initial PTT state is set to False + 'ptt': False, # Initial PTT state is set to False + 'tuner': False, + 'swr': '---' } def connect(self, **kwargs): diff --git a/freedata_server/state_manager.py b/freedata_server/state_manager.py index 9b6f6f2b..26577809 100644 --- a/freedata_server/state_manager.py +++ b/freedata_server/state_manager.py @@ -89,9 +89,9 @@ class StateManager: "is_beacon_running": self.is_beacon_running, "is_away_from_key": self.is_away_from_key, "radio_status": self.radio_status, - "radio_frequency": self.radio_frequency, - "radio_mode": self.radio_mode, - "s_meter_strength": self.s_meter_strength, + #"radio_frequency": self.radio_frequency, + #"radio_mode": self.radio_mode, + #"s_meter_strength": self.s_meter_strength, "channel_busy_slot": self.channel_busy_slot, "audio_dbfs": self.audio_dbfs, "activities": self.activities_list,