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 ofdm2438

Browse source
This commit is contained in:
DJ2LS 2024-04-10 17:45:48 +02:00
parent 61270b900a
commit 00a0c390b1
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modem/arq_session.py
View file

@ -32,7 +32,7 @@ class ARQSession:
}, },
3: { 3: {
'mode': codec2.FREEDV_MODE.data_ofdm_2438, 'mode': codec2.FREEDV_MODE.data_ofdm_2438,
'min_snr': 7, 'min_snr': 8,
'duration_per_frame': 6.5, 'duration_per_frame': 6.5,
'bandwidth': 2438, 'bandwidth': 2438,
}, },

2
modem/codec2.py
View file

@ -586,7 +586,7 @@ data_ofdm_500_config.config.contents.tx_uw = create_tx_uw(16, [1, 1, 0, 0, 1, 0,
data_ofdm_2438_config = create_default_ofdm_config() data_ofdm_2438_config = create_default_ofdm_config()
data_ofdm_2438_config.config.contents.ns = 5 data_ofdm_2438_config.config.contents.ns = 5
data_ofdm_2438_config.config.contents.np = 52 data_ofdm_2438_config.config.contents.np = 52
data_ofdm_2438_config.config.contents.tcp = 0.006 data_ofdm_2438_config.config.contents.tcp = 0.004
data_ofdm_2438_config.config.contents.ts = 0.016 data_ofdm_2438_config.config.contents.ts = 0.016
data_ofdm_2438_config.config.contents.rs = 1.0 / data_ofdm_2438_config.config.contents.ts data_ofdm_2438_config.config.contents.rs = 1.0 / data_ofdm_2438_config.config.contents.ts
data_ofdm_2438_config.config.contents.nc = 39 data_ofdm_2438_config.config.contents.nc = 39

4
modem/command_cq.py
View file

@ -6,8 +6,4 @@ class CQCommand(TxCommand):
return self.frame_factory.build_cq() return self.frame_factory.build_cq()
def get_tx_mode(self): def get_tx_mode(self):
#return FREEDV_MODE.data_ofdm_500
#return FREEDV_MODE.datac3
return FREEDV_MODE.data_ofdm_2438 return FREEDV_MODE.data_ofdm_2438
#return FREEDV_MODE.data_qam_2438
#return FREEDV_MODE.qam16c2

4
modem/server.py
View file

@ -326,6 +326,7 @@ def sock_states(sock):
@atexit.register @atexit.register
def stop_server(): def stop_server():
print("------------------------------------------")
try: try:
app.service_manager.modem_service.put("stop") app.service_manager.modem_service.put("stop")
if app.socket_interface_manager: if app.socket_interface_manager:
@ -335,10 +336,11 @@ def stop_server():
app.service_manager.modem.sd_input_stream.stop app.service_manager.modem.sd_input_stream.stop
audio.sd._terminate() audio.sd._terminate()
except Exception as e: except Exception as e:
print(e)
print("Error stopping modem") print("Error stopping modem")
time.sleep(1) time.sleep(1)
print("------------------------------------------")
print('Server shutdown...') print('Server shutdown...')
print("------------------------------------------")
if __name__ == "__main__": if __name__ == "__main__":
app.config['SOCK_SERVER_OPTIONS'] = {'ping_interval': 10} app.config['SOCK_SERVER_OPTIONS'] = {'ping_interval': 10}