Updated GUI to only have sf and msg in test parameters

Author: ty22117

.gitignore

@@ -9,4 +9,5 @@ uw_env/
 __pycache__/
 *.nmea
 .venv
-.coverage
+.coverage
+.vscode/

auto_config.yaml

@@ -3,7 +3,7 @@ parameter_sets:
     mult_amp: 0.2
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 7
     tx_rx_sync_word: [18]
@@ -12,7 +12,7 @@ parameter_sets:
     mult_amp: 0.15
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 7
     tx_rx_sync_word: [18]
@@ -21,7 +21,7 @@ parameter_sets:
     mult_amp: 0.1
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 7
     tx_rx_sync_word: [18]
@@ -30,7 +30,7 @@ parameter_sets:
     mult_amp: 0.2
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 8
     tx_rx_sync_word: [18]
@@ -39,7 +39,7 @@ parameter_sets:
     mult_amp: 0.15
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 8
     tx_rx_sync_word: [18]
@@ -48,7 +48,7 @@ parameter_sets:
     mult_amp: 0.1
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 8
     tx_rx_sync_word: [18]
@@ -57,7 +57,7 @@ parameter_sets:
     mult_amp: 0.2
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 9
     tx_rx_sync_word: [18]
@@ -66,7 +66,7 @@ parameter_sets:
     mult_amp: 0.15
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 9
     tx_rx_sync_word: [18]
@@ -75,12 +75,12 @@ parameter_sets:
     mult_amp: 0.1
     rx_mix_freq: -12000
     tx_mix_freq: 12000
-    tx_rx_bw: 5000
+    tx_rx_bw: 6000
     tx_cr: 1
     tx_rx_sf: 9
     tx_rx_sync_word: [18]
 
-# BW is 5000 for all
+# BW is 6000 for all
 # CR is same for all (4/5, which corresponds to 1 in the source code)
 # sync word is same for all (default 18)
 # mix frequency is 12000 +/- for all (center freq)

base_station_gui.py

@@ -912,9 +912,8 @@ def run_tests(self):
             # Send test commands
             for bue_id, config in self.bue_configs.items():
                 command = f"TEST,{config['file']},{unix_timestamp},{config['sf']} {config["msg"]}"
-                for i in range(3):
-                    self.base_station.ota.send_ota_message(bue_id, command)
-                    time.sleep(0.1)
+                self.base_station.ota.send_ota_message(bue_id, command)
+                time.sleep(0.1)
                 logger.info(f"Sent test command to bUE {bue_id}: {command}")
 
             bue_names = [bUEs.get(str(bue_id), str(bue_id)) for bue_id in self.bue_configs.keys()]

base_station_main.py

@@ -208,6 +208,7 @@ def message_listener(self):
                 elif message_body.startswith("UPD"):  # 40,55,UPD:LAT,LONG,STDOUT: [helloworld.py STDOUT] TyGoodTest,-42,8
                     if not bue_id in self.testing_bues:
                         self.testing_bues.append(bue_id)
+                        logger.bind(bue_id=bue_id).info(f"Received UPD from {bue_id} but it was not in testing_bues. Adding it now.")
                     header, lat, long, stdout = message_body.split(",", maxsplit=3)
                     # logger.info(f"Received UPD from {bue_id}. Currently at Latitude: {lat}, Longitude: {long}. Message: {stdout}")
                     logger.bind(bue_id=bue_id).info(f"Received UPD from {bue_id}. Message: {stdout}")
@@ -239,6 +240,7 @@ def message_listener(self):
                     logger.bind(bue_id=bue_id).info(f"Received CANCD from {bue_id}")
                     if bue_id in self.testing_bues:
                         self.testing_bues.remove(bue_id)
+
                 elif message_body.startswith("BAD"):
                     logger.bind(bue_id=bue_id).info(f"Received BAD from {bue_id}")
                     self.stdout_history.append(f"Received a BAD from {bUEs[str(bue_id)]}")

constants.py

@@ -2,7 +2,7 @@
 
 bUEs = {
     "10": "Doof",
-    "20": "Candace",
+    "80": "Candace",
     "30": "Major",
     "40": "Buford",
     "50": "Carl",
@@ -11,7 +11,7 @@
 
 bUEs_inverted = {
     "Doof": "10",
-    "Candace": "20",
+    "Candace": "80",
     "Major": "30",
     "Buford": "40",
     "Carl": "50",

tdo_rup.grc

@@ -65,7 +65,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [600, 752.0]
+    coordinate: [480, 792.0]
     rotation: 0
     state: true
 - name: analog_sig_source_x_0_0
@@ -88,7 +88,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [360, 136.0]
+    coordinate: [352, 152.0]
     rotation: 0
     state: true
 - name: audio_sink_0
@@ -124,7 +124,32 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [232, 696.0]
+    coordinate: [144, 720.0]
+    rotation: 0
+    state: enabled
+- name: band_pass_filter_0
+  id: band_pass_filter
+  parameters:
+    affinity: ''
+    alias: ''
+    beta: '6.76'
+    comment: ''
+    decim: '1'
+    gain: '1'
+    high_cutoff_freq: tx_rx_mix_freq + (tx_rx_bw /2) + 1000
+    interp: '1'
+    low_cutoff_freq: tx_rx_mix_freq - (tx_rx_bw /2) - 1000
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    samp_rate: samp_rate
+    type: fir_filter_ccf
+    width: '1000'
+    win: window.WIN_HAMMING
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [592, 564.0]
     rotation: 0
     state: enabled
 - name: blocks_complex_to_float_0
@@ -187,7 +212,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [488, 664.0]
+    coordinate: [400, 664.0]
     rotation: 0
     state: enabled
 - name: blocks_message_strobe_0
@@ -240,7 +265,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [840, 648.0]
+    coordinate: [808, 664.0]
     rotation: 0
     state: true
 - name: blocks_multiply_xx_0_0
@@ -297,7 +322,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     pay_len: '255'
-    print_rx: '[True,True]'
+    print_rx: '[False,True]'
     samp_rate: samp_rate
     sf: tx_rx_sf
     soft_decoding: 'True'
@@ -490,10 +515,11 @@ connections:
 - [analog_sig_source_x_0, '0', blocks_multiply_xx_0, '1']
 - [analog_sig_source_x_0_0, '0', blocks_multiply_xx_0_0, '0']
 - [audio_source_0, '0', blocks_float_to_complex_0, '0']
+- [band_pass_filter_0, '0', blocks_multiply_xx_0, '0']
 - [blocks_complex_to_float_0, '0', audio_sink_0, '0']
 - [blocks_complex_to_float_1, '0', blocks_wavfile_sink_0, '0']
 - [blocks_conjugate_cc_0, '0', blocks_complex_to_float_0, '0']
-- [blocks_float_to_complex_0, '0', blocks_multiply_xx_0, '0']
+- [blocks_float_to_complex_0, '0', band_pass_filter_0, '0']
 - [blocks_message_strobe_0, strobe, lora_sdr_payload_id_inc_0, msg_in]
 - [blocks_message_strobe_0, strobe, lora_tx_0, in]
 - [blocks_multiply_const_vxx_0, '0', blocks_conjugate_cc_0, '0']

tdo_rup.py

@@ -13,8 +13,9 @@
 from gnuradio import audio
 from gnuradio import blocks
 import pmt
-from gnuradio import gr
+from gnuradio import filter
 from gnuradio.filter import firdes
+from gnuradio import gr
 from gnuradio.fft import window
 import sys
 import signal
@@ -60,7 +61,7 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
             samp_rate=samp_rate,
             sf=tx_rx_sf,
          ldro_mode=2,frame_zero_padd=1280,sync_word=tx_rx_sync_word )
-        self.lora_rx_0 = lora_sdr.lora_sdr_lora_rx( bw=tx_rx_bw, cr=1, has_crc=True, impl_head=False, pay_len=255, samp_rate=samp_rate, sf=tx_rx_sf, sync_word=tx_rx_sync_word, soft_decoding=True, ldro_mode=2, print_rx=[True,True])
+        self.lora_rx_0 = lora_sdr.lora_sdr_lora_rx( bw=tx_rx_bw, cr=1, has_crc=True, impl_head=False, pay_len=255, samp_rate=samp_rate, sf=tx_rx_sf, sync_word=tx_rx_sync_word, soft_decoding=True, ldro_mode=2, print_rx=[False,True])
         self.blocks_wavfile_sink_0 = blocks.wavfile_sink(
             wav_file_path,
             1,
@@ -77,6 +78,16 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.blocks_conjugate_cc_0 = blocks.conjugate_cc()
         self.blocks_complex_to_float_1 = blocks.complex_to_float(1)
         self.blocks_complex_to_float_0 = blocks.complex_to_float(1)
+        self.band_pass_filter_0 = filter.fir_filter_ccf(
+            1,
+            firdes.band_pass(
+                1,
+                samp_rate,
+                (tx_rx_mix_freq - (tx_rx_bw /2) - 1000),
+                (tx_rx_mix_freq + (tx_rx_bw /2) + 1000),
+                1000,
+                window.WIN_HAMMING,
+                6.76))
         self.audio_source_0 = audio.source(samp_rate, 'hw:3,0', True)
         self.audio_sink_0 = audio.sink(samp_rate, 'hw:3,0', True)
         self.analog_sig_source_x_0_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, tx_rx_mix_freq, 1, 0, 0)
@@ -90,10 +101,11 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.connect((self.analog_sig_source_x_0, 0), (self.blocks_multiply_xx_0, 1))
         self.connect((self.analog_sig_source_x_0_0, 0), (self.blocks_multiply_xx_0_0, 0))
         self.connect((self.audio_source_0, 0), (self.blocks_float_to_complex_0, 0))
+        self.connect((self.band_pass_filter_0, 0), (self.blocks_multiply_xx_0, 0))
         self.connect((self.blocks_complex_to_float_0, 0), (self.audio_sink_0, 0))
         self.connect((self.blocks_complex_to_float_1, 0), (self.blocks_wavfile_sink_0, 0))
         self.connect((self.blocks_conjugate_cc_0, 0), (self.blocks_complex_to_float_0, 0))
-        self.connect((self.blocks_float_to_complex_0, 0), (self.blocks_multiply_xx_0, 0))
+        self.connect((self.blocks_float_to_complex_0, 0), (self.band_pass_filter_0, 0))
         self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_conjugate_cc_0, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_complex_to_float_1, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.lora_rx_0, 0))
@@ -126,6 +138,7 @@ def get_tx_rx_bw(self):
 
     def set_tx_rx_bw(self, tx_rx_bw):
         self.tx_rx_bw = tx_rx_bw
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_mix_freq(self):
         return self.tx_rx_mix_freq
@@ -134,6 +147,7 @@ def set_tx_rx_mix_freq(self, tx_rx_mix_freq):
         self.tx_rx_mix_freq = tx_rx_mix_freq
         self.analog_sig_source_x_0.set_frequency((-self.tx_rx_mix_freq))
         self.analog_sig_source_x_0_0.set_frequency(self.tx_rx_mix_freq)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_sf(self):
         return self.tx_rx_sf
@@ -162,6 +176,7 @@ def set_samp_rate(self, samp_rate):
         self.samp_rate = samp_rate
         self.analog_sig_source_x_0.set_sampling_freq(self.samp_rate)
         self.analog_sig_source_x_0_0.set_sampling_freq(self.samp_rate)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
 
 

tup_rdo.grc

@@ -88,7 +88,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [336, 176.0]
+    coordinate: [336, 192.0]
     rotation: 0
     state: true
 - name: audio_sink_0
@@ -124,7 +124,32 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [232, 696.0]
+    coordinate: [152, 696.0]
+    rotation: 0
+    state: enabled
+- name: band_pass_filter_0
+  id: band_pass_filter
+  parameters:
+    affinity: ''
+    alias: ''
+    beta: '6.76'
+    comment: ''
+    decim: '1'
+    gain: '1'
+    high_cutoff_freq: tx_rx_mix_freq + (tx_rx_bw /2) + 1000
+    interp: '1'
+    low_cutoff_freq: tx_rx_mix_freq - (tx_rx_bw /2) - 1000
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    samp_rate: samp_rate
+    type: fir_filter_ccf
+    width: '1000'
+    win: window.WIN_HAMMING
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [552, 548.0]
     rotation: 0
     state: enabled
 - name: blocks_complex_to_float_0
@@ -171,7 +196,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 640.0]
+    coordinate: [736, 624.0]
     rotation: 0
     state: enabled
 - name: blocks_float_to_complex_0
@@ -187,7 +212,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [488, 664.0]
+    coordinate: [392, 664.0]
     rotation: 0
     state: enabled
 - name: blocks_message_strobe_0
@@ -297,7 +322,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     pay_len: '255'
-    print_rx: '[True,True]'
+    print_rx: '[False,True]'
     samp_rate: samp_rate
     sf: tx_rx_sf
     soft_decoding: 'True'
@@ -490,10 +515,11 @@ connections:
 - [analog_sig_source_x_0, '0', blocks_multiply_xx_0, '1']
 - [analog_sig_source_x_0_0, '0', blocks_multiply_xx_0_0, '0']
 - [audio_source_0, '0', blocks_float_to_complex_0, '0']
+- [band_pass_filter_0, '0', blocks_conjugate_cc_0, '0']
 - [blocks_complex_to_float_0, '0', audio_sink_0, '0']
 - [blocks_complex_to_float_0_0, '0', blocks_wavfile_sink_0, '0']
 - [blocks_conjugate_cc_0, '0', blocks_multiply_xx_0, '0']
-- [blocks_float_to_complex_0, '0', blocks_conjugate_cc_0, '0']
+- [blocks_float_to_complex_0, '0', band_pass_filter_0, '0']
 - [blocks_message_strobe_0, strobe, lora_sdr_payload_id_inc_0, msg_in]
 - [blocks_message_strobe_0, strobe, lora_tx_0, in]
 - [blocks_multiply_const_vxx_0, '0', blocks_complex_to_float_0, '0']