Merge branch 'master' into fc

6 months ago · 537e6621b9
parent 4f81dd82be c847128886
commit 537e6621b9
4 changed files with 175 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ There are several hardware versions and software branches to go with them - see

 See the Wiki Software Install page for more details: https://github.com/alanbjohnston/CubeSatSim/wiki/2.-Software-Install. The software runs on any Raspberry Pi including the Raspberry Pi 4B, 3B, 3B+, Pi Zero, Pi Zero W, or Pi Zero 2 W.

-There are two ways to get the CubeSatSim software for your Pi.
+There are two ways to get the CubeSatSim(TM) software for your Pi.

 One option is to download the disk image file and write it to a 16GB micro SD card or larger.  The image is based on Raspberry Pi OS (Rasbian) Lite, dated December 2020. All software is installed, you just need to login to change your password and set your amateur radio callsign if you have one.  You can run the ./update.sh script to update all packages and update and compile the latest CubeSatSim software.

--- a/groundstation/frequency_manager_config.json
+++ b/groundstation/frequency_manager_config.json
@ -0,0 +1,171 @@
+{
+    "bookmarkDisplayMode": 1,
+    "lists": {
+        "General": {
+            "bookmarks": {
+                "AO-73": {
+                    "bandwidth": 5000.0,
+                    "frequency": 145935000.0,
+                    "mode": 4
+                },
+                "APRS Packet": {
+                    "bandwidth": 12500.0,
+                    "frequency": 144390000.0,
+                    "mode": 0
+                },
+                "ATC Clearance Delivery": {
+                    "bandwidth": 12500.0,
+                    "frequency": 118850000.0,
+                    "mode": 2
+                },
+                "ATC Ground East": {
+                    "bandwidth": 12500.0,
+                    "frequency": 121900000.0,
+                    "mode": 2
+                },
+                "ATC Ground West": {
+                    "bandwidth": 12500.0,
+                    "frequency": 121650000.0,
+                    "mode": 2
+                },
+                "ATC Local East": {
+                    "bandwidth": 12500.0,
+                    "frequency": 118500000.0,
+                    "mode": 2
+                },
+                "ATC Local West": {
+                    "bandwidth": 12500.0,
+                    "frequency": 135100000.0,
+                    "mode": 2
+                },
+                "CAS-4A": {
+                    "bandwidth": 5000.0,
+                    "frequency": 145836000.0,
+                    "mode": 4
+                },
+                "CAS-4B": {
+                    "bandwidth": 5000.0,
+                    "frequency": 145893000.0,
+                    "mode": 4
+                },
+                "CubeSatSim": {
+                    "bandwidth": 12500.0,
+                    "frequency": 434900000.0,
+                    "mode": 0
+                },
+                "Ham APRS": {
+                    "bandwidth": 12500.0,
+                    "frequency": 144390000.0,
+                    "mode": 2
+                },
+                "Ham Beacon PHL": {
+                    "bandwidth": 3000.0,
+                    "frequency": 144272000.0,
+                    "mode": 4
+                },
+                "Ham Cherry Hill": {
+                    "bandwidth": 201869.15625,
+                    "frequency": 145370000.0,
+                    "mode": 0
+                },
+                "Ham Munroe": {
+                    "bandwidth": 12500.0,
+                    "frequency": 145390000.0,
+                    "mode": 0
+                },
+                "Ham Newtown": {
+                    "bandwidth": 12500.0,
+                    "frequency": 147060000.0,
+                    "mode": 0
+                },
+                "Ham Paoli": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 145130000.0,
+                    "mode": 0
+                },
+                "ISS": {
+                    "bandwidth": 5000.0,
+                    "frequency": 437800000.0,
+                    "mode": 0
+                },
+                "ISS-SSTV": {
+                    "bandwidth": 5000.0,
+                    "frequency": 145800000.0,
+                    "mode": 0
+                },
+                "NOAA Allentown": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 162400000.0,
+                    "mode": 0
+                },
+                "NOAA Harrisburg": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 162550000.0,
+                    "mode": 0
+                },
+                "NOAA Hiburnia Park": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 162425000.0,
+                    "mode": 0
+                },
+                "NOAA PHL": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 162475000.0,
+                    "mode": 0
+                },
+                "NOAA Sudlersville": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 162500000.0,
+                    "mode": 0
+                },
+                "PHL": {
+                    "bandwidth": 12500.0,
+                    "frequency": 133275000.0,
+                    "mode": 2
+                },
+                "PHL 2": {
+                    "bandwidth": 12500.0,
+                    "frequency": 133475000.0,
+                    "mode": 2
+                },
+                "PHL 3": {
+                    "bandwidth": 12500.0,
+                    "frequency": 133500000.0,
+                    "mode": 2
+                },
+                "PHL 5": {
+                    "bandwidth": 12500.0,
+                    "frequency": 133575000.0,
+                    "mode": 2
+                },
+                "PHL 6": {
+                    "bandwidth": 12500.0,
+                    "frequency": 134600000.0,
+                    "mode": 2
+                },
+                "PHL 7": {
+                    "bandwidth": 12500.0,
+                    "frequency": 135450000.0,
+                    "mode": 2
+                },
+                "PHL 8": {
+                    "bandwidth": 12500.0,
+                    "frequency": 128795000.0,
+                    "mode": 2
+                },
+                "PHL Automated": {
+                    "bandwidth": 18495.533203125,
+                    "frequency": 133400000.0,
+                    "mode": 0
+                },
+                "The Roar WXVL": {
+                    "bandwidth": 201869.15625,
+                    "frequency": 89100000.0,
+                    "mode": 1
+                }
+            },
+            "showOnWaterfall": true
+        }
+    },
+    "selectedList": "General"
+}
--- a/hardware/frame/v2.0/plug_circle_24.stl
+++ b/hardware/frame/v2.0/plug_circle_24.stl
--- a/transmit.py
+++ b/transmit.py
@ -835,6 +835,9 @@ if __name__ == "__main__":
 #					system("arecord -D plughw:CARD=Device,DEV=0  | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
 ##					system("arecord -D plughw:CARD=Device,DEV=0 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
 					system("sudo nc -l 8011 | csdr convert_i16_f | csdr gain_ff 16000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1 &")
+					sleep(1)
+					system("sudo arecord -D plughw:CARD=Device,DEV=0 -r48000 -fS16_LE -c1 | nc localhost 8011 &")
+					GPIO.output(powerPin, 1)
 					sleep(0.5)
 #					system("sudo arecord -D plughw:1 -r48000 -fS16_LE -c1 | nc localhost 8011 &")
 					system("sudo arecord -D shared_mic -r48000 -fS16_LE -c1 | nc localhost 8011 &")