mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge pull request #690 from DJ2LS/dev-max-bandwidth
set maximum bandwidth
This commit is contained in:
commit
cb70ed8445
11 changed files with 51 additions and 28 deletions
|
@ -2,7 +2,7 @@
|
||||||
"name": "FreeDATA",
|
"name": "FreeDATA",
|
||||||
"description": "FreeDATA Client application for connecting to FreeDATA server",
|
"description": "FreeDATA Client application for connecting to FreeDATA server",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.14.4-alpha",
|
"version": "0.14.5-alpha",
|
||||||
"main": "dist-electron/main/index.js",
|
"main": "dist-electron/main/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "vite",
|
"start": "vite",
|
||||||
|
|
|
@ -165,20 +165,20 @@ const audioStore = useAudioStore();
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-group input-group-sm mb-1">
|
<div class="input-group input-group-sm mb-1">
|
||||||
<label class="input-group-text w-50">Enable 250Hz bandwidth mode</label>
|
<label class="input-group-text w-50">Maximum used bandwidth</label>
|
||||||
<label class="input-group-text w-50">
|
<select
|
||||||
<div class="form-check form-switch form-check-inline">
|
class="form-select form-select-sm"
|
||||||
<input
|
id="maximum_bandwidth"
|
||||||
class="form-check-input"
|
|
||||||
type="checkbox"
|
|
||||||
id="250HzModeSwitch"
|
|
||||||
v-model="settings.remote.MODEM.enable_low_bandwidth_mode"
|
|
||||||
@change="onChange"
|
@change="onChange"
|
||||||
/>
|
v-model.number="settings.remote.MODEM.maximum_bandwidth"
|
||||||
<label class="form-check-label" for="250HzModeSwitch">250Hz</label>
|
>
|
||||||
</div>
|
<option value="250">250 Hz</option>
|
||||||
</label>
|
<option value="563">563 Hz</option>
|
||||||
|
<option value="1700">1700 Hz</option>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="input-group input-group-sm mb-1">
|
<div class="input-group input-group-sm mb-1">
|
||||||
<label class="input-group-text w-50">Respond to CQ</label>
|
<label class="input-group-text w-50">Respond to CQ</label>
|
||||||
<label class="input-group-text w-50">
|
<label class="input-group-text w-50">
|
||||||
|
|
|
@ -54,11 +54,11 @@ const defaultConfig = {
|
||||||
enable_protocol: false,
|
enable_protocol: false,
|
||||||
},
|
},
|
||||||
MODEM: {
|
MODEM: {
|
||||||
enable_low_bandwidth_mode: false,
|
|
||||||
respond_to_cq: false,
|
respond_to_cq: false,
|
||||||
tx_delay: 0,
|
tx_delay: 0,
|
||||||
enable_hamc: false,
|
enable_hamc: false,
|
||||||
enable_morse_identifier: false,
|
enable_morse_identifier: false,
|
||||||
|
maximum_bandwidth: 3000,
|
||||||
},
|
},
|
||||||
RADIO: {
|
RADIO: {
|
||||||
control: "disabled",
|
control: "disabled",
|
||||||
|
|
|
@ -16,16 +16,19 @@ class ARQSession:
|
||||||
'mode': codec2.FREEDV_MODE.datac4,
|
'mode': codec2.FREEDV_MODE.datac4,
|
||||||
'min_snr': -10,
|
'min_snr': -10,
|
||||||
'duration_per_frame': 5.17,
|
'duration_per_frame': 5.17,
|
||||||
|
'bandwidth': 250,
|
||||||
},
|
},
|
||||||
1: {
|
1: {
|
||||||
'mode': codec2.FREEDV_MODE.datac3,
|
'mode': codec2.FREEDV_MODE.datac3,
|
||||||
'min_snr': 0,
|
'min_snr': 0,
|
||||||
'duration_per_frame': 3.19,
|
'duration_per_frame': 3.19,
|
||||||
|
'bandwidth': 563,
|
||||||
},
|
},
|
||||||
2: {
|
2: {
|
||||||
'mode': codec2.FREEDV_MODE.datac1,
|
'mode': codec2.FREEDV_MODE.datac1,
|
||||||
'min_snr': 3,
|
'min_snr': 3,
|
||||||
'duration_per_frame': 4.18,
|
'duration_per_frame': 4.18,
|
||||||
|
'bandwidth': 1700,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,11 +164,20 @@ class ARQSession:
|
||||||
|
|
||||||
return stats
|
return stats
|
||||||
|
|
||||||
def get_appropriate_speed_level(self, snr):
|
def get_appropriate_speed_level(self, snr, maximum_bandwidth=None):
|
||||||
# Start with the lowest speed level as default
|
if maximum_bandwidth is None:
|
||||||
# In case of a not fitting SNR, we return the lowest speed level
|
maximum_bandwidth = self.config['MODEM']['maximum_bandwidth']
|
||||||
|
|
||||||
|
# Adjust maximum_bandwidth based on special conditions or invalid configurations
|
||||||
|
if maximum_bandwidth == 0:
|
||||||
|
# Use the maximum available bandwidth from the speed level dictionary
|
||||||
|
maximum_bandwidth = max(details['bandwidth'] for details in self.SPEED_LEVEL_DICT.values())
|
||||||
|
|
||||||
|
# Initialize appropriate_speed_level to the lowest level that meets the minimum criteria
|
||||||
appropriate_speed_level = min(self.SPEED_LEVEL_DICT.keys())
|
appropriate_speed_level = min(self.SPEED_LEVEL_DICT.keys())
|
||||||
|
|
||||||
for level, details in self.SPEED_LEVEL_DICT.items():
|
for level, details in self.SPEED_LEVEL_DICT.items():
|
||||||
if snr >= details['min_snr'] and level > appropriate_speed_level:
|
if snr >= details['min_snr'] and details['bandwidth'] <= maximum_bandwidth and level > appropriate_speed_level:
|
||||||
appropriate_speed_level = level
|
appropriate_speed_level = level
|
||||||
|
|
||||||
return appropriate_speed_level
|
return appropriate_speed_level
|
||||||
|
|
|
@ -76,6 +76,8 @@ class ARQSessionIRS(arq_session.ARQSession):
|
||||||
self.received_bytes = 0
|
self.received_bytes = 0
|
||||||
self.received_crc = None
|
self.received_crc = None
|
||||||
|
|
||||||
|
self.maximum_bandwidth = 0
|
||||||
|
|
||||||
self.abort = False
|
self.abort = False
|
||||||
|
|
||||||
def all_data_received(self):
|
def all_data_received(self):
|
||||||
|
@ -98,6 +100,12 @@ class ARQSessionIRS(arq_session.ARQSession):
|
||||||
thread_wait.start()
|
thread_wait.start()
|
||||||
|
|
||||||
def send_open_ack(self, open_frame):
|
def send_open_ack(self, open_frame):
|
||||||
|
self.maximum_bandwidth = open_frame['maximum_bandwidth']
|
||||||
|
# check for maximum bandwidth. If ISS bandwidth is higher than own, then use own
|
||||||
|
if open_frame['maximum_bandwidth'] > self.config['MODEM']['maximum_bandwidth']:
|
||||||
|
self.maximum_bandwidth = self.config['MODEM']['maximum_bandwidth']
|
||||||
|
|
||||||
|
|
||||||
self.event_manager.send_arq_session_new(
|
self.event_manager.send_arq_session_new(
|
||||||
False, self.id, self.dxcall, 0, self.state.name)
|
False, self.id, self.dxcall, 0, self.state.name)
|
||||||
ack_frame = self.frame_factory.build_arq_session_open_ack(
|
ack_frame = self.frame_factory.build_arq_session_open_ack(
|
||||||
|
@ -211,7 +219,7 @@ class ARQSessionIRS(arq_session.ARQSession):
|
||||||
received_speed_level = 0
|
received_speed_level = 0
|
||||||
|
|
||||||
latest_snr = self.snr if self.snr else -10
|
latest_snr = self.snr if self.snr else -10
|
||||||
appropriate_speed_level = self.get_appropriate_speed_level(latest_snr)
|
appropriate_speed_level = self.get_appropriate_speed_level(latest_snr, self.maximum_bandwidth)
|
||||||
modes_to_decode = {}
|
modes_to_decode = {}
|
||||||
|
|
||||||
# Log the latest SNR, current, appropriate speed levels, and the previous speed level
|
# Log the latest SNR, current, appropriate speed levels, and the previous speed level
|
||||||
|
|
|
@ -104,9 +104,10 @@ class ARQSessionISS(arq_session.ARQSession):
|
||||||
twr.start()
|
twr.start()
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
|
maximum_bandwidth = self.config['MODEM']['maximum_bandwidth']
|
||||||
self.event_manager.send_arq_session_new(
|
self.event_manager.send_arq_session_new(
|
||||||
True, self.id, self.dxcall, self.total_length, self.state.name)
|
True, self.id, self.dxcall, self.total_length, self.state.name)
|
||||||
session_open_frame = self.frame_factory.build_arq_session_open(self.dxcall, self.id)
|
session_open_frame = self.frame_factory.build_arq_session_open(self.dxcall, self.id, maximum_bandwidth)
|
||||||
self.launch_twr(session_open_frame, self.TIMEOUT_CONNECT_ACK, self.RETRIES_CONNECT, mode=FREEDV_MODE.signalling)
|
self.launch_twr(session_open_frame, self.TIMEOUT_CONNECT_ACK, self.RETRIES_CONNECT, mode=FREEDV_MODE.signalling)
|
||||||
self.set_state(ISS_State.OPEN_SENT)
|
self.set_state(ISS_State.OPEN_SENT)
|
||||||
|
|
||||||
|
|
|
@ -45,10 +45,10 @@ enable_protocol = False
|
||||||
|
|
||||||
[MODEM]
|
[MODEM]
|
||||||
enable_hmac = False
|
enable_hmac = False
|
||||||
enable_low_bandwidth_mode = False
|
|
||||||
enable_morse_identifier = False
|
enable_morse_identifier = False
|
||||||
respond_to_cq = True
|
respond_to_cq = True
|
||||||
tx_delay = 200
|
tx_delay = 50
|
||||||
|
maximum_bandwidth = 1700
|
||||||
|
|
||||||
[MESSAGES]
|
[MESSAGES]
|
||||||
enable_auto_repeat = False
|
enable_auto_repeat = False
|
||||||
|
|
|
@ -57,7 +57,7 @@ class CONFIG:
|
||||||
'MODEM': {
|
'MODEM': {
|
||||||
'enable_hmac': bool,
|
'enable_hmac': bool,
|
||||||
'enable_morse_identifier': bool,
|
'enable_morse_identifier': bool,
|
||||||
'enable_low_bandwidth_mode': bool,
|
'maximum_bandwidth': int,
|
||||||
'respond_to_cq': bool,
|
'respond_to_cq': bool,
|
||||||
'tx_delay': int
|
'tx_delay': int
|
||||||
},
|
},
|
||||||
|
|
|
@ -98,6 +98,7 @@ class DataFrameFactory:
|
||||||
"destination_crc": 3,
|
"destination_crc": 3,
|
||||||
"origin": 6,
|
"origin": 6,
|
||||||
"session_id": 1,
|
"session_id": 1,
|
||||||
|
"maximum_bandwidth": 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
self.template_list[FR_TYPE.ARQ_SESSION_OPEN_ACK.value] = {
|
self.template_list[FR_TYPE.ARQ_SESSION_OPEN_ACK.value] = {
|
||||||
|
@ -219,7 +220,7 @@ class DataFrameFactory:
|
||||||
|
|
||||||
elif key in ["session_id", "speed_level",
|
elif key in ["session_id", "speed_level",
|
||||||
"frames_per_burst", "version",
|
"frames_per_burst", "version",
|
||||||
"offset", "total_length", "state", "type"]:
|
"offset", "total_length", "state", "type", "maximum_bandwidth"]:
|
||||||
extracted_data[key] = int.from_bytes(data, 'big')
|
extracted_data[key] = int.from_bytes(data, 'big')
|
||||||
|
|
||||||
elif key in ["snr"]:
|
elif key in ["snr"]:
|
||||||
|
@ -328,11 +329,12 @@ class DataFrameFactory:
|
||||||
test_frame[:1] = bytes([FR_TYPE.TEST_FRAME.value])
|
test_frame[:1] = bytes([FR_TYPE.TEST_FRAME.value])
|
||||||
return test_frame
|
return test_frame
|
||||||
|
|
||||||
def build_arq_session_open(self, destination, session_id):
|
def build_arq_session_open(self, destination, session_id, maximum_bandwidth):
|
||||||
payload = {
|
payload = {
|
||||||
"destination_crc": helpers.get_crc_24(destination),
|
"destination_crc": helpers.get_crc_24(destination),
|
||||||
"origin": helpers.callsign_to_bytes(self.myfullcall),
|
"origin": helpers.callsign_to_bytes(self.myfullcall),
|
||||||
"session_id": session_id.to_bytes(1, 'big'),
|
"session_id": session_id.to_bytes(1, 'big'),
|
||||||
|
"maximum_bandwidth": maximum_bandwidth.to_bytes(2, 'big'),
|
||||||
}
|
}
|
||||||
return self.construct(FR_TYPE.ARQ_SESSION_OPEN, payload)
|
return self.construct(FR_TYPE.ARQ_SESSION_OPEN, payload)
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ from schedule_manager import ScheduleManager
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
CORS(app, resources={r"/*": {"origins": "*"}})
|
CORS(app, resources={r"/*": {"origins": "*"}})
|
||||||
sock = Sock(app)
|
sock = Sock(app)
|
||||||
MODEM_VERSION = "0.14.4-alpha"
|
MODEM_VERSION = "0.14.5-alpha"
|
||||||
|
|
||||||
# set config file to use
|
# set config file to use
|
||||||
def set_config():
|
def set_config():
|
||||||
|
|
|
@ -32,7 +32,7 @@ class TestDataFrameFactory(unittest.TestCase):
|
||||||
def testARQConnect(self):
|
def testARQConnect(self):
|
||||||
dxcall = "DJ2LS-4"
|
dxcall = "DJ2LS-4"
|
||||||
session_id = 123
|
session_id = 123
|
||||||
frame = self.factory.build_arq_session_open(dxcall, session_id)
|
frame = self.factory.build_arq_session_open(dxcall, session_id, 1700)
|
||||||
frame_data = self.factory.deconstruct(frame)
|
frame_data = self.factory.deconstruct(frame)
|
||||||
|
|
||||||
self.assertEqual(frame_data['origin'], self.factory.myfullcall)
|
self.assertEqual(frame_data['origin'], self.factory.myfullcall)
|
||||||
|
|
Loading…
Reference in a new issue