From 6c7629f50e518cc462e23ade5ea9eff426ab1eb8 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 25 Jan 2016 22:26:37 +0000 Subject: [PATCH] changed callsign for Jan 26 launch and added option for telemetry upload to habhub git-svn-id: https://svn.code.sf.net/p/freetel/code@2656 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/octave/fsk_horus_stream.m | 12 +++++++++--- codec2-dev/octave/telem_upload.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/codec2-dev/octave/fsk_horus_stream.m b/codec2-dev/octave/fsk_horus_stream.m index 8311feee..f454d456 100755 --- a/codec2-dev/octave/fsk_horus_stream.m +++ b/codec2-dev/octave/fsk_horus_stream.m @@ -38,7 +38,15 @@ end mFSK = str2num(arg_list{1}); Rs = str2num(arg_list{2}); -printf ("\nmFSK: %d Rs: %d\n", mFSK, Rs); +if nargin == 3 + % Optionally upload Telemetry to Habitat (http://tracker.habhub.org/) + if strcmp(arg_list{3}, "telem") + telem_upload_enabled = true; + else + telem_upload_enabled = false; + end +end +printf ("\nmFSK: %d Rs: %d nargin: %d telem: %d\n", mFSK, Rs, nargin, telem_upload_enabled); % include modem library @@ -48,8 +56,6 @@ fsk_horus; gps_log = "~/Desktop/gps_log.txt" system_command = "echo -n \"/home/david/Desktop/gps_log.txt\" | nc -u -q1 127.0.0.1 21234"; -% Upload Telemetry to Habitat (http://tracker.habhub.org/) -telem_upload_enabled = false; % Update this command with your own callsign. telem_upload_command = "python telem_upload.py -c vk5dgr_Octave"; diff --git a/codec2-dev/octave/telem_upload.py b/codec2-dev/octave/telem_upload.py index e368b421..ada35a75 100644 --- a/codec2-dev/octave/telem_upload.py +++ b/codec2-dev/octave/telem_upload.py @@ -131,7 +131,7 @@ uploader_callsign = args.callsign raw_data = args.raw_data print(raw_data) -if raw_data.startswith("HORUS"): +if raw_data.startswith("AX5ARG"): # Assume the data is a standard telemetry string and just upload it. # Append a Newline and checksum (if not alread there) to the end, and "$$"'s to the start. if not '*' in raw_data: -- 2.25.1