Merge branch 'master' into testing

auto_rx/autorx/__init__.py

@@ -5,7 +5,9 @@
 #   Copyright (C) 2018  Mark Jessop <vk5qi@rfhead.net>
 #   Released under GNU GPL v3 or later
 #
-__version__ = "20190317-beta"
+
+__version__ = "20190322-beta"
+
 
 # Global Variables
 

m10/M10TrimbleParser.cpp

@@ -443,7 +443,7 @@ void M10TrimbleParser::printFrame() {
         // Aux data tag if the payload lenght is long
         std::string auxstr = "";
         if (frame_bytes[0x00] != 0x64) {
-            auxstr = "\"aux\": -1, ";
+            auxstr = "\"aux\": \"not_supported_yet\", ";
         }
 
         // Decoder sensible to comma at the end, strict json