diff --git a/src/drivers/drv_irlock.h b/src/drivers/drv_irlock.h deleted file mode 100644 index ea0eac8d7567cde79a7741f95cf42e66868edb18..0000000000000000000000000000000000000000 --- a/src/drivers/drv_irlock.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2015 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_irlock.h - * - * IR-Lock device API - **/ - -#pragma once - -#include <stdint.h> -#include <sys/ioctl.h> - -#include "drv_sensor.h" // include sensor driver interfaces - -#define IRLOCK_BASE_DEVICE_PATH "/dev/irlock" -#define IRLOCK0_DEVICE_PATH "/dev/irlock0" - -#define IRLOCK_OBJECTS_MAX 5 /** up to 5 objects can be detected/reported **/ - -struct irlock_target_s { - uint16_t signature; /** target signature **/ - float pos_x; /** x-axis distance from center of image to center of target in units of tan(theta) **/ - float pos_y; /** y-axis distance from center of image to center of target in units of tan(theta) **/ - float size_x; /** size of target along x-axis in units of tan(theta) **/ - float size_y; /** size of target along y-axis in units of tan(theta) **/ -}; - -/** irlock_s structure returned from read calls **/ -struct irlock_s { - uint64_t timestamp; /** microseconds since system start **/ - uint8_t num_targets; - struct irlock_target_s targets[IRLOCK_OBJECTS_MAX]; -}; diff --git a/src/drivers/irlock/irlock.cpp b/src/drivers/irlock/irlock.cpp index f6eeb5d0545d6bd5ec16b9d0a8c6d12f6c72fd15..d5393a9d2e13d850ee672b7ebf53e27c39c86be0 100644 --- a/src/drivers/irlock/irlock.cpp +++ b/src/drivers/irlock/irlock.cpp @@ -51,7 +51,6 @@ #include <board_config.h> #include <drivers/device/i2c.h> #include <drivers/device/ringbuffer.h> -#include <drivers/drv_irlock.h> #include <drivers/drv_hrt.h> #include <px4_getopt.h> @@ -91,6 +90,26 @@ # error This requires CONFIG_SCHED_WORKQUEUE. #endif +#define IRLOCK_BASE_DEVICE_PATH "/dev/irlock" +#define IRLOCK0_DEVICE_PATH "/dev/irlock0" + +#define IRLOCK_OBJECTS_MAX 5 /** up to 5 objects can be detected/reported **/ + +struct irlock_target_s { + uint16_t signature; /** target signature **/ + float pos_x; /** x-axis distance from center of image to center of target in units of tan(theta) **/ + float pos_y; /** y-axis distance from center of image to center of target in units of tan(theta) **/ + float size_x; /** size of target along x-axis in units of tan(theta) **/ + float size_y; /** size of target along y-axis in units of tan(theta) **/ +}; + +/** irlock_s structure returned from read calls **/ +struct irlock_s { + uint64_t timestamp; /** microseconds since system start **/ + uint8_t num_targets; + struct irlock_target_s targets[IRLOCK_OBJECTS_MAX]; +}; + class IRLOCK : public device::I2C { public: