fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 17:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Device: Add MAVLINK bus type

Browse Source
This commit is contained in:
JacobCrabill
2021-01-28 09:09:11 +01:00
committed by Lorenz Meier
parent a4745c6825
commit bf4ae81995
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/drivers/device/Device.hpp
+4
View File
@@ -148,6 +148,7 @@ public:
DeviceBusType_UAVCAN = 3, DeviceBusType_UAVCAN = 3,
DeviceBusType_SIMULATION = 4, DeviceBusType_SIMULATION = 4,
DeviceBusType_SERIAL = 5, DeviceBusType_SERIAL = 5,
DeviceBusType_MAVLINK = 6,
}; };
/* /*
@@ -196,6 +197,9 @@ public:
case DeviceBusType_SERIAL: case DeviceBusType_SERIAL:
return "SERIAL"; return "SERIAL";
case DeviceBusType_MAVLINK:
return "MAVLINK";
case DeviceBusType_UNKNOWN: case DeviceBusType_UNKNOWN:
default: default:
return "UNKNOWN"; return "UNKNOWN";
src/modules/mavlink/mavlink_receiver.cpp
+3 -3
View File
@@ -643,7 +643,7 @@ MavlinkReceiver::handle_message_optical_flow_rad(mavlink_message_t *msg)
distance_sensor_s d{}; distance_sensor_s d{};
device::Device::DeviceId device_id; device::Device::DeviceId device_id;
device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_SERIAL; device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_MAVLINK;
device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK; device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK;
device_id.devid_s.address = msg->sysid; device_id.devid_s.address = msg->sysid;
@@ -688,7 +688,7 @@ MavlinkReceiver::handle_message_hil_optical_flow(mavlink_message_t *msg)
distance_sensor_s d{}; distance_sensor_s d{};
device::Device::DeviceId device_id; device::Device::DeviceId device_id;
device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_SERIAL; device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_MAVLINK;
device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK; device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK;
device_id.devid_s.address = msg->sysid; device_id.devid_s.address = msg->sysid;
@@ -742,7 +742,7 @@ MavlinkReceiver::handle_message_distance_sensor(mavlink_message_t *msg)
distance_sensor_s ds{}; distance_sensor_s ds{};
device::Device::DeviceId device_id; device::Device::DeviceId device_id;
device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_SERIAL; device_id.devid_s.bus = device::Device::DeviceBusType::DeviceBusType_MAVLINK;
device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK; device_id.devid_s.devtype = DRV_DIST_DEVTYPE_MAVLINK;
device_id.devid_s.address = dist_sensor.id; device_id.devid_s.address = dist_sensor.id;