From 99c40407ffd7ac184e2d7b4b293f36f10fe561ef Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Fri, 7 Feb 2025 11:22:47 +1300 Subject: [PATCH] gps: revert ubx changes, point to 1.15 branch This reverts UBX changes that we don't want to backport into v1.15. We now point to a release/1.15 branch within the PX4-GPSDrivers submodule. --- src/drivers/gps/devices | 2 +- src/drivers/gps/gps.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/drivers/gps/devices b/src/drivers/gps/devices index e048340d0f..ad769ff53d 160000 --- a/src/drivers/gps/devices +++ b/src/drivers/gps/devices @@ -1 +1 @@ -Subproject commit e048340d0f6a395a3189292c33d08174bb309143 +Subproject commit ad769ff53d683d06937c92bae58377d65893967b diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp index c1dd783be0..dff88ecbdc 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -934,8 +934,7 @@ GPS::run() set_device_type(DRV_GPS_DEVTYPE_UBX_9); break; - case GPSDriverUBX::Board::u_blox9_F9P_L1L2: - case GPSDriverUBX::Board::u_blox9_F9P_L1L5: + case GPSDriverUBX::Board::u_blox9_F9P: set_device_type(DRV_GPS_DEVTYPE_UBX_F9P); break;