fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Gyro sim: Fix merge fail

Browse Source
This commit is contained in:
Lorenz Meier 2015-11-12 15:24:38 +01:00
parent 437133aac4
commit f6798c6b85
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platforms/posix/drivers/gyrosim/gyrosim.cpp
View File

@ -1161,11 +1161,7 @@ GYROSIM::print_registers()
GYROSIM_gyro::GYROSIM_gyro(GYROSIM *parent, const char *path) :
// Set sample interval to 0 since device is read by parent
<<<<<<< HEAD
VirtDevObj("GYROSIM_gyro", path, 0),
=======
VirtDevObj("GYROSIM_gyro", path, nullptr, 0),
>>>>>>> 40c079efa8f7d8cc402890384cb9ce4e01f6a1c7
_parent(parent),
_gyro_topic(nullptr),
_gyro_orb_class_instance(-1)