From 0256cef7b9476154dd916f4c0b86508c2e27cade Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 15 Mar 2024 22:37:05 +1100 Subject: [PATCH] AP_HAL: rename GPS_to GPS1_ --- libraries/AP_HAL/AP_HAL_Boards.h | 4 ++-- libraries/AP_HAL/board/linux.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h index 2548958272..4eeb739885 100644 --- a/libraries/AP_HAL/AP_HAL_Boards.h +++ b/libraries/AP_HAL/AP_HAL_Boards.h @@ -211,8 +211,8 @@ #define HAL_INS_DEFAULT HAL_INS_NONE #endif -#ifndef HAL_GPS_TYPE_DEFAULT -#define HAL_GPS_TYPE_DEFAULT 1 +#ifndef HAL_GPS1_TYPE_DEFAULT +#define HAL_GPS1_TYPE_DEFAULT 1 #endif #ifndef HAL_CAN_DRIVER_DEFAULT diff --git a/libraries/AP_HAL/board/linux.h b/libraries/AP_HAL/board/linux.h index 65ce66d2a1..c605323f92 100644 --- a/libraries/AP_HAL/board/linux.h +++ b/libraries/AP_HAL/board/linux.h @@ -83,7 +83,7 @@ #define HAL_EXTERNAL_AHRS_DEFAULT 1 #define DEFAULT_SERIAL3_PROTOCOL 36 #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 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO #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_KI 6 #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 #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)