Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

busunit/DIUv2/diu_main.c

@@ -739,6 +739,11 @@ static void ui_handle_status_input(struct mg_connection *nc, struct http_message
       "stop=%d|"
 
       "gps=%i|"
+      "gpslat=%f|"
+      "gpslon=%f|"
+      "gpsv=%f|"
+      "gpsheading=%f|"
+
       "tunnel=%i|"
       "gprs=%i|"
 
@@ -755,6 +760,11 @@ static void ui_handle_status_input(struct mg_connection *nc, struct http_message
       stop_stat.stop,
 
       gps_stat.gps_good,
+      gps_stat.lat,
+      gps_stat.lon,
+      gps_stat.velocity,
+      gps_stat.heading,
+
       tunnel_is_up(),
       gprs_is_up(),
 

busunit/DIUv2/html/js/diu_ui-ORG.js

@@ -540,15 +540,20 @@ function _cb_status(inp) {
   var m = g_ctx.diu_status;
   if (g_ctx.current_ui === "ui_login") {
 
-    has_tunn = ((m["tunnel"] == '1') ? 'YES' : 'NO');
-    has_gprs = ((m["gprs"] == '1') ? 'YES' : 'NO');
-    has_gps = ((m["gps"] == '1') ? 'YES' : 'NO');
+    var has_tunn = ((m["tunnel"] == '1') ? 'YES' : 'NO');
+    var has_gprs = ((m["gprs"] == '1') ? 'YES' : 'NO');
+    var has_gps = ((m["gps"] == '1') ? 'YES' : 'NO');
+
+    var lat = ((typeof m["gpslat"] !== "undefined") ? m["gpslat"] : "");
+    var lon = ((typeof m["gpslon"] !== "undefined") ? m["gpslon"] : "");
+
+    var gps_str = ( ((lat.length>0) && (lon.length>0)) ?  (" (" + lat + "/" + lon + ")") : "" );
 
     var ele = document.getElementById("ui_login_status");
     var str = "";
     str += "Tunnel: " + has_tunn + "  GPRS: " + has_gprs + "  Eq#: " + m["equipno"] + "  #Msg: " + m["nmsg"] + "\n";
     str += "Last Token Read (" + m["last_token"] + ")\n";
-    str += "GPS: " + has_gps + "\n";
+    str += "GPS: " + has_gps + gps_str + "\n";
     str += "\n";
     //      012345678012345678901234567890
     str += "Package   Version   Installed\n";
@@ -583,6 +588,10 @@ function _cb_status_err(e) {
 
 //-------------
 
+function _main_message_clear() {
+  g_ctx.status_text = "";
+}
+
 function _main_message_replace(msg, bg_color, text_color) {
   var ele = document.getElementById("ui_main_status");
   g_ctx.status_text_w = ele.cols;
@@ -976,6 +985,7 @@ function init() {
   document.getElementById('ui_fareoverride_menu').onclick = function() { _switch_ui("ui_main"); }
   document.getElementById('ui_fareoverride_logout').onclick =
     function() {
+      _main_message_clear();
       _api_request("logout");
       _switch_ui("ui_login");
     }