diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 8721a823..c6c5c9a3 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: - # The CMake configure and build commands are platform agnostic and should work equally + # The CMake configure and build commands are platform-agnostic and should work equally # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix diff --git a/README.md b/README.md index 755a8c57..5c681dbc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ My attempt to create a free and open-source TNC with a GUI for [codec2](https:// Please keep in mind, that this project is still a prototype with many issues which need to be solved. Build steps for other OS than Ubuntu are provided, but not fully working, yet. -Please check the [Releases](https://github.com/DJ2LS/FreeDATA/releases) section for downloading nightly builds +Please check the ['Releases'](https://github.com/DJ2LS/FreeDATA/releases) section for downloading nightly builds ## Preview ![preview](https://github.com/DJ2LS/FreeDATA/blob/main/documentation/FreeDATA_preview.gif?raw=true "Preview") @@ -22,7 +22,7 @@ Please check the [Releases](https://github.com/DJ2LS/FreeDATA/releases) section FreeDV Codec 2 : https://github.com/drowe67/codec2 * xssfox, her repository helped me a lot in an early stage of development - xssfox : https://github.com/xssfox/freedv-tnc -* Wolfgang, for lending me his radio so I'm able to do real hf tests +* Wolfgang, for lending me his radio, so I'm able to do real hf tests ## Running the Ubuntu app bundle Download the latest developer release from the releases section, unpack it and just start the ".AppImage file". No more dependencies diff --git a/gui/daemon.js b/gui/daemon.js index 1e334c23..c22ec79c 100644 --- a/gui/daemon.js +++ b/gui/daemon.js @@ -217,7 +217,7 @@ exports.getDaemonState = function() { // START TNC // ` `== multi line string -exports.startTNC = function(mycall, mygrid, rx_audio, tx_audio, radiocontrol, devicename, deviceport, pttprotocol, pttport, serialspeed, data_bits, stop_bits, handshake, rigctld_ip, rigctld_port, enable_fft, enable_scatter, low_bandwith_mode, tuning_range_fmin, tuning_range_fmax, enable_fsk, tx_audio_level, respond_to_cq) { +exports.startTNC = function(mycall, mygrid, rx_audio, tx_audio, radiocontrol, devicename, deviceport, pttprotocol, pttport, serialspeed, data_bits, stop_bits, handshake, rigctld_ip, rigctld_port, enable_fft, enable_scatter, low_bandwidth_mode, tuning_range_fmin, tuning_range_fmax, enable_fsk, tx_audio_level, respond_to_cq) { var json_command = JSON.stringify({ type: 'set', command: 'start_tnc', @@ -240,7 +240,7 @@ exports.startTNC = function(mycall, mygrid, rx_audio, tx_audio, radiocontrol, de enable_scatter: enable_scatter, enable_fft: enable_fft, enable_fsk: enable_fsk, - low_bandwith_mode : low_bandwith_mode, + low_bandwidth_mode : low_bandwidth_mode, tuning_range_fmin : tuning_range_fmin, tuning_range_fmax : tuning_range_fmax, tx_audio_level : tx_audio_level, diff --git a/gui/main.js b/gui/main.js index 7c63954e..504beec7 100644 --- a/gui/main.js +++ b/gui/main.js @@ -68,7 +68,7 @@ const configDefaultSettings = '{\ "enable_scatter" : "False",\ "enable_fft" : "False",\ "enable_fsk" : "False",\ - "low_bandwith_mode" : "False",\ + "low_bandwidth_mode" : "False",\ "theme" : "default",\ "screen_height" : 430,\ "screen_width" : 1050,\ diff --git a/gui/preload-main.js b/gui/preload-main.js index 8f65b84b..cbd134cb 100644 --- a/gui/preload-main.js +++ b/gui/preload-main.js @@ -112,7 +112,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () document.getElementById("scatterSwitch").value = config.enable_scatter; document.getElementById("fftSwitch").value = config.enable_fft; - //document.getElementById("500HzModeSwitch").value = config.low_bandwith_mode; + //document.getElementById("500HzModeSwitch").value = config.low_bandwidth_mode; //document.getElementById("fskModeSwitch").value = config.enable_fsk; //document.getElementById("respondCQSwitch").value = config.respond_to_cq; @@ -132,7 +132,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () document.getElementById("fftSwitch").checked = false; } - if(config.low_bandwith_mode == 'True'){ + if(config.low_bandwidth_mode == 'True'){ document.getElementById("500HzModeSwitch").checked = true; } else { document.getElementById("500HzModeSwitch").checked = false; @@ -522,9 +522,9 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () // enable 500z Switch clicked document.getElementById("500HzModeSwitch").addEventListener("click", () => { if(document.getElementById("500HzModeSwitch").checked == true){ - config.low_bandwith_mode = "True"; + config.low_bandwidth_mode = "True"; } else { - config.low_bandwith_mode = "False"; + config.low_bandwidth_mode = "False"; } fs.writeFileSync(configPath, JSON.stringify(config, null, 2)); }); @@ -650,9 +650,9 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () } if (document.getElementById("500HzModeSwitch").checked == true){ - var low_bandwith_mode = "True"; + var low_bandwidth_mode = "True"; } else { - var low_bandwith_mode = "False"; + var low_bandwidth_mode = "False"; } if (document.getElementById("fskModeSwitch").checked == true){ @@ -732,7 +732,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () config.enable_scatter = enable_scatter; config.enable_fft = enable_fft; config.enable_fsk = enable_fsk; - config.low_bandwith_mode = low_bandwith_mode; + config.low_bandwidth_mode = low_bandwidth_mode; config.tx_audio_level = tx_audio_level; config.respond_to_cq = respond_to_cq; @@ -753,7 +753,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', () */ - daemon.startTNC(callsign_ssid, mygrid, rx_audio, tx_audio, radiocontrol, deviceid, deviceport, pttprotocol, pttport, serialspeed, data_bits, stop_bits, handshake, rigctld_ip, rigctld_port, enable_fft, enable_scatter, low_bandwith_mode, tuning_range_fmin, tuning_range_fmax, enable_fsk, tx_audio_level, respond_to_cq); + daemon.startTNC(callsign_ssid, mygrid, rx_audio, tx_audio, radiocontrol, deviceid, deviceport, pttprotocol, pttport, serialspeed, data_bits, stop_bits, handshake, rigctld_ip, rigctld_port, enable_fft, enable_scatter, low_bandwidth_mode, tuning_range_fmin, tuning_range_fmax, enable_fsk, tx_audio_level, respond_to_cq); }) @@ -1152,8 +1152,8 @@ ipcRenderer.on('action-update-tnc-state', (event, arg) => { // SET MODE document.getElementById("mode").innerHTML = arg.mode; - // SET BANDWITH - document.getElementById("bandwith").innerHTML = arg.bandwith; + // SET bandwidth + document.getElementById("bandwidth").innerHTML = arg.bandwidth; // SET BYTES PER MINUTE if (typeof(arg.arq_bytes_per_minute) == 'undefined') { diff --git a/gui/sock.js b/gui/sock.js index 96205302..2e449c81 100644 --- a/gui/sock.js +++ b/gui/sock.js @@ -55,7 +55,7 @@ client.on('connect', function(data) { //channel_state: "-", frequency: "-", mode: "-", - bandwith: "-", + bandwidth: "-", rms_level: 0 }; ipcRenderer.send('request-update-tnc-state', Data); @@ -84,7 +84,7 @@ client.on('error', function(data) { //channel_state: "-", frequency: "-", mode: "-", - bandwith: "-", + bandwidth: "-", rms_level: 0 }; @@ -199,7 +199,7 @@ client.on('data', function(socketdata) { frequency: data['frequency'], speed_level: data['speed_level'], mode: data['mode'], - bandwith: data['bandwith'], + bandwidth: data['bandwidth'], rms_level: data['audio_rms'], fft: data['fft'], channel_busy: data['channel_busy'], diff --git a/gui/src/chat-module.html b/gui/src/chat-module.html index 5ed8940c..48410818 100644 --- a/gui/src/chat-module.html +++ b/gui/src/chat-module.html @@ -32,7 +32,7 @@
- +
@@ -61,7 +61,7 @@
- + diff --git a/gui/src/index.html b/gui/src/index.html index 38be56ef..523b7cab 100644 --- a/gui/src/index.html +++ b/gui/src/index.html @@ -70,7 +70,7 @@ - @@ -1023,7 +1023,6 @@
-