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

diff --git a/codec2-dev/octave/fsk_horus_stream.m b/codec2-dev/octave/fsk_horus_stream.m
index 8311feeee6e63e955cdc7a887846dd3c8bd96538..f454d45604af545550ac944200cd5d869193729f 100755 (executable)
--- 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 e368b4211f1cf811a84cabae5a5107a5df8188bc..ada35a750157e89a1326b399b1d615e749593cea 100644 (file)
--- 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: