FCS packets shown on display for other porotocols

raul-ortega · May 3, 2017 · d33a44f · d33a44f
1 parent 534dd04
commit d33a44f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/src/main/io/display.c b/src/main/io/display.c
@@ -70,6 +70,7 @@ extern int32_t telemetry_lat;
 extern int32_t telemetry_lon;
 extern int16_t telemetry_alt;
 extern int16_t telemetry_sats;
+extern uint8_t telemetry_failed_cs;
 extern positionVector_t targetPosition;
 extern positionVector_t trackerPosition;
 extern bool gotFix;
@@ -632,23 +633,15 @@ void showCliModePage(void)
 }
 
 void showTelemetryPage(void){
-
-	uint16_t chars = 0;
-	uint8_t sentences = 0;
-	uint8_t failed_cs = 0;
-
     uint8_t rowIndex = PAGE_TITLE_LINE_COUNT;
 	i2c_OLED_set_line(rowIndex++);
     if(!PROTOCOL(TP_MFD)) {
-    	if(PROTOCOL(TP_GPS_TELEMETRY)){
-    		TinyGPS_stats(&chars,&sentences,&failed_cs);
-    	}
     	if(telemetry_sats>99)
     		telemetry_sats = 99;
-    	if(PROTOCOL(TP_GPS_TELEMETRY))
-    		tfp_sprintf(lineBuffer, "Sats: %02d     FCS:%d", telemetry_sats,failed_cs);
-    	else
-    		tfp_sprintf(lineBuffer, "Sats: %02d  ", telemetry_sats);
+    	//if(PROTOCOL(TP_GPS_TELEMETRY))
+    	tfp_sprintf(lineBuffer, "Sats: %02d     FCS:%d", telemetry_sats,telemetry_failed_cs);
+    	//else
+    		//tfp_sprintf(lineBuffer, "Sats: %02d  ", telemetry_sats);
 		padLineBuffer();
 		i2c_OLED_set_line(rowIndex++);
 		i2c_OLED_send_string(lineBuffer);

diff --git a/src/main/tracker/frskyd.c b/src/main/tracker/frskyd.c
@@ -274,6 +274,7 @@ void parseTelemHubByte(uint8_t c) {
 		frskyd_setAlt();
 		frskyd_setSats();
 		gotFix = true;
-	}
+	} else
+		telemetry_failed_cs++;
 }
 
diff --git a/src/main/tracker/frskyx.c b/src/main/tracker/frskyx.c
@@ -229,7 +229,8 @@ void processSportPacket(uint8_t *packet)
         }
         if ((NS == 'N' || NS == 'S') && (EW == 'E' || EW == 'W')) {
           gotFix = true;
-        }
+        } else
+        	telemetry_failed_cs++;
       }
       break;
   }

diff --git a/src/main/tracker/ltm.c b/src/main/tracker/ltm.c
@@ -139,8 +139,8 @@ void ltm_encodeTargetData(uint8_t c) {
 	            dataState = IDLE;
 	        }
 	        else {                                                   // wrong checksum, drop packet
-	        dataState = IDLE;
-
+	        	dataState = IDLE;
+	        	telemetry_failed_cs++;
 	        }
 	      }
 	      else LTM_Buffer[LTM_Index++]=c;

diff --git a/src/main/tracker/main.c b/src/main/tracker/main.c
@@ -205,7 +205,7 @@ bool gotAlt;
 bool gotFix;
 bool settingHome;
 bool gotTelemetry=false;
-bool lostTelemetry=false;
+bool lostTelemetry=true;
 
 //TRACKER STATE VARS
 bool homeSet;
@@ -778,8 +778,6 @@ void updateReadTelemetry(void){
 
 		LED0_ON;
 
-
-
 		if(!PROTOCOL(TP_SERVOTEST)) {
 			gotTelemetry = true;
 			lostTelemetry = false;

diff --git a/src/main/tracker/mavlink.c b/src/main/tracker/mavlink.c
@@ -69,6 +69,8 @@ void mavlink_encodeTargetData(uint8_t c) {
   mavlink_message_t msg;
   if (mavlink_parse_char(0, c, &msg, &status)) {
     mavlink_handleMessage(&msg);
+    if (status.parse_error > 0)
+    telemetry_failed_cs++;
   }
 }
 
diff --git a/src/main/tracker/rvosd.c b/src/main/tracker/rvosd.c
@@ -140,6 +140,7 @@ void rvosd_encodeTargetData(uint8_t c) {
     }
     else{
       //needed?
+    	telemetry_failed_cs++;
     }
     frame_started = false;
   }

diff --git a/src/main/tracker/telemetry.c b/src/main/tracker/telemetry.c
@@ -32,6 +32,8 @@ int32_t telemetry_time = 0;
 int32_t telemetry_date = 0;
 int16_t telemetry_age = 0;
 
+uint8_t telemetry_failed_cs = 0;
+
 float telemetry_course = 0.0f;
 float telemetry_speed = 0.0f;
 float telemetry_declination = 0.0f;
@@ -47,6 +49,10 @@ uint8_t a;
 
 uint8_t LOCAL_GPS;
 
+uint16_t chars = 0;
+
+uint8_t sentences = 0;
+
 int32_t getTargetLat() {
   return telemetry_lat;
 }
@@ -64,6 +70,10 @@ uint16_t getSats() {
 }
 
 void encodeTargetData(uint8_t c) {
+
+	uint16_t chars = 0;
+	uint8_t sentences = 0;
+
 	if(PROTOCOL(TP_MFD))
 		mfd_encodeTargetData(c);
 	else if(PROTOCOL(TP_GPS_TELEMETRY))
@@ -83,6 +93,9 @@ void encodeTargetData(uint8_t c) {
 }
 
 void gps_encodeTargetData(uint8_t c) {
+  //if(PROTOCOL(TP_GPS_TELEMETRY)){
+	TinyGPS_stats(&chars,&sentences,&telemetry_failed_cs);
+  //}
   if (TinyGPS_encode(c)) {
     unsigned long fix_age;
     get_position(&telemetry_lat, &telemetry_lon, &fix_age);

diff --git a/src/main/tracker/telemetry.h b/src/main/tracker/telemetry.h
@@ -46,6 +46,7 @@ extern float telemetry_pitch;
 extern float telemetry_roll;
 extern float telemetry_yaw;
 extern uint8_t telemetry_diy_gps;
+extern uint8_t telemetry_failed_cs;
 
 int16_t getTargetAlt();
 void encodeTargetData(uint8_t c);
-Original file line number
+Diff line change
@@ Expand Up / @@ -229,7 +229,8 @@ void processSportPacket(uint8_t *packet) @@
             }
             if ((NS == 'N' || NS == 'S') && (EW == 'E' || EW == 'W')) {
               gotFix = true;
-            }
+            } else
+            	telemetry_failed_cs++;
           }
           break;
       }
@@ Expand Down @@