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

cleanup trailing whitespaces

Browse Source
This commit is contained in:
Felix Ruess
2010-11-06 16:21:05 +00:00
parent 92d9ed5764
commit 2ae00cfdce
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/booz/gps/booz_gps_skytraq.c
+12 -13
View File
@@ -43,25 +43,25 @@ void booz_gps_impl_init(void) {
booz_gps_skytraq.status = UNINIT;
DEBUG_SERVO1_INIT();
}
void booz_gps_skytraq_read_message(void) {
DEBUG_S1_ON();
if (booz_gps_skytraq.msg_id == SKYTRAQ_ID_NAVIGATION_DATA) {
booz_gps_state.ecef_pos.x = SKYTRAQ_NAVIGATION_DATA_ECEFX(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_pos.y = SKYTRAQ_NAVIGATION_DATA_ECEFY(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_pos.z = SKYTRAQ_NAVIGATION_DATA_ECEFZ(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.x = SKYTRAQ_NAVIGATION_DATA_ECEFVX(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.y = SKYTRAQ_NAVIGATION_DATA_ECEFVY(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.z = SKYTRAQ_NAVIGATION_DATA_ECEFVZ(booz_gps_skytraq.msg_buf);
booz_gps_state.lla_pos.lat = SKYTRAQ_NAVIGATION_DATA_LAT(booz_gps_skytraq.msg_buf);
booz_gps_state.lla_pos.lon = SKYTRAQ_NAVIGATION_DATA_LON(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_pos.x = SKYTRAQ_NAVIGATION_DATA_ECEFX(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_pos.y = SKYTRAQ_NAVIGATION_DATA_ECEFY(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_pos.z = SKYTRAQ_NAVIGATION_DATA_ECEFZ(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.x = SKYTRAQ_NAVIGATION_DATA_ECEFVX(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.y = SKYTRAQ_NAVIGATION_DATA_ECEFVY(booz_gps_skytraq.msg_buf);
booz_gps_state.ecef_vel.z = SKYTRAQ_NAVIGATION_DATA_ECEFVZ(booz_gps_skytraq.msg_buf);
booz_gps_state.lla_pos.lat = SKYTRAQ_NAVIGATION_DATA_LAT(booz_gps_skytraq.msg_buf);
booz_gps_state.lla_pos.lon = SKYTRAQ_NAVIGATION_DATA_LON(booz_gps_skytraq.msg_buf);
booz_gps_state.lla_pos.alt = SKYTRAQ_NAVIGATION_DATA_AEL(booz_gps_skytraq.msg_buf);
booz_gps_state.hmsl = SKYTRAQ_NAVIGATION_DATA_ASL(booz_gps_skytraq.msg_buf);
// pacc;
@@ -81,7 +81,7 @@ void booz_gps_skytraq_read_message(void) {
}
#endif
}
DEBUG_S1_OFF();
}
@@ -110,7 +110,7 @@ void booz_gps_skytraq_parse(uint8_t c) {
if (booz_gps_skytraq.len > GPS_SKYTRAQ_MAX_PAYLOAD) {
booz_gps_skytraq.error_last = GPS_SKYTRAQ_ERR_MSG_TOO_LONG;
goto error;
}
}
break;
case GOT_LEN2:
booz_gps_skytraq.msg_id = c;
@@ -153,4 +153,3 @@ void booz_gps_skytraq_parse(uint8_t c) {
booz_gps_skytraq.status = UNINIT;
return;
}
sw/airborne/booz/gps/booz_gps_skytraq.h
+2 -3
View File
@@ -13,7 +13,7 @@
#define SKYTRAQ_SYNC4 0x0A
#define SKYTRAQ_ID_NAVIGATION_DATA 0XA8
#define SKYTRAQ_ID_NAVIGATION_DATA 0XA8
#define SKYTRAQ_NAVIGATION_DATA_FixMode(_payload) (uint8_t) (*((uint8_t*)_payload+2-2))
#define SKYTRAQ_NAVIGATION_DATA_NumSV(_payload) (uint8_t) (*((uint8_t*)_payload+3-2))
@@ -74,7 +74,7 @@ extern void booz_gps_skytraq_parse(uint8_t c);
if (booz_gps_skytraq.msg_id == SKYTRAQ_ID_NAVIGATION_DATA) { \
if (booz_gps_state.fix == BOOZ2_GPS_FIX_3D) \
booz_gps_state.lost_counter = 0; \
_sol_available_callback(); \
_sol_available_callback(); \
} \
booz_gps_skytraq.msg_available = FALSE; \
} \
@@ -85,4 +85,3 @@ extern void booz_gps_skytraq_parse(uint8_t c);
booz_gps_skytraq_parse(GpsLink(Getch())); \
}
#endif /* BOOZ_GPS_SKYTRAQ_H */
sw/airborne/booz/gps/booz_gps_ubx.c
+1 -1
View File
@@ -56,7 +56,7 @@ void booz_gps_impl_init(void) {
void booz_gps_ubx_read_message(void) {
if (booz_gps_ubx.msg_class == UBX_NAV_ID) {
if (booz_gps_ubx.msg_id == UBX_NAV_SOL_ID) {
booz_gps_state.fix = UBX_NAV_SOL_GPSfix(booz_gps_ubx.msg_buf);
sw/airborne/booz/gps/booz_gps_ubx.h
+2 -2
View File
@@ -28,10 +28,10 @@ extern void booz_gps_ubx_parse(uint8_t c);
if (booz_gps_ubx.msg_available) { \
booz_gps_ubx_read_message(); \
if (booz_gps_ubx.msg_class == UBX_NAV_ID && \
booz_gps_ubx.msg_id == UBX_NAV_SOL_ID) { \
booz_gps_ubx.msg_id == UBX_NAV_SOL_ID) { \
if (booz_gps_state.fix == BOOZ2_GPS_FIX_3D) \
booz_gps_state.lost_counter = 0; \
_sol_available_callback(); \
_sol_available_callback(); \
} \
booz_gps_ubx.msg_available = FALSE; \
} \