UBX: revert end of cycle change, but make regression changes.

2 steps forward, one step back. Changing cycle end for UBX broke old UBX samples. Reverting that change breaks the new ECEF, that will need more work. Fixing when a UBX cycle is cleared broke the UBX regression tests, but the old way was wrong. So update the regression tests.
andersson · Feb 10, 2018 · a98c6a3 · a98c6a3
1 parent de63152
commit a98c6a3
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 190 deletions.
diff --git a/driver_ubx.c b/driver_ubx.c
@@ -672,8 +672,8 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
     case UBX_NAV_SOL:
         /* UBX-NAV-SOL deprecated, use UBX-NAV-PVT instead */
 	gpsd_log(&session->context->errout, LOG_PROG, "UBX_NAV_SOL\n");
-	mask =
-	    ubx_msg_nav_sol(session, &buf[UBX_PREFIX_LEN], data_len);
+	mask = ubx_msg_nav_sol(session, &buf[UBX_PREFIX_LEN], data_len)
+	     | REPORT_IS;
 	break;
     case UBX_NAV_PVT:
 	gpsd_log(&session->context->errout, LOG_PROG, "UBX_NAV_PVT\n");
@@ -684,8 +684,7 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
 	break;
     case UBX_NAV_VELECEF:
 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_VELECEF\n");
-	mask = ubx_msg_nav_velecef(session, &buf[UBX_PREFIX_LEN], data_len)
-	     | REPORT_IS;
+	mask = ubx_msg_nav_velecef(session, &buf[UBX_PREFIX_LEN], data_len);
 	break;
     case UBX_NAV_VELNED:
 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_VELNED\n");