Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: rename GPS_ to GPS1_

Browse Source
This commit is contained in:
Peter Barker 2024-03-15 15:54:39 +11:00 committed by Peter Barker
parent bb83c43d1b
commit 94d5d92917
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/SITL/SIM_GPS.h
View File

@ -120,7 +120,7 @@ public:
SBP2 = 9, SBP2 = 9,
#endif #endif
#if AP_SIM_GPS_TRIMBLE_ENABLED #if AP_SIM_GPS_TRIMBLE_ENABLED
TRIMBLE = 11, // matches GPS_TYPE TRIMBLE = 11, // matches GPS1_TYPE
#endif #endif
#if AP_SIM_GPS_MSP_ENABLED #if AP_SIM_GPS_MSP_ENABLED
MSP = 19, MSP = 19,

2
libraries/SITL/SIM_XPlane.cpp
View File

@ -105,7 +105,7 @@ XPlane::XPlane(const char *frame_str) :
// XPlane sensor data is not good enough for EKF. Use fake EKF by default // XPlane sensor data is not good enough for EKF. Use fake EKF by default
AP_Param::set_default_by_name("AHRS_EKF_TYPE", 10); AP_Param::set_default_by_name("AHRS_EKF_TYPE", 10);
AP_Param::set_default_by_name("GPS_TYPE", 100); AP_Param::set_default_by_name("GPS1_TYPE", 100);
AP_Param::set_default_by_name("INS_GYR_CAL", 0); AP_Param::set_default_by_name("INS_GYR_CAL", 0);
#if APM_BUILD_TYPE(APM_BUILD_ArduPlane) #if APM_BUILD_TYPE(APM_BUILD_ArduPlane)

12
libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
View File

@ -171,16 +171,16 @@ GPS_AUTO_CONFIG,1
GPS_AUTO_SWITCH,1 GPS_AUTO_SWITCH,1
GPS_BLEND_MASK,5 GPS_BLEND_MASK,5
GPS_BLEND_TC,10 GPS_BLEND_TC,10
GPS_DELAY_MS,0 GPS1_DELAY_MS,0
GPS2_DELAY_MS,0 GPS2_DELAY_MS,0
GPS_GNSS_MODE,0 GPS1_GNSS_MODE,0
GPS2_GNSS_MODE,0 GPS2_GNSS_MODE,0
GPS_INJECT_TO,127 GPS_INJECT_TO,127
GPS_MIN_ELEV,-100 GPS_MIN_ELEV,-100
GPS_NAVFILTER,8 GPS_NAVFILTER,8
GPS_POS_X,0 GPS1_POS_X,0
GPS_POS_Y,0 GPS1_POS_Y,0
GPS_POS_Z,0 GPS1_POS_Z,0
GPS2_POS_X,0 GPS2_POS_X,0
GPS2_POS_Y,0 GPS2_POS_Y,0
GPS2_POS_Z,0 GPS2_POS_Z,0
@ -190,7 +190,7 @@ GPS_RAW_DATA,0
GPS_SAVE_CFG,0 GPS_SAVE_CFG,0
GPS_SBAS_MODE,2 GPS_SBAS_MODE,2
GPS_SBP_LOGMASK,-32768 GPS_SBP_LOGMASK,-32768
GPS_TYPE,1 GPS1_TYPE,1
GPS2_TYPE,0 GPS2_TYPE,0
GRIP_ENABLE,0 GRIP_ENABLE,0
GROUND_STEER_ALT,0 GROUND_STEER_ALT,0

10
libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
View File

@ -177,14 +177,14 @@ GPS_BLEND_MASK,5
GPS_BLEND_TC,10 GPS_BLEND_TC,10
GPS_DELAY_MS,0 GPS_DELAY_MS,0
GPS2_DELAY_MS,0 GPS2_DELAY_MS,0
GPS_GNSS_MODE,0 GPS1_GNSS_MODE,0
GPS2_GNSS_MODE,0 GPS2_GNSS_MODE,0
GPS_INJECT_TO,127 GPS_INJECT_TO,127
GPS_MIN_ELEV,-100 GPS_MIN_ELEV,-100
GPS_NAVFILTER,8 GPS_NAVFILTER,8
GPS_POS_X,0 GPS1_POS_X,0
GPS_POS_Y,0 GPS1_POS_Y,0
GPS_POS_Z,0 GPS1_POS_Z,0
GPS2_POS_X,0 GPS2_POS_X,0
GPS2_POS_Y,0 GPS2_POS_Y,0
GPS2_POS_Z,0 GPS2_POS_Z,0
@ -194,7 +194,7 @@ GPS_RAW_DATA,0
GPS_SAVE_CFG,0 GPS_SAVE_CFG,0
GPS_SBAS_MODE,2 GPS_SBAS_MODE,2
GPS_SBP_LOGMASK,-32768 GPS_SBP_LOGMASK,-32768
GPS_TYPE,1 GPS1_TYPE,1
GPS2_TYPE,0 GPS2_TYPE,0
GRIP_ENABLE,0 GRIP_ENABLE,0
GROUND_STEER_ALT,0 GROUND_STEER_ALT,0