Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable pmw3901 flow if (new) parameter SENS_EN_PMW_FLOW is true #12848

Merged
merged 2 commits into from
Sep 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ROMFS/px4fmu_common/init.d/rc.sensors
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ then
teraranger start -a
fi

# Possible pmw3901 optical flow sensor
if param greater SENS_EN_PMW3901 0
then
pmw3901 start
fi

###############################################################################
# End Optional drivers #
###############################################################################
Expand Down
5 changes: 2 additions & 3 deletions boards/av/x-v1/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ lsm303agr -R 4 start

ms4525_airspeed -T 4515 -b 3 start

# try to autostart pmw3901 on SPI2 (external)
if ! pmw3901 start
if ! param greater SENS_EN_PMW3901 0
then
# if pmw3901 failed to start, try starting the adis16497 (SPI2)
# try to start adis16497 only if pmw3901 isn't enabled, or parameter doesn't exists
adis16497 start
fi

Expand Down
1 change: 0 additions & 1 deletion boards/bitcraze/crazyflie/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ lps25h start

# Optical flow deck
vl53lxx start
pmw3901 start
2 changes: 0 additions & 2 deletions boards/px4/fmu-v4/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,3 @@ then
# BMI160 internal SPI bus
bmi160 start
fi

pmw3901 start
6 changes: 0 additions & 6 deletions boards/px4/fmu-v5/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,3 @@ lis3mdl -X start

# Possible internal compass
ist8310 -C -b 5 start

# Possible pmw3901 optical flow sensor
pmw3901 start

# Internal SPI
ms5611 -s start
BazookaJoe1900 marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 0 additions & 3 deletions boards/px4/fmu-v5x/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,3 @@ bmm150 start
# Possible internal Barro
bmp388 -I start
#bmp388 -J start fixme

# Possible pmw3901 optical flow sensor
pmw3901 start
42 changes: 42 additions & 0 deletions src/drivers/optical_flow/pmw3901/parameters.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/****************************************************************************
*
* Copyright (c) 2019 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.
*
****************************************************************************/

/**
* PMW3901 Optical Flow
*
* @reboot_required true
*
* @boolean
* @group Sensors
*/
PARAM_DEFINE_INT32(SENS_EN_PMW3901, 0);