Update README.md added ax25 and satellite decoder

.gitignore

@@ -0,0 +1,2 @@
+./output/recordingASMGolay.wav
+./output/recordingAX25.wav

IRIS.yml

@@ -7,9 +7,9 @@ data:
     telemetry: csp
 transmitters:
   9k6 FSK downlink:
-    frequency: 145e+6
+    frequency: 145e+6 # not needed
     modulation: FSK
     baudrate: 9600
-    framing: AX100 Reed Solomon
+    framing: AX100 ASM+Golay
     data:
     - *tlm

IRIS_AX25.yml

@@ -0,0 +1,15 @@
+name: IRIS
+alternative_names:
+  - ManitobaSats-1
+norad: 42734
+data:
+  &tlm Telemetry:
+    telemetry: csp
+transmitters:
+  9k6 FSK downlink:
+    frequency: 145e+6
+    modulation: FSK
+    baudrate: 9600
+    framing: AX.25 G3RUH
+    data:
+    - *tlm

README.md

@@ -1,5 +1,5 @@
 # CommsSDR
-This repository contains the files for using GNU Radio
+This repository contains the files for using GNU Radio. Note: recordings are on the drive due to large file sizes.
 
 ## Setup
 ### GNU Radio
@@ -8,6 +8,25 @@ This repository contains the files for using GNU Radio
 ### GR Satellites
 [Install gr-satellites](https://github.com/daniestevez/gr-satellites). Using their [documentation](https://gr-satellites.readthedocs.io/en/latest/).
 
+### Osmocom
+[Install Osmocom](https://osmocom.org/) for getting the data from the HackRF to GNURadio.
+
+### Python 3
+Python 3 is required to run the GNURadio programs.
+If you have an issue with modules not found, execute the lines in the terminal in addPythonPaths.txt with the correct file locations for gr-satellites.
+
+## Folders:
+### Rx
+This folder contains GNURadio files for receiving radio messages. Currently it is set to receive at 145 MHz. It saves recordings and output files to /output. It will show the waterfall/frequency spectrum in a window.
+
+### WavProcessing
+This folder contains files for reading Wav files.
+
+### Examples
+Examples that Iris did not create are put here.
+
+If built from source and you are having issues with gr satellites blocks after updating, run the building and installing section of the documentation again.
+
 ## Test1SDR.grc
 Test1SDR.grc is the current working GNU Radio Companion file. 
 It relies on the [satellite decoder from GR Satellites](https://github.com/daniestevez/gr-satellites/tree/main/examples/satellite_decoder). 

WavProcessing/ax25wav_parser.py → Rx/direct_parser.py

@@ -6,9 +6,9 @@
 #
 # GNU Radio Python Flow Graph
 # Title: Not titled yet
-# GNU Radio version: 3.9.4.0
+# GNU Radio version: 3.10.2.0
 
-from distutils.version import StrictVersion
+from packaging.version import Version as StrictVersion
 
 if __name__ == '__main__':
     import ctypes
@@ -25,24 +25,24 @@
 from gnuradio.filter import firdes
 import sip
 from gnuradio import blocks
-import pmt
 from gnuradio import digital
-from gnuradio import filter
 from gnuradio import gr
 from gnuradio.fft import window
 import sys
 import signal
 from argparse import ArgumentParser
 from gnuradio.eng_arg import eng_float, intx
 from gnuradio import eng_notation
+import osmosdr
+import time
 import satellites.components.datasinks
 import satellites.components.deframers
 
 
 
 from gnuradio import qtgui
 
-class ax25wav_parser(gr.top_block, Qt.QWidget):
+class direct_parser(gr.top_block, Qt.QWidget):
 
     def __init__(self):
         gr.top_block.__init__(self, "Not titled yet", catch_exceptions=True)
@@ -65,7 +65,7 @@ def __init__(self):
         self.top_grid_layout = Qt.QGridLayout()
         self.top_layout.addLayout(self.top_grid_layout)
 
-        self.settings = Qt.QSettings("GNU Radio", "ax25wav_parser")
+        self.settings = Qt.QSettings("GNU Radio", "direct_parser")
 
         try:
             if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
@@ -78,20 +78,18 @@ def __init__(self):
         ##################################################
         # Variables
         ##################################################
-        self.transition_bw = transition_bw = 1000
         self.samp_rate = samp_rate = 2.4e6
-        self.decimation = decimation = 20
 
         ##################################################
         # Blocks
         ##################################################
-        self.satellites_telemetry_parser_0 = satellites.components.datasinks.telemetry_parser('gomx_1', file = '/home/jonathan/CommsSDR/output/output_AX25.txt', options="")
-        self.satellites_ax25_deframer_0 = satellites.components.deframers.ax25_deframer(g3ruh_scrambler=True, options="")
+        self.satellites_telemetry_parser_0 = satellites.components.datasinks.telemetry_parser('gomx_1', file = '/home/jonathan/CommsSDR/output/output_AX100.txt', options="")
+        self.satellites_ax100_deframer_0 = satellites.components.deframers.ax100_deframer(mode = "ASM", scrambler = "CCSDS", syncword_threshold = 0, options="")
         self.qtgui_waterfall_sink_x_0 = qtgui.waterfall_sink_c(
             1024, #size
             window.WIN_BLACKMAN_hARRIS, #wintype
             0, #fc
-            120000, #bw
+            samp_rate, #bw
             "", #name
             1, #number of inputs
             None # parent
@@ -212,7 +210,21 @@ def __init__(self):
 
         self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.qwidget(), Qt.QWidget)
         self.top_layout.addWidget(self._qtgui_freq_sink_x_0_win)
-        self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(decimation,  firdes.complex_band_pass(1, samp_rate, -samp_rate/(2*decimation), samp_rate/(2*decimation), transition_bw), 0, samp_rate)
+        self.osmosdr_source_0 = osmosdr.source(
+            args="numchan=" + str(1) + " " + ""
+        )
+        self.osmosdr_source_0.set_time_unknown_pps(osmosdr.time_spec_t())
+        self.osmosdr_source_0.set_sample_rate(samp_rate)
+        self.osmosdr_source_0.set_center_freq(145000000, 0)
+        self.osmosdr_source_0.set_freq_corr(0, 0)
+        self.osmosdr_source_0.set_dc_offset_mode(0, 0)
+        self.osmosdr_source_0.set_iq_balance_mode(0, 0)
+        self.osmosdr_source_0.set_gain_mode(False, 0)
+        self.osmosdr_source_0.set_gain(10, 0)
+        self.osmosdr_source_0.set_if_gain(20, 0)
+        self.osmosdr_source_0.set_bb_gain(20, 0)
+        self.osmosdr_source_0.set_antenna('', 0)
+        self.osmosdr_source_0.set_bandwidth(0, 0)
         self.digital_gfsk_demod_0 = digital.gfsk_demod(
             samples_per_symbol=2,
             sensitivity=1.0,
@@ -225,63 +237,49 @@ def __init__(self):
         self.blocks_uchar_to_float_0 = blocks.uchar_to_float()
         self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*1, samp_rate,True)
         self.blocks_message_debug_0 = blocks.message_debug(True)
-        self.blocks_file_source_0 = blocks.file_source(gr.sizeof_gr_complex*1, '/home/jonathan/CommsSDR/output/recordingAX25.wav', True, 0, 0)
-        self.blocks_file_source_0.set_begin_tag(pmt.PMT_NIL)
-
+        self.blocks_file_sink_1 = blocks.file_sink(gr.sizeof_gr_complex*1, '/home/jonathan/CommsSDR/output/RecordingIris1.wav', False)
+        self.blocks_file_sink_1.set_unbuffered(False)
 
 
         ##################################################
         # Connections
         ##################################################
-        self.msg_connect((self.satellites_ax25_deframer_0, 'out'), (self.blocks_message_debug_0, 'print'))
-        self.msg_connect((self.satellites_ax25_deframer_0, 'out'), (self.blocks_message_debug_0, 'print_pdu'))
-        self.msg_connect((self.satellites_ax25_deframer_0, 'out'), (self.satellites_telemetry_parser_0, 'in'))
-        self.connect((self.blocks_file_source_0, 0), (self.blocks_throttle_0, 0))
-        self.connect((self.blocks_throttle_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
+        self.msg_connect((self.satellites_ax100_deframer_0, 'out'), (self.blocks_message_debug_0, 'print'))
+        self.msg_connect((self.satellites_ax100_deframer_0, 'out'), (self.blocks_message_debug_0, 'print_pdu'))
+        self.msg_connect((self.satellites_ax100_deframer_0, 'out'), (self.satellites_telemetry_parser_0, 'in'))
+        self.connect((self.blocks_throttle_0, 0), (self.blocks_file_sink_1, 0))
+        self.connect((self.blocks_throttle_0, 0), (self.digital_gfsk_demod_0, 0))
         self.connect((self.blocks_throttle_0, 0), (self.qtgui_freq_sink_x_0, 0))
+        self.connect((self.blocks_throttle_0, 0), (self.qtgui_waterfall_sink_x_0, 0))
         self.connect((self.blocks_uchar_to_float_0, 0), (self.qtgui_time_sink_x_0, 0))
-        self.connect((self.blocks_uchar_to_float_0, 0), (self.satellites_ax25_deframer_0, 0))
+        self.connect((self.blocks_uchar_to_float_0, 0), (self.satellites_ax100_deframer_0, 0))
         self.connect((self.digital_gfsk_demod_0, 0), (self.blocks_uchar_to_float_0, 0))
-        self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.digital_gfsk_demod_0, 0))
-        self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.qtgui_waterfall_sink_x_0, 0))
+        self.connect((self.osmosdr_source_0, 0), (self.blocks_throttle_0, 0))
 
 
     def closeEvent(self, event):
-        self.settings = Qt.QSettings("GNU Radio", "ax25wav_parser")
+        self.settings = Qt.QSettings("GNU Radio", "direct_parser")
         self.settings.setValue("geometry", self.saveGeometry())
         self.stop()
         self.wait()
 
         event.accept()
 
-    def get_transition_bw(self):
-        return self.transition_bw
-
-    def set_transition_bw(self, transition_bw):
-        self.transition_bw = transition_bw
-        self.freq_xlating_fir_filter_xxx_0.set_taps( firdes.complex_band_pass(1, self.samp_rate, -self.samp_rate/(2*self.decimation), self.samp_rate/(2*self.decimation), self.transition_bw))
-
     def get_samp_rate(self):
         return self.samp_rate
 
     def set_samp_rate(self, samp_rate):
         self.samp_rate = samp_rate
         self.blocks_throttle_0.set_sample_rate(self.samp_rate)
-        self.freq_xlating_fir_filter_xxx_0.set_taps( firdes.complex_band_pass(1, self.samp_rate, -self.samp_rate/(2*self.decimation), self.samp_rate/(2*self.decimation), self.transition_bw))
+        self.osmosdr_source_0.set_sample_rate(self.samp_rate)
         self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate)
         self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate)
-
-    def get_decimation(self):
-        return self.decimation
-
-    def set_decimation(self, decimation):
-        self.decimation = decimation
-        self.freq_xlating_fir_filter_xxx_0.set_taps( firdes.complex_band_pass(1, self.samp_rate, -self.samp_rate/(2*self.decimation), self.samp_rate/(2*self.decimation), self.transition_bw))
+        self.qtgui_waterfall_sink_x_0.set_frequency_range(0, self.samp_rate)
 
 
 
 
-def main(top_block_cls=ax25wav_parser, options=None):
+def main(top_block_cls=direct_parser, options=None):
 
     if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
         style = gr.prefs().get_string('qtgui', 'style', 'raster')