Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-03 04:03:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: added device types for SITL

Browse Source 
and fixed a stack init bug for make_bus_id
This commit is contained in:
Andrew Tridgell 2018-06-27 13:30:56 +10:00
parent f2d602690e
commit 464dc9102f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_HAL/Device.h
View File

@ -30,7 +30,8 @@ public:
BUS_TYPE_UNKNOWN = 0,
BUS_TYPE_I2C = 1,
BUS_TYPE_SPI = 2,
BUS_TYPE_UAVCAN = 3
BUS_TYPE_UAVCAN = 3,
BUS_TYPE_SITL = 4
};
enum Speed {
@ -230,7 +231,7 @@ public:
* the standard HAL Device types, such as UAVCAN devices
*/
static uint32_t make_bus_id(enum BusType bus_type, uint8_t bus, uint8_t address, uint8_t devtype) {
union DeviceId d;
union DeviceId d {};
d.devid_s.bus_type = bus_type;
d.devid_s.bus = bus;
d.devid_s.address = address;