mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-24 11:33:33 +08:00
drivers/gps: extract Septentrio into new standalone drivers/gnss/septentrio module (#22904)
Having a generic interface over the GPS drivers makes dedicated functionality for each driver harder. Move the Septentrio driver into its own module under the `gnss` driver directory, and let it have its own parameters for only the functionality it requires. This also helps with adding new features because they only need to be implemented for the driver that wants it, simplifying testing.
This commit is contained in:
@@ -51,9 +51,8 @@ px4_add_module(
|
||||
devices/src/nmea.cpp
|
||||
devices/src/unicore.cpp
|
||||
devices/src/crc.cpp
|
||||
devices/src/sbf.cpp
|
||||
MODULE_CONFIG
|
||||
module.yaml
|
||||
DEPENDS
|
||||
git_gps_devices
|
||||
)
|
||||
)
|
||||
+1
-26
@@ -73,7 +73,6 @@
|
||||
# include "devices/src/mtk.h"
|
||||
# include "devices/src/femtomes.h"
|
||||
# include "devices/src/nmea.h"
|
||||
# include "devices/src/sbf.h"
|
||||
|
||||
#endif // CONSTRAINED_FLASH
|
||||
#include "devices/src/ubx.h"
|
||||
@@ -97,7 +96,6 @@ enum class gps_driver_mode_t {
|
||||
EMLIDREACH,
|
||||
FEMTOMES,
|
||||
NMEA,
|
||||
SBF
|
||||
};
|
||||
|
||||
enum class gps_dump_comm_mode_t : int32_t {
|
||||
@@ -361,8 +359,6 @@ GPS::GPS(const char *path, gps_driver_mode_t mode, GPSHelper::Interface interfac
|
||||
case 5: _mode = gps_driver_mode_t::FEMTOMES; break;
|
||||
|
||||
case 6: _mode = gps_driver_mode_t::NMEA; break;
|
||||
|
||||
case 7: _mode = gps_driver_mode_t::SBF; break;
|
||||
#endif // CONSTRAINED_FLASH
|
||||
}
|
||||
}
|
||||
@@ -706,13 +702,6 @@ GPS::run()
|
||||
heading_offset = matrix::wrap_pi(math::radians(heading_offset));
|
||||
}
|
||||
|
||||
handle = param_find("GPS_PITCH_OFFSET");
|
||||
float pitch_offset = 0.f;
|
||||
|
||||
if (handle != PARAM_INVALID) {
|
||||
param_get(handle, &pitch_offset);
|
||||
}
|
||||
|
||||
int32_t gps_ubx_dynmodel = 7; // default to 7: airborne with <2g acceleration
|
||||
handle = param_find("GPS_UBX_DYNMODEL");
|
||||
|
||||
@@ -886,11 +875,6 @@ GPS::run()
|
||||
_helper = new GPSDriverNMEA(&GPS::callback, this, &_report_gps_pos, _p_report_sat_info, heading_offset);
|
||||
set_device_type(DRV_GPS_DEVTYPE_NMEA);
|
||||
break;
|
||||
|
||||
case gps_driver_mode_t::SBF:
|
||||
_helper = new GPSDriverSBF(&GPS::callback, this, &_report_gps_pos, _p_report_sat_info, heading_offset, pitch_offset);
|
||||
set_device_type(DRV_GPS_DEVTYPE_SBF);
|
||||
break;
|
||||
#endif // CONSTRAINED_FLASH
|
||||
|
||||
default:
|
||||
@@ -1068,11 +1052,8 @@ GPS::run()
|
||||
break;
|
||||
|
||||
case gps_driver_mode_t::FEMTOMES:
|
||||
_mode = gps_driver_mode_t::SBF;
|
||||
break;
|
||||
|
||||
case gps_driver_mode_t::SBF:
|
||||
case gps_driver_mode_t::NMEA: // skip NMEA for auto-detection to avoid false positive matching
|
||||
|
||||
#endif // CONSTRAINED_FLASH
|
||||
_mode = gps_driver_mode_t::UBX;
|
||||
px4_usleep(500000); // tried all possible drivers. Wait a bit before next round
|
||||
@@ -1132,10 +1113,6 @@ GPS::print_status()
|
||||
|
||||
case gps_driver_mode_t::NMEA:
|
||||
PX4_INFO("protocol: NMEA");
|
||||
break;
|
||||
|
||||
case gps_driver_mode_t::SBF:
|
||||
PX4_INFO("protocol: SBF");
|
||||
#endif // CONSTRAINED_FLASH
|
||||
|
||||
default:
|
||||
@@ -1508,8 +1485,6 @@ GPS *GPS::instantiate(int argc, char *argv[], Instance instance)
|
||||
} else if (!strcmp(myoptarg, "nmea")) {
|
||||
mode = gps_driver_mode_t::NMEA;
|
||||
|
||||
} else if (!strcmp(myoptarg, "sbf")) {
|
||||
mode = gps_driver_mode_t::SBF;
|
||||
#endif // CONSTRAINED_FLASH
|
||||
} else {
|
||||
PX4_ERR("unknown protocol: %s", myoptarg);
|
||||
|
||||
@@ -169,24 +169,6 @@ PARAM_DEFINE_INT32(GPS_UBX_CFG_INTF, 0);
|
||||
*/
|
||||
PARAM_DEFINE_FLOAT(GPS_YAW_OFFSET, 0.f);
|
||||
|
||||
/**
|
||||
* Pitch offset for dual antenna GPS
|
||||
*
|
||||
* Vertical offsets can be compensated for by adjusting the Pitch offset (Septentrio).
|
||||
*
|
||||
* Note that this can be interpreted as the "roll" angle in case the antennas are aligned along the perpendicular axis. This occurs in situations where the two antenna ARPs may not be exactly at the same height in the vehicle reference frame. Since pitch is defined as the right-handed rotation about the vehicle Y axis, a situation where the main antenna is mounted lower than the aux antenna (assuming the default antenna setup) will result in a positive pitch.
|
||||
*
|
||||
*
|
||||
* @min -90
|
||||
* @max 90
|
||||
* @unit deg
|
||||
* @reboot_required true
|
||||
* @decimal 3
|
||||
*
|
||||
* @group GPS
|
||||
*/
|
||||
PARAM_DEFINE_FLOAT(GPS_PITCH_OFFSET, 0.f);
|
||||
|
||||
/**
|
||||
* Protocol for Main GPS
|
||||
*
|
||||
@@ -203,7 +185,6 @@ PARAM_DEFINE_FLOAT(GPS_PITCH_OFFSET, 0.f);
|
||||
* @value 4 Emlid Reach
|
||||
* @value 5 Femtomes
|
||||
* @value 6 NMEA (generic)
|
||||
* @value 7 Septentrio (SBF)
|
||||
*
|
||||
* @reboot_required true
|
||||
* @group GPS
|
||||
@@ -294,4 +275,4 @@ PARAM_DEFINE_INT32(GPS_1_GNSS, 0);
|
||||
* @reboot_required true
|
||||
* @group GPS
|
||||
*/
|
||||
PARAM_DEFINE_INT32(GPS_2_GNSS, 0);
|
||||
PARAM_DEFINE_INT32(GPS_2_GNSS, 0);
|
||||
Reference in New Issue
Block a user