diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..b5e5103
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+#Ignore the following files that may be created during the build process
+.qmake.stash
+*.o
+*.mk
+*.so.*
+*/x86/*
+*.html
+*.markdown
+Communications/OrionPublicPacket.*
+Communications/OrionPublicProtocol.h
+Communications/compare/
+Communications/fielddecode.*
+Communications/fieldencode.*
+Communications/floatspecial.*
+Communications/release/
+Communications/scaleddecode.*
+Communications/scaledencode.*
\ No newline at end of file
diff --git a/Communications/OrionPublicProtocol.xml b/Communications/OrionPublicProtocol.xml
index c5e9e50..09b2f3b 100644
--- a/Communications/OrionPublicProtocol.xml
+++ b/Communications/OrionPublicProtocol.xml
@@ -113,7 +113,7 @@ See TrilliumPacket.c (in the Orion SDK) for details.
-
+
@@ -129,7 +129,7 @@ See TrilliumPacket.c (in the Orion SDK) for details.
-
+
@@ -140,7 +140,7 @@ See TrilliumPacket.c (in the Orion SDK) for details.
-
+
@@ -225,7 +225,8 @@ See TrilliumPacket.c (in the Orion SDK) for details.
-
+
+
@@ -354,6 +355,7 @@ See TrilliumPacket.c (in the Orion SDK) for details.
+
@@ -487,6 +489,23 @@ See TrilliumPacket.c (in the Orion SDK) for details.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -513,6 +532,20 @@ See TrilliumPacket.c (in the Orion SDK) for details.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -788,6 +821,7 @@ See TrilliumPacket.c (in the Orion SDK) for details.
+
@@ -868,6 +902,47 @@ See TrilliumPacket.c (in the Orion SDK) for details.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Examples/VideoPlayer/StreamDecoder.c b/Examples/VideoPlayer/StreamDecoder.c
index 1beafd9..9f7edea 100644
--- a/Examples/VideoPlayer/StreamDecoder.c
+++ b/Examples/VideoPlayer/StreamDecoder.c
@@ -88,6 +88,8 @@ int StreamOpen(const char *pUrl, const char *pRecordPath)
// Add a stream header if the output format calls for it
if (pOutputContext->oformat->flags & AVFMT_GLOBALHEADER)
pStream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ // if running more recent version of ffmpeg, uncomment line below, and comment line above
+ //pStream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
}
// Open the record file and write the header out
diff --git a/GenerateOrionPublicPacket.sh b/GenerateOrionPublicPacket.sh
index efea4e1..17ddf36 100755
--- a/GenerateOrionPublicPacket.sh
+++ b/GenerateOrionPublicPacket.sh
@@ -1,4 +1,15 @@
-#!/bin/sh
+#!/bin/bash
+
+# Do a quick system version check and spit a warning if we are greater than the last verified buildable version
+# Ensure this is updated once verified for OS version
+Var=$(lsb_release -r)
+NumOnly=$(cut -f2 <<< "$Var")
+VersionMajor=$(($(cut -d'.' -f1 <<< "$NumOnly")))
+VersionMinor=$(($(cut -d'.' -f2 <<< "$NumOnly")))
+if [ $VersionMajor -gt 18 ]
+then
+ echo "orionSDK hasn't been verified to build on $Var"
+fi
ROOT_DIR=`dirname $0`
diff --git a/Protogen/Linux/aarch64/fix_protogen_links.sh b/Protogen/Linux/aarch64/fix_protogen_links.sh
new file mode 100755
index 0000000..6e9186a
--- /dev/null
+++ b/Protogen/Linux/aarch64/fix_protogen_links.sh
@@ -0,0 +1,6 @@
+# create links to the necessary libraries if the build fails
+
+ln -s libicudata.so libicudata.so.60
+ln -s libicui18n.so libicui18n.so.60
+ln -s libicuuc.so libicuuc.so.60
+ln -s /usr/lib/aarch64-linux-gnu/libdouble-conversion.so.3 libdouble-conversion.so.1
\ No newline at end of file
diff --git a/Utils/GeolocateTelemetry.h b/Utils/GeolocateTelemetry.h
index 5f588b1..ee157c0 100644
--- a/Utils/GeolocateTelemetry.h
+++ b/Utils/GeolocateTelemetry.h
@@ -79,7 +79,7 @@ typedef struct
//! Slant range to target in meters
float slantRange;
- //! Image position in ECEF and LLA coordinates
+ //! Image position in ECEF and LLA coordinates (HAE Alt)
double imagePosECEF[NECEF];
double imagePosLLA[NLLA];