Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: protect detection structures with GPS backend defines 

Save some memory when backends are compiled out
This commit is contained in:
Peter Barker 2022-11-16 16:38:03 +11:00 committed by Andrew Tridgell
parent 03b00cb906
commit b0351cd339
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_GPS/AP_GPS.h
View File

@ -686,12 +686,24 @@ private:
uint8_t current_baud; uint8_t current_baud;
uint32_t probe_baud; uint32_t probe_baud;
bool auto_detected_baud; bool auto_detected_baud;
#if AP_GPS_UBLOX_ENABLED
struct UBLOX_detect_state ublox_detect_state; struct UBLOX_detect_state ublox_detect_state;
#endif
#if AP_GPS_SIRF_ENABLED
struct SIRF_detect_state sirf_detect_state; struct SIRF_detect_state sirf_detect_state;
#endif
#if AP_GPS_NMEA_ENABLED
struct NMEA_detect_state nmea_detect_state; struct NMEA_detect_state nmea_detect_state;
#endif
#if AP_GPS_SBP_ENABLED
struct SBP_detect_state sbp_detect_state; struct SBP_detect_state sbp_detect_state;
#endif
#if AP_GPS_SBP2_ENABLED
struct SBP2_detect_state sbp2_detect_state; struct SBP2_detect_state sbp2_detect_state;
#endif
#if AP_GPS_ERB_ENABLED
struct ERB_detect_state erb_detect_state; struct ERB_detect_state erb_detect_state;
#endif
} detect_state[GPS_MAX_RECEIVERS]; } detect_state[GPS_MAX_RECEIVERS];
struct { struct {

15
libraries/AP_GPS/GPS_detect_state.h
View File

@ -25,28 +25,39 @@
specific type that it handles. specific type that it handles.
*/ */
#include "AP_GPS_config.h"
#if AP_GPS_NMEA_ENABLED
struct NMEA_detect_state { struct NMEA_detect_state {
uint8_t step; uint8_t step;
uint8_t ck; uint8_t ck;
}; };
#endif
#if AP_GPS_SIRF_ENABLED
struct SIRF_detect_state { struct SIRF_detect_state {
uint16_t checksum; uint16_t checksum;
uint8_t step, payload_length, payload_counter; uint8_t step, payload_length, payload_counter;
}; };
#endif
#if AP_GPS_UBLOX_ENABLED
struct UBLOX_detect_state { struct UBLOX_detect_state {
uint8_t payload_length, payload_counter; uint8_t payload_length, payload_counter;
uint8_t step; uint8_t step;
uint8_t ck_a, ck_b; uint8_t ck_a, ck_b;
}; };
#endif
#if AP_GPS_ERB_ENABLED
struct ERB_detect_state { struct ERB_detect_state {
uint8_t payload_length, payload_counter; uint8_t payload_length, payload_counter;
uint8_t step; uint8_t step;
uint8_t ck_a, ck_b; uint8_t ck_a, ck_b;
}; };
#endif
#if AP_GPS_SBP_ENABLED
struct SBP_detect_state { struct SBP_detect_state {
enum { enum {
WAITING = 0, WAITING = 0,
@ -63,8 +74,9 @@ struct SBP_detect_state {
uint16_t crc; uint16_t crc;
uint8_t heartbeat_buff[4]; uint8_t heartbeat_buff[4];
}; };
#endif
#if AP_GPS_SBP2_ENABLED
struct SBP2_detect_state { struct SBP2_detect_state {
enum { enum {
WAITING = 0, WAITING = 0,
@ -81,3 +93,4 @@ struct SBP2_detect_state {
uint16_t crc; uint16_t crc;
uint8_t heartbeat_buff[4]; uint8_t heartbeat_buff[4];
}; };
#endif