aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Compass: fixes for macos CAN SITL build

Browse Source
This commit is contained in:
Andrew Tridgell 2023-08-26 14:12:08 +10:00
parent f1aaf78fee
commit e6d43811ad
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Compass/AP_Compass_DroneCAN.cpp
View File

@ -31,11 +31,8 @@ extern const AP_HAL::HAL& hal;
AP_Compass_DroneCAN::DetectedModules AP_Compass_DroneCAN::_detected_modules[];
HAL_Semaphore AP_Compass_DroneCAN::_sem_registry;
AP_Compass_DroneCAN::AP_Compass_DroneCAN(AP_DroneCAN* ap_dronecan, uint8_t node_id, uint8_t sensor_id, uint32_t devid)
: _ap_dronecan(ap_dronecan)
, _node_id(node_id)
, _sensor_id(sensor_id)
, _devid(devid)
AP_Compass_DroneCAN::AP_Compass_DroneCAN(AP_DroneCAN* ap_dronecan, uint32_t devid) :
_devid(devid)
{
}
@ -59,7 +56,7 @@ AP_Compass_Backend* AP_Compass_DroneCAN::probe(uint8_t index)
if (!_detected_modules[index].driver && _detected_modules[index].ap_dronecan) {
WITH_SEMAPHORE(_sem_registry);
// Register new Compass mode to a backend
driver = new AP_Compass_DroneCAN(_detected_modules[index].ap_dronecan, _detected_modules[index].node_id, _detected_modules[index].sensor_id, _detected_modules[index].devid);
driver = new AP_Compass_DroneCAN(_detected_modules[index].ap_dronecan, _detected_modules[index].devid);
if (driver) {
if (!driver->init()) {
delete driver;

5
libraries/AP_Compass/AP_Compass_DroneCAN.h
View File

@ -10,7 +10,7 @@
class AP_Compass_DroneCAN : public AP_Compass_Backend {
public:
AP_Compass_DroneCAN(AP_DroneCAN* ap_dronecan, uint8_t node_id, uint8_t sensor_id, uint32_t devid);
AP_Compass_DroneCAN(AP_DroneCAN* ap_dronecan, uint32_t devid);
void read(void) override;
@ -30,9 +30,6 @@ private:
uint8_t _instance;
AP_DroneCAN* _ap_dronecan;
uint8_t _node_id;
uint8_t _sensor_id;
uint32_t _devid;
// Module Detection Registry