fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-29 11:50:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

more px4fmu-v1 cleanup (#7981)

Browse Source
This commit is contained in:
Daniel Agar
2017-09-20 00:04:23 -04:00
committed by GitHub
parent 0780e430fd
commit 4e6ca271e7
12 changed files with 134 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4io/CMakeLists.txt
-1
View File
@@ -39,7 +39,6 @@ px4_add_module(
px4io.cpp
px4io_uploader.cpp
px4io_serial.cpp
px4io_i2c.cpp
DEPENDS
platforms__common
)
src/drivers/px4io/px4io.cpp
-8
View File
@@ -3066,14 +3066,6 @@ get_interface()
goto got;
}
#ifdef PX4_I2C_OBDEV_PX4IO
interface = PX4IO_i2c_interface();
#endif
if (interface != nullptr) {
goto got;
}
errx(1, "cannot alloc interface");
got:
src/drivers/px4io/px4io_driver.h
-4
View File
@@ -41,10 +41,6 @@
#include <board_config.h>
#ifdef PX4_I2C_OBDEV_PX4IO
device::Device *PX4IO_i2c_interface();
#endif
#ifdef PX4IO_SERIAL_BASE
device::Device *PX4IO_serial_interface();
#endif
src/drivers/px4io/px4io_i2c.cpp
-177
View File
@@ -1,177 +0,0 @@
/****************************************************************************
*
* Copyright (c) 2013 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 px4io_i2c.cpp
*
* I2C interface for PX4IO
*/
/* XXX trim includes */
#include <px4_config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <assert.h>
#include <debug.h>
#include <errno.h>
#include <unistd.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <drivers/device/i2c.h>
#include "px4io_driver.h"
#ifdef PX4_I2C_OBDEV_PX4IO
class PX4IO_I2C : public device::I2C
{
public:
PX4IO_I2C(int bus, uint8_t address);
virtual ~PX4IO_I2C();
virtual int init();
virtual int read(unsigned offset, void *data, unsigned count = 1);
virtual int write(unsigned address, void *data, unsigned count = 1);
virtual int ioctl(unsigned operation, unsigned &arg);
private:
};
device::Device
*PX4IO_i2c_interface()
{
return new PX4IO_I2C(PX4_I2C_BUS_ONBOARD, PX4_I2C_OBDEV_PX4IO);
}
PX4IO_I2C::PX4IO_I2C(int bus, uint8_t address) :
I2C("PX4IO_i2c", nullptr, bus, address, 400000)
{
_retries = 3;
}
PX4IO_I2C::~PX4IO_I2C()
{
}
int
PX4IO_I2C::init()
{
int ret;
ret = I2C::init();
if (ret != OK) {
goto out;
}
/* XXX really should do something more here */
out:
return 0;
}
int
PX4IO_I2C::ioctl(unsigned operation, unsigned &arg)
{
return 0;
}
int
PX4IO_I2C::write(unsigned address, void *data, unsigned count)
{
uint8_t page = address >> 8;
uint8_t offset = address & 0xff;
const uint16_t *values = reinterpret_cast<const uint16_t *>(data);
/* set up the transfer */
uint8_t addr[2] = {
page,
offset
};
i2c_msg_s msgv[2];
msgv[0].flags = 0;
msgv[0].buffer = addr;
msgv[0].length = 2;
msgv[1].flags = I2C_M_NORESTART;
msgv[1].buffer = (uint8_t *)values;
msgv[1].length = 2 * count;
int ret = transfer(msgv, 2);
if (ret == OK) {
ret = count;
}
return ret;
}
int
PX4IO_I2C::read(unsigned address, void *data, unsigned count)
{
uint8_t page = address >> 8;
uint8_t offset = address & 0xff;
const uint16_t *values = reinterpret_cast<const uint16_t *>(data);
/* set up the transfer */
uint8_t addr[2] = {
page,
offset
};
i2c_msg_s msgv[2];
msgv[0].flags = 0;
msgv[0].buffer = addr;
msgv[0].length = 2;
msgv[1].flags = I2C_M_READ;
msgv[1].buffer = (uint8_t *)values;
msgv[1].length = 2 * count;
int ret = transfer(msgv, 2);
if (ret == OK) {
ret = count;
}
return ret;
}
#endif /* PX4_I2C_OBDEV_PX4IO */
src/drivers/px4io/px4io_params.c
+71
View File
@@ -42,6 +42,19 @@
#include <px4_config.h>
#include <systemlib/param/param.h>
/**
* Set usage of IO board
*
* Can be used to use a standard startup script but with a FMU only set-up. Set to 0 to force the FMU only set-up.
*
* @boolean
* @min 0
* @max 1
* @reboot_required true
* @group System
*/
PARAM_DEFINE_INT32(SYS_USE_IO, 1);
/**
* Invert direction of main output channel 1
*
@@ -235,3 +248,61 @@ PARAM_DEFINE_FLOAT(PWM_MAIN_TRIM8, 0);
* @group PWM Outputs
*/
PARAM_DEFINE_INT32(PWM_SBUS_MODE, 0);
/**
* PWM input channel that provides RSSI.
*
* 0: do not read RSSI from input channel
* 1-18: read RSSI from specified input channel
*
* Specify the range for RSSI input with RC_RSSI_PWM_MIN and RC_RSSI_PWM_MAX parameters.
*
* @min 0
* @max 18
* @value 0 Unassigned
* @value 1 Channel 1
* @value 2 Channel 2
* @value 3 Channel 3
* @value 4 Channel 4
* @value 5 Channel 5
* @value 6 Channel 6
* @value 7 Channel 7
* @value 8 Channel 8
* @value 9 Channel 9
* @value 10 Channel 10
* @value 11 Channel 11
* @value 12 Channel 12
* @value 13 Channel 13
* @value 14 Channel 14
* @value 15 Channel 15
* @value 16 Channel 16
* @value 17 Channel 17
* @value 18 Channel 18
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_CHAN, 0);
/**
* Max input value for RSSI reading.
*
* Only used if RC_RSSI_PWM_CHAN > 0
*
* @min 0
* @max 2000
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_MAX, 1000);
/**
* Min input value for RSSI reading.
*
* Only used if RC_RSSI_PWM_CHAN > 0
*
* @min 0
* @max 2000
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_MIN, 2000);
src/modules/sensors/rc_params.c
-60
View File
@@ -2089,7 +2089,6 @@ PARAM_DEFINE_FLOAT(RC_LOITER_TH, 0.5f);
*/
PARAM_DEFINE_FLOAT(RC_ACRO_TH, 0.5f);
/**
* Threshold for selecting offboard mode
*
@@ -2108,7 +2107,6 @@ PARAM_DEFINE_FLOAT(RC_ACRO_TH, 0.5f);
*/
PARAM_DEFINE_FLOAT(RC_OFFB_TH, 0.5f);
/**
* Threshold for the kill switch
*
@@ -2217,64 +2215,6 @@ PARAM_DEFINE_FLOAT(RC_STAB_TH, 0.5f);
*/
PARAM_DEFINE_FLOAT(RC_MAN_TH, 0.5f);
/**
* PWM input channel that provides RSSI.
*
* 0: do not read RSSI from input channel
* 1-18: read RSSI from specified input channel
*
* Specify the range for RSSI input with RC_RSSI_PWM_MIN and RC_RSSI_PWM_MAX parameters.
*
* @min 0
* @max 18
* @value 0 Unassigned
* @value 1 Channel 1
* @value 2 Channel 2
* @value 3 Channel 3
* @value 4 Channel 4
* @value 5 Channel 5
* @value 6 Channel 6
* @value 7 Channel 7
* @value 8 Channel 8
* @value 9 Channel 9
* @value 10 Channel 10
* @value 11 Channel 11
* @value 12 Channel 12
* @value 13 Channel 13
* @value 14 Channel 14
* @value 15 Channel 15
* @value 16 Channel 16
* @value 17 Channel 17
* @value 18 Channel 18
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_CHAN, 0);
/**
* Max input value for RSSI reading.
*
* Only used if RC_RSSI_PWM_CHAN > 0
*
* @min 0
* @max 2000
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_MAX, 1000);
/**
* Min input value for RSSI reading.
*
* Only used if RC_RSSI_PWM_CHAN > 0
*
* @min 0
* @max 2000
* @group Radio Calibration
*
*/
PARAM_DEFINE_INT32(RC_RSSI_PWM_MIN, 2000);
/**
* Sample rate of the remote control values for the low pass filter on roll,pitch, yaw and throttle
*
src/systemcmds/i2c/CMakeLists.txt
-42
View File
@@ -1,42 +0,0 @@
############################################################################
#
# Copyright (c) 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.
#
############################################################################
px4_add_module(
MODULE systemcmds__i2c
MAIN i2c
COMPILE_FLAGS
SRCS
i2c.c
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/systemcmds/i2c/i2c.c
-146
View File
@@ -1,146 +0,0 @@
/****************************************************************************
*
* Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
* Author: Lorenz Meier <lm@inf.ethz.ch>
*
* 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 i2c.c
*
* i2c hacking tool
*/
#include <px4_config.h>
#include <px4_log.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/mount.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <nuttx/i2c/i2c_master.h>
#include <board_config.h>
#include "systemlib/systemlib.h"
#ifndef PX4_I2C_BUS_ONBOARD
# error PX4_I2C_BUS_ONBOARD not defined, no device interface
#endif
#ifndef PX4_I2C_OBDEV_PX4IO
# error PX4_I2C_OBDEV_PX4IO not defined
#endif
__EXPORT int i2c_main(int argc, char *argv[]);
static int transfer(uint8_t address, uint8_t *send, unsigned send_len, uint8_t *recv, unsigned recv_len);
static struct i2c_master_s *i2c;
int i2c_main(int argc, char *argv[])
{
/* find the right I2C */
i2c = px4_i2cbus_initialize(PX4_I2C_BUS_ONBOARD);
if (i2c == NULL) {
PX4_ERR("failed to locate I2C bus");
return 1;
}
usleep(100000);
uint8_t buf[] = { 0, 4};
int ret = transfer(PX4_I2C_OBDEV_PX4IO, buf, sizeof(buf), NULL, 0);
if (ret) {
PX4_ERR("send failed - %d", ret);
return 1;
}
uint32_t val;
ret = transfer(PX4_I2C_OBDEV_PX4IO, NULL, 0, (uint8_t *)&val, sizeof(val));
if (ret) {
PX4_ERR("recive failed - %d", ret);
return 1;
}
PX4_INFO("got 0x%08x", val);
return 0;
}
static int
transfer(uint8_t address, uint8_t *send, unsigned send_len, uint8_t *recv, unsigned recv_len)
{
struct i2c_msg_s msgv[2];
unsigned msgs;
int ret;
// debug("transfer out %p/%u in %p/%u", send, send_len, recv, recv_len);
msgs = 0;
if (send_len > 0) {
msgv[msgs].frequency = 400000;
msgv[msgs].addr = address;
msgv[msgs].flags = 0;
msgv[msgs].buffer = send;
msgv[msgs].length = send_len;
msgs++;
}
if (recv_len > 0) {
msgv[msgs].frequency = 400000;
msgv[msgs].addr = address;
msgv[msgs].flags = I2C_M_READ;
msgv[msgs].buffer = recv;
msgv[msgs].length = recv_len;
msgs++;
}
if (msgs == 0) {
return -1;
}
ret = I2C_TRANSFER(i2c, &msgv[0], msgs);
// reset the I2C bus to unwedge on error
if (ret != OK) {
up_i2creset(i2c);
}
return ret;
}