diff --git a/conf/settings/gps_ubx_ucenter.xml b/conf/settings/gps_ubx_ucenter.xml new file mode 100644 index 0000000000..245dca0af4 --- /dev/null +++ b/conf/settings/gps_ubx_ucenter.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/sw/airborne/arch/lpc21/mcu_periph/uart_arch.h b/sw/airborne/arch/lpc21/mcu_periph/uart_arch.h index 40cd39250b..f44264a428 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/uart_arch.h +++ b/sw/airborne/arch/lpc21/mcu_periph/uart_arch.h @@ -33,6 +33,7 @@ #define B1200 UART_BAUD(1200) #define B2400 UART_BAUD(2400) +#define B4800 UART_BAUD(4800) #define B9600 UART_BAUD(9600) #define B19200 UART_BAUD(19200) #define B38400 UART_BAUD(38400) diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h index 71191f04ba..45ff4afc4c 100644 --- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h +++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h @@ -31,6 +31,7 @@ #include "std.h" +#define B4800 4800 #define B9600 9600 #define B38400 38400 #define B57600 57600 diff --git a/sw/airborne/modules/gps_i2c/runtime_configure.h b/sw/airborne/modules/gps_i2c/runtime_configure.h deleted file mode 100644 index 8041a888d6..0000000000 --- a/sw/airborne/modules/gps_i2c/runtime_configure.h +++ /dev/null @@ -1,27 +0,0 @@ -#define IGNORED 0 -#define RESERVED 0 - -static bool_t user_gps_configure(bool_t cpt) { - switch (cpt) { - case 0: - /* mask: we set only fixMode and dyn */ - UbxSend_CFG_NAV5(0x05, NAV5_DYN_AIRBORNE_2G, NAV5_3D_ONLY, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, RESERVED, RESERVED, RESERVED, RESERVED); - break; - case 1: - UbxSend_CFG_MSG(UBX_NAV_ID, UBX_NAV_POSLLH_ID, 1, 0, 0, 0); - break; - case 2: - UbxSend_CFG_MSG(UBX_NAV_ID, UBX_NAV_VELNED_ID, 1, 0, 0, 0); - break; - case 3: - UbxSend_CFG_MSG(UBX_NAV_ID, UBX_NAV_SVINFO_ID, 4, 0, 0, 0); - break; - case 4: - UbxSend_CFG_MSG(UBX_NAV_ID, UBX_NAV_SOL_ID, 8, 0, 0, 0); - break; - case 5: - UbxSend_CFG_RATE(250 /*ms*/, 0x0001, 0x0000); - return FALSE; - } - return TRUE; /* Continue, except for the last case */ -}