Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 15:30:08 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

[gps_ubx] separate GPS_UBX_NB_CHANNELS for raw measurements

Browse Source
This commit is contained in:
Felix Ruess
2016-01-28 22:06:44 +01:00
committed by masierra
parent aaa0d2a259
commit 95f2b47b15
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/subsystems/gps/gps_ubx.c
+2 -1
View File
@@ -175,7 +175,8 @@ void gps_ubx_read_message(void)
gps_ubx_raw.week = UBX_RXM_RAW_week(gps_ubx.msg_buf); gps_ubx_raw.week = UBX_RXM_RAW_week(gps_ubx.msg_buf);
gps_ubx_raw.numSV = UBX_RXM_RAW_numSV(gps_ubx.msg_buf); gps_ubx_raw.numSV = UBX_RXM_RAW_numSV(gps_ubx.msg_buf);
uint8_t i; uint8_t i;
for (i = 0; i < gps_ubx_raw.numSV; i++) { uint8_t max_SV = Min(gps_ubx_raw.numSV, GPS_UBX_NB_CHANNELS);
for (i = 0; i < max_SV; i++) {
gps_ubx_raw.measures[i].cpMes = UBX_RXM_RAW_cpMes(gps_ubx.msg_buf, i); gps_ubx_raw.measures[i].cpMes = UBX_RXM_RAW_cpMes(gps_ubx.msg_buf, i);
gps_ubx_raw.measures[i].prMes = UBX_RXM_RAW_prMes(gps_ubx.msg_buf, i); gps_ubx_raw.measures[i].prMes = UBX_RXM_RAW_prMes(gps_ubx.msg_buf, i);
gps_ubx_raw.measures[i].doMes = UBX_RXM_RAW_doMes(gps_ubx.msg_buf, i); gps_ubx_raw.measures[i].doMes = UBX_RXM_RAW_doMes(gps_ubx.msg_buf, i);
sw/airborne/subsystems/gps/gps_ubx.h
+2 -2
View File
@@ -53,7 +53,7 @@ void ubx_gps_impl_init(void);
void ubx_gps_event(void); void ubx_gps_event(void);
extern void ubx_gps_register(void); extern void ubx_gps_register(void);
//#define GPS_NB_CHANNELS 16 #define GPS_UBX_NB_CHANNELS 16
#define GPS_UBX_MAX_PAYLOAD 255 #define GPS_UBX_MAX_PAYLOAD 255
struct GpsUbx { struct GpsUbx {
@@ -92,7 +92,7 @@ struct GpsUbxRaw {
int32_t iTOW; int32_t iTOW;
int16_t week; int16_t week;
uint8_t numSV; uint8_t numSV;
struct GpsUbxRawMes measures[GPS_NB_CHANNELS]; struct GpsUbxRawMes measures[GPS_UBX_NB_CHANNELS];
}; };
extern struct GpsUbxRaw gps_ubx_raw; extern struct GpsUbxRaw gps_ubx_raw;