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

Fixed bad merge

Browse Source 
Forgot to remove old file line when merging the changes from master.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-05-06 16:00:00 -07:00
parent db52227409
commit 3a65187303
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/accelerometer_calibration.cpp
-1
View File
@@ -435,7 +435,6 @@ calibrate_return read_accelerometer_avg(int (&subs)[max_accel_sens], float (&acc
board_rotation = board_rotation_offset * board_rotation;
px4_pollfd_struct_t fds[max_accel_sens];
struct pollfd fds[max_accel_sens];
for (unsigned i = 0; i < max_accel_sens; i++) {
fds[i].fd = subs[i];