diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue index fa4e28aa..6b06eee7 100644 --- a/gui/src/components/main.vue +++ b/gui/src/components/main.vue @@ -5,16 +5,9 @@ setActivePinia(pinia); import main_modals from "./main_modals.vue"; import main_top_navbar from "./main_top_navbar.vue"; -import main_rig_control from "./main_rig_control.vue"; import settings_view from "./settings.vue"; -import main_active_rig_control from "./main_active_rig_control.vue"; import main_footer_navbar from "./main_footer_navbar.vue"; -import main_active_stats from "./main_active_stats.vue"; -import main_active_broadcasts from "./main_active_broadcasts.vue"; -import main_active_heard_stations from "./main_active_heard_stations.vue"; -import main_active_audio_level from "./main_active_audio_level.vue"; - import chat from "./chat.vue"; import infoScreen from "./infoScreen.vue"; import main_modem_healthcheck from "./main_modem_healthcheck.vue"; diff --git a/gui/src/components/main_active_audio_level.vue b/gui/src/components/main_active_audio_level.vue deleted file mode 100644 index ae4b7d52..00000000 --- a/gui/src/components/main_active_audio_level.vue +++ /dev/null @@ -1,170 +0,0 @@ - - diff --git a/gui/src/components/main_active_broadcasts.vue b/gui/src/components/main_active_broadcasts.vue deleted file mode 100644 index 68961974..00000000 --- a/gui/src/components/main_active_broadcasts.vue +++ /dev/null @@ -1,110 +0,0 @@ - - diff --git a/gui/src/components/main_active_heard_stations.vue b/gui/src/components/main_active_heard_stations.vue deleted file mode 100644 index 3e309050..00000000 --- a/gui/src/components/main_active_heard_stations.vue +++ /dev/null @@ -1,122 +0,0 @@ - - diff --git a/gui/src/components/main_active_rig_control.vue b/gui/src/components/main_active_rig_control.vue deleted file mode 100644 index 0a68f8e9..00000000 --- a/gui/src/components/main_active_rig_control.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - diff --git a/gui/src/components/main_active_stats.vue b/gui/src/components/main_active_stats.vue deleted file mode 100644 index 6a69b3ff..00000000 --- a/gui/src/components/main_active_stats.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - - diff --git a/gui/src/components/main_audio.vue b/gui/src/components/main_audio.vue deleted file mode 100644 index 46135368..00000000 --- a/gui/src/components/main_audio.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - diff --git a/gui/src/components/main_my_station.vue b/gui/src/components/main_my_station.vue deleted file mode 100644 index 190b3bad..00000000 --- a/gui/src/components/main_my_station.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/gui/src/components/main_rig_control.vue b/gui/src/components/main_rig_control.vue deleted file mode 100644 index 396821e5..00000000 --- a/gui/src/components/main_rig_control.vue +++ /dev/null @@ -1,235 +0,0 @@ - - - diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue index 2d9d1138..3b86f397 100644 --- a/gui/src/components/settings_modem.vue +++ b/gui/src/components/settings_modem.vue @@ -164,36 +164,6 @@ const audioStore = useAudioStore(); -
- - - - - -
-
-
- - -
diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js index 291e53c0..b1441d31 100644 --- a/gui/src/store/settingsStore.js +++ b/gui/src/store/settingsStore.js @@ -54,12 +54,8 @@ const defaultConfig = { enable_protocol: false, }, MODEM: { - enable_fsk: false, enable_low_bandwidth_mode: false, respond_to_cq: false, - rx_buffer_size: 0, - tuning_range_fmax: 0, - tuning_range_fmin: 0, tx_delay: 0, enable_hamc: false, enable_morse_identifier: false, diff --git a/modem/config.ini.example b/modem/config.ini.example index f2265ce6..ffcaa0b0 100644 --- a/modem/config.ini.example +++ b/modem/config.ini.example @@ -46,13 +46,9 @@ enable_protocol = False [MODEM] enable_hmac = False -tuning_range_fmax = 50 -tuning_range_fmin = -50 -enable_fsk = False enable_low_bandwidth_mode = False enable_morse_identifier = False respond_to_cq = True -rx_buffer_size = 64 tx_delay = 200 [MESSAGES] diff --git a/modem/config.py b/modem/config.py index c05a769c..ec8f75c0 100644 --- a/modem/config.py +++ b/modem/config.py @@ -56,14 +56,10 @@ class CONFIG: 'enable_protocol': bool, }, 'MODEM': { - 'tuning_range_fmax': int, - 'tuning_range_fmin': int, - 'enable_fsk': bool, 'enable_hmac': bool, 'enable_morse_identifier': bool, 'enable_low_bandwidth_mode': bool, 'respond_to_cq': bool, - 'rx_buffer_size': int, 'tx_delay': int }, 'MESSAGES': { diff --git a/modem/demodulator.py b/modem/demodulator.py index 554ca0ef..24d17122 100644 --- a/modem/demodulator.py +++ b/modem/demodulator.py @@ -30,8 +30,6 @@ class Demodulator(): def __init__(self, config, audio_rx_q, modem_rx_q, data_q_rx, states, event_manager, fft_queue): self.log = structlog.get_logger("Demodulator") - self.tuning_range_fmin = config['MODEM']['tuning_range_fmin'] - self.tuning_range_fmax = config['MODEM']['tuning_range_fmax'] self.rx_audio_level = config['AUDIO']['rx_audio_level'] self.AUDIO_FRAMES_PER_BUFFER_RX = 4800 @@ -79,13 +77,6 @@ class Demodulator(): codec2.api.freedv_open(mode), ctypes.c_void_p ) - # set tuning range - codec2.api.freedv_set_tuning_range( - c2instance, - ctypes.c_float(float(self.tuning_range_fmin)), - ctypes.c_float(float(self.tuning_range_fmax)), - ) - # get bytes per frame bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(c2instance) / 8 diff --git a/modem/server.py b/modem/server.py index 3454a3ea..f236638a 100644 --- a/modem/server.py +++ b/modem/server.py @@ -353,7 +353,7 @@ if __name__ == "__main__": modemport = conf['NETWORK']['modemport'] if not modemaddress: - modemaddress = '127.0.0.1' + modemaddress = '0.0.0.0' if not modemport: modemport = 5000 app.run(modemaddress, modemport)