[fbw_gps] IMCU_GPS_ID update

paparazzi · Oct 6, 2016 · e6000b5 · e6000b5
1 parent 7404f39
commit e6000b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/sw/airborne/subsystems/abi_sender_ids.h b/sw/airborne/subsystems/abi_sender_ids.h
@@ -170,16 +170,16 @@
 #define GPS_SIM_ID 11
 #endif
 
-#ifndef GPS_IMCU_ID
-#define GPS_IMCU_ID 12
-#endif
-
 #ifndef GPS_MULTI_ID
-#define GPS_MULTI_ID 13
+#define GPS_MULTI_ID 12
 #endif
 
 #ifndef GPS_VECTORNAV_ID
-#define GPS_VECTORNAV_ID 14
+#define GPS_VECTORNAV_ID 13
+#endif
+
+#ifndef GPS_IMCU_ID
+#define GPS_IMCU_ID 14
 #endif
 
 /*

diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.c b/sw/airborne/subsystems/intermcu/intermcu_ap.c
@@ -164,16 +164,6 @@ static inline void intermcu_parse_msg(void (*rc_frame_handler)(void))
       break;
     }
 
-#if TELEMETRY_INTERMCU
-    case DL_IMCU_DATALINK: {
-      uint8_t size = DL_IMCU_DATALINK_msg_length(imcu_msg_buf);
-      uint8_t *msg = DL_IMCU_DATALINK_msg(imcu_msg_buf);
-      telemetry_intermcu_on_msg(0, msg, size);
-      break;
-    }
-
-#endif
-
 #if IMCU_GPS
     case DL_IMCU_REMOTE_GPS: {
       uint32_t now_ts = get_sys_time_usec();