Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IRLock: correct include paths

This commit is contained in:
Randy Mackay 2015-08-28 17:12:27 +09:00
parent cf8ce867e6
commit 04c682542c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_IRLock/AP_IRLock.h
View File

@ -8,4 +8,5 @@
// @file AP_IRLock.h // @file AP_IRLock.h
// @brief Catch-all headerthat defines all supported irlock classes. // @brief Catch-all headerthat defines all supported irlock classes.
#include "IRLock.h"
#include "AP_IRLock_PX4.h" #include "AP_IRLock_PX4.h"

6
libraries/AP_IRLock/AP_IRLock_PX4.cpp
View File

@ -19,15 +19,13 @@
* Created on: Nov 16, 2014 * Created on: Nov 16, 2014
* Author: MLandes * Author: MLandes
*/ */
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
#include "AP_IRLock_PX4.h" #include "AP_IRLock_PX4.h"
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include "AP_HAL.h"
#include "drivers/drv_irlock.h" #include "drivers/drv_irlock.h"
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

2
libraries/AP_IRLock/IRLock.h
View File

@ -23,7 +23,7 @@
#ifndef __IRLOCK_H__ #ifndef __IRLOCK_H__
#define __IRLOCK_H__ #define __IRLOCK_H__
#include "AP_AHRS.h" #include <AP_AHRS/AP_AHRS.h>
#define IRLOCK_MAX_BLOCKS_PER_FRAME 5 // max number of blobs that can be detected by IR-LOCK sensor (should match PX4Firmware's irlock driver's IRLOCK_OBJECTS_MAX) #define IRLOCK_MAX_BLOCKS_PER_FRAME 5 // max number of blobs that can be detected by IR-LOCK sensor (should match PX4Firmware's irlock driver's IRLOCK_OBJECTS_MAX)
#define IRLOCK_CENTER_X 159 // the center x pixel value #define IRLOCK_CENTER_X 159 // the center x pixel value