reword log damage message, revise ltm timeout

stronnag · Dec 15, 2024 · 09cb43e · 09cb43e
1 parent 6ff61f3
commit 09cb43e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/src/mwp/mwp-bb_dialog.vala b/src/mwp/mwp-bb_dialog.vala
@@ -528,7 +528,7 @@ namespace BBL {
 								if (BBLError.warn) {
 									BBLError.lines += "\u200b\n"; //zero-width space to force NL
 								}
-								BBLError.lines += "NOTICE: Log segment #%d is corrupt\n".printf(nidx);
+								BBLError.lines += "NOTICE: Log segment #%d is damaged or ancient\n".printf(nidx);
 								BBLError.warn = true;
 							} else if (line.contains("Warning:") || line.contains("Error:")) {
 								BBLError.lines += line;

diff --git a/src/mwp/mwp-enums.vala b/src/mwp/mwp-enums.vala
@@ -29,8 +29,8 @@ namespace Mwp {
 
 	const uint TIMINTVL     = 100;              // 100 milliseconds
 	const uint STATINTVL    = ( 1000/TIMINTVL); //  1 sec, status update
-	const uint MAVINTVL     = ( 2000/TIMINTVL); //  2 sec, push telemetry t/o
 	const uint USATINTVL    = ( 2000/TIMINTVL); //  2 sec, change in sats message
+	const uint MAVINTVL     = ( 2500/TIMINTVL); //  2.5 sec, push telemetry t/o
 	const uint CRITINTVL    = ( 3000/TIMINTVL); //  3 sec, GPS critical message
 	const uint UUSATINTVL   = ( 4000/TIMINTVL); //  4 sec, change in sats message
 	const uint NODATAINTVL  = ( 5000/TIMINTVL); //  5 sec, no data warning
@@ -82,7 +82,7 @@ namespace Mwp {
 		SET_WP,
 		EXTRA_WP,
 		MISC_BULK,
-        TELEM = 128,
+        TELEM,
         TELEM_SP,
     }
 

diff --git a/src/mwp/mwp-handle_mspmsg.vala b/src/mwp/mwp-handle_mspmsg.vala
@@ -1601,10 +1601,6 @@ namespace Mwp {
                 want_special = 0;
                 MWPLog.message("%s %s\n", Mwp.window.verlab.label, Mwp.window.typlab.label);
 
-                if(replayer == Player.NONE) {
-                    MWPLog.message("switch val == %08x (%08x)\n", bxflag, lmask);
-                }
-
                 var reqsize = build_pollreqs();
                 var nreqs = requests.length;
                     // data we send, response is structs + this

diff --git a/src/mwp/mwp-handle_serial.vala b/src/mwp/mwp-handle_serial.vala
@@ -303,15 +303,15 @@ namespace Mwp {
                 msp.send_command((uint16)lastmsg.cmd, lastmsg.data, lastmsg.len);
             } else
                 run_queue();
-        }
+		}
     }
 
      void  run_queue() {
         if((replayer & (Player.BBOX|Player.OTX|Player.RAW)) != 0) {
             mq.clear();
         } else if(msp.available && !mq.is_empty()) {
-            lastmsg = mq.pop_head();
-            msp.send_command((uint16)lastmsg.cmd, lastmsg.data, lastmsg.len);
+			lastmsg = mq.pop_head();
+			msp.send_command((uint16)lastmsg.cmd, lastmsg.data, lastmsg.len);
         }
     }
 
@@ -490,6 +490,7 @@ namespace Mwp {
     }
 
     private void reset_poller() {
+		MWPLog.message(":DBG: Reset Poller\n");
 		if(starttasks == 0) {
 			lastok = nticks;
 			if(serstate != SERSTATE.NONE && serstate != SERSTATE.TELEM) {
@@ -571,12 +572,16 @@ namespace Mwp {
         } else {
 			seenMSP = true;
 			telem = false;
+			last_tm = 0;
 			handled = Mwp.handle_msp(ser, cmd, raw, len, xflags, errs);
 		}
-		if(telem && last_tm == 0) {
-			telem_init(cmd);
+		if(telem) {
+			if(last_tm == 0) {
+				telem_init(cmd);
+			} else {
+				last_tm = nticks;
+			}
 		}
-
 		if(!handled) {
 			show_unhandled(cmd, raw, len);
         }

diff --git a/src/mwp/mwp-ltm_message.vala b/src/mwp/mwp-ltm_message.vala
@@ -16,11 +16,11 @@
  */
 
 namespace Mwp {
+
 	bool handle_ltm(MWSerial ser, Msp.Cmds cmd, uint8[]raw, uint len) {
 		bool handled = true;
 		lastrx = nticks;
 		Mwp.window.mmode.label = "LTM";
-
 		switch(cmd) {
 		case Msp.Cmds.TO_FRAME:
 			LTM_OFRAME of = LTM_OFRAME();