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

AP_HAL: rename GPS_to GPS1_

Browse Source
This commit is contained in:
Peter Barker 2024-03-15 22:37:05 +11:00 committed by Peter Barker
parent 1d4e0a784c
commit 0256cef7b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL/AP_HAL_Boards.h
View File

@ -211,8 +211,8 @@
#define HAL_INS_DEFAULT HAL_INS_NONE #define HAL_INS_DEFAULT HAL_INS_NONE
#endif #endif
#ifndef HAL_GPS_TYPE_DEFAULT #ifndef HAL_GPS1_TYPE_DEFAULT
#define HAL_GPS_TYPE_DEFAULT 1 #define HAL_GPS1_TYPE_DEFAULT 1
#endif #endif
#ifndef HAL_CAN_DRIVER_DEFAULT #ifndef HAL_CAN_DRIVER_DEFAULT

4
libraries/AP_HAL/board/linux.h
View File

@ -83,7 +83,7 @@
#define HAL_EXTERNAL_AHRS_DEFAULT 1 #define HAL_EXTERNAL_AHRS_DEFAULT 1
#define DEFAULT_SERIAL3_PROTOCOL 36 #define DEFAULT_SERIAL3_PROTOCOL 36
#define HAL_AIRSPEED_TYPE_DEFAULT 0 #define HAL_AIRSPEED_TYPE_DEFAULT 0
#define HAL_GPS_TYPE_DEFAULT 21 #define HAL_GPS1_TYPE_DEFAULT 21
#define HAL_AHRS_EKF_TYPE_DEFAULT 11 #define HAL_AHRS_EKF_TYPE_DEFAULT 11
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
#define HAL_BOARD_LOG_DIRECTORY "/data/ftp/internal_000/ardupilot/logs" #define HAL_BOARD_LOG_DIRECTORY "/data/ftp/internal_000/ardupilot/logs"
@ -279,7 +279,7 @@
#define HAL_LINUX_HEAT_KP 20000 #define HAL_LINUX_HEAT_KP 20000
#define HAL_LINUX_HEAT_KI 6 #define HAL_LINUX_HEAT_KI 6
#define HAL_LINUX_HEAT_PERIOD_NS 2040816 #define HAL_LINUX_HEAT_PERIOD_NS 2040816
#define HAL_GPS_TYPE_DEFAULT 9 #define HAL_GPS1_TYPE_DEFAULT 9
#define HAL_CAN_DRIVER_DEFAULT 1 #define HAL_CAN_DRIVER_DEFAULT 1
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ
#define HAL_INS_PROBE_LIST PROBE_IMU_SPI2(Invensense, "rst_g", "rst_a", ROTATION_ROLL_180_YAW_90, ROTATION_ROLL_180_YAW_90) #define HAL_INS_PROBE_LIST PROBE_IMU_SPI2(Invensense, "rst_g", "rst_a", ROTATION_ROLL_180_YAW_90, ROTATION_ROLL_180_YAW_90)