Add DF wrapper for BebopBus driver

cmake/configs/posix_bebop_default.cmake

@@ -25,6 +25,7 @@ set(config_module_list
 	platforms/posix/drivers/df_ms5607_wrapper
 	platforms/posix/drivers/df_mpu6050_wrapper
 	platforms/posix/drivers/df_ak8963_wrapper
+	platforms/posix/drivers/df_bebop_bus_wrapper
 
 	#
 	# System commands
@@ -101,4 +102,5 @@ set(config_df_driver_list
 	ms5607
 	mpu6050
 	ak8963
+	bebop_bus
 )

posix-configs/bebop/px4.config

@@ -6,6 +6,7 @@ param set MAV_BROADCAST 1
 df_ms5607_wrapper start
 df_mpu6050_wrapper start -R 8
 df_ak8963_wrapper start -R 4
+df_bebop_bus_wrapper start
 sensors start
 attitude_estimator_q start
 position_estimator_inav start

src/platforms/posix/drivers/df_bebop_bus_wrapper/CMakeLists.txt

@@ -0,0 +1,46 @@
+############################################################################
+#
+#   Copyright (c) 2016 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.
+#
+############################################################################
+
+include_directories(../../../../lib/DriverFramework/drivers)
+
+px4_add_module(
+	MODULE platforms__posix__drivers__df_bebop_bus_wrapper
+	MAIN df_bebop_bus_wrapper
+	SRCS
+		df_bebop_bus_wrapper.cpp
+	DEPENDS
+		platforms__common
+		df_driver_framework
+		df_bebop_bus
+	)
+# vim: set noet ft=cmake fenc=utf-8 ff=unix :

src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp

@@ -0,0 +1,507 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2016 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 df_bebop_bus_wrapper.cpp
+ *
+ * This is a wrapper around the Parrot Bebop bus driver of the DriverFramework. It sends the
+ * motor and contol commands to the Bebop and reads its status and informations.
+ */
+
+#include <stdint.h>
+
+#include <px4_tasks.h>
+#include <px4_getopt.h>
+#include <px4_posix.h>
+
+#include <errno.h>
+#include <string.h>
+#include <uORB/topics/actuator_outputs.h>
+#include <uORB/topics/actuator_controls.h>
+#include <uORB/topics/actuator_armed.h>
+
+#include <systemlib/mixer/mixer.h>
+#include <systemlib/mixer/mixer_multirotor.generated.h>
+#include <systemlib/pwm_limit/pwm_limit.h>
+
+#include <bebop_bus/BebopBus.hpp>
+#include <DevMgr.hpp>
+
+extern "C" { __EXPORT int df_bebop_bus_wrapper_main(int argc, char *argv[]); }
+
+using namespace DriverFramework;
+
+class DfBebopBusWrapper : public BebopBus
+{
+public:
+  DfBebopBusWrapper();
+  ~DfBebopBusWrapper() = default;
+
+  int start();
+  int stop();
+  int print_info();
+
+private:
+};
+
+DfBebopBusWrapper::DfBebopBusWrapper() :
+  BebopBus(BEBOP_BUS_DEVICE_PATH)
+{}
+
+int DfBebopBusWrapper::start()
+{
+	/* Init device and start sensor. */
+	int ret = init();
+
+	if (ret != 0) {
+		PX4_ERR("BebopBus init fail: %d", ret);
+		return ret;
+	}
+
+	ret = BebopBus::start();
+
+	if (ret < 0) {
+		PX4_ERR("BebopBus start fail: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+int DfBebopBusWrapper::stop() {
+
+	int ret = BebopBus::stop();
+
+	if (ret < 0) {
+		PX4_ERR("BebopBus stop fail: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+int DfBebopBusWrapper::print_info()
+{
+  bebop_bus_info info;
+	int ret = _get_info(&info);
+
+	if (ret < 0)
+  {
+    return -1;
+  }
+
+	PX4_INFO("Bebop Controller Info");
+	PX4_INFO("  Software Version: %d.%d", info.version_major, info.version_minor);
+	PX4_INFO("  Software Type: %d", info.type);
+	PX4_INFO("  Number of controlled motors: %d", info.n_motors_controlled);
+	PX4_INFO("  Number of flights: %d", info.n_flights);
+	PX4_INFO("  Last flight time: %d", info.last_flight_time);
+	PX4_INFO("  Total flight time: %d", info.total_flight_time);
+	PX4_INFO("  Last Error: %d\n", info.last_error);
+
+  return 0;
+}
+
+namespace df_bebop_bus_wrapper
+{
+  
+DfBebopBusWrapper *g_dev = nullptr;
+volatile bool _task_should_exit = false; // flag indicating if snapdragon_rc_pwm task should exit
+static bool _is_running = false;         // flag indicating if snapdragon_rc_pwm app is running
+static px4_task_t _task_handle = -1;     // handle to the task main thread
+
+static const int FREQUENCY_PWM = 400;
+static const char *MIXER_FILENAME = "";
+
+// subscriptions
+int     _controls_sub;
+int     _armed_sub;
+
+// publications
+orb_advert_t    _outputs_pub = nullptr;
+orb_advert_t    _rc_pub = nullptr;
+
+// topic structures
+actuator_controls_s _controls;
+actuator_outputs_s  _outputs;
+actuator_armed_s    _armed;
+
+pwm_limit_t     _pwm_limit;
+
+// esc parameters
+int32_t _pwm_disarmed;
+int32_t _pwm_min;
+int32_t _pwm_max;
+
+MultirotorMixer *_mixer = nullptr;
+
+int start();
+int stop();
+int info();
+void usage();
+void send_outputs_pwm(const uint16_t *pwm);
+void task_main(int argc, char *argv[]);
+
+/* mixer initialization */
+int initialize_mixer(const char *mixer_filename);
+int mixer_control_callback(uintptr_t handle, uint8_t control_group, uint8_t control_index, float &input);
+
+int mixer_control_callback(uintptr_t handle,
+			   uint8_t control_group,
+			   uint8_t control_index,
+			   float &input)
+{
+	const actuator_controls_s *controls = (actuator_controls_s *)handle;
+
+	input = controls[control_group].control[control_index];
+
+	return 0;
+}
+
+int initialize_mixer(const char *mixer_filename)
+{
+	char buf[2048];
+	size_t buflen = sizeof(buf);
+
+	PX4_INFO("Trying to initialize mixer from config file %s", mixer_filename);
+
+	int fd_load = ::open(mixer_filename, O_RDONLY);
+
+	if (fd_load != -1) {
+		int nRead = ::read(fd_load, buf, buflen);
+		close(fd_load);
+
+		if (nRead > 0) {
+			_mixer = MultirotorMixer::from_text(mixer_control_callback, (uintptr_t)&_controls, buf, buflen);
+
+			if (_mixer != nullptr) {
+				PX4_INFO("Successfully initialized mixer from config file");
+				return 0;
+
+			} else {
+				PX4_ERR("Unable to parse from mixer config file");
+				return -1;
+			}
+
+		} else {
+			PX4_WARN("Unable to read from mixer config file");
+			return -2;
+		}
+
+	} else {
+		PX4_WARN("No mixer config file found, using default mixer.");
+
+		/* Mixer file loading failed, fall back to default mixer configuration for
+		* QUAD_X airframe. */
+		float roll_scale = 1;
+		float pitch_scale = 1;
+		float yaw_scale = 1;
+		float deadband = 0;
+
+		_mixer = new MultirotorMixer(mixer_control_callback, (uintptr_t)&_controls,
+					     MultirotorGeometry::QUAD_X,
+					     roll_scale, pitch_scale, yaw_scale, deadband);
+
+		// TODO: temporary hack to make this compile
+		(void)_config_index[0];
+
+		if (_mixer == nullptr) {
+			PX4_ERR("Mixer initialization failed");
+			return -1;
+		}
+
+		return 0;
+	}
+}
+
+void send_outputs_pwm(const uint16_t *pwm)
+{
+  PX4_INFO("%d %d %d %d", pwm[0], pwm[1], pwm[2], pwm[3]);
+}
+
+void task_main(int argc, char *argv[])
+{
+	_is_running = true;
+
+	// Subscribe for orb topics
+	_controls_sub = orb_subscribe(ORB_ID(actuator_controls_0));
+	_armed_sub = orb_subscribe(ORB_ID(actuator_armed));
+
+	// Start disarmed
+	_armed.armed = false;
+	_armed.prearmed = false;
+
+	// Set up poll topic
+	px4_pollfd_struct_t fds[1];
+	fds[0].fd     = _controls_sub;
+	fds[0].events = POLLIN;
+	/* Don't limit poll intervall for now, 250 Hz should be fine. */
+	//orb_set_interval(_controls_sub, 10);
+
+	// Set up mixer
+	if (initialize_mixer(MIXER_FILENAME) < 0) {
+		PX4_ERR("Mixer initialization failed.");
+		return;
+	}
+
+	pwm_limit_init(&_pwm_limit);
+
+	// Main loop
+	while (!_task_should_exit) {
+
+		int pret = px4_poll(&fds[0], (sizeof(fds) / sizeof(fds[0])), 10);
+
+		/* Timed out, do a periodic check for _task_should_exit. */
+		if (pret == 0) {
+			continue;
+		}
+
+		/* This is undesirable but not much we can do. */
+		if (pret < 0) {
+			PX4_WARN("poll error %d, %d", pret, errno);
+			/* sleep a bit before next try */
+			usleep(100000);
+			continue;
+		}
+
+		if (fds[0].revents & POLLIN) {
+			orb_copy(ORB_ID(actuator_controls_0), _controls_sub, &_controls);
+
+			_outputs.timestamp = _controls.timestamp;
+
+			/* do mixing */
+			_outputs.noutputs = _mixer->mix(_outputs.output,
+							0 /* not used */,
+							NULL);
+
+
+			/* disable unused ports by setting their output to NaN */
+			for (size_t i = _outputs.noutputs;
+			     i < sizeof(_outputs.output) / sizeof(_outputs.output[0]);
+			     i++) {
+				_outputs.output[i] = NAN;
+			}
+
+			const uint16_t reverse_mask = 0;
+			uint16_t disarmed_pwm[4];
+			uint16_t min_pwm[4];
+			uint16_t max_pwm[4];
+
+			for (unsigned int i = 0; i < 4; i++) {
+				disarmed_pwm[i] = _pwm_disarmed;
+				min_pwm[i] = _pwm_min;
+				max_pwm[i] = _pwm_max;
+			}
+
+			uint16_t pwm[4];
+
+			// TODO FIXME: pre-armed seems broken
+			pwm_limit_calc(_armed.armed,
+				       false/*_armed.prearmed*/,
+				       _outputs.noutputs,
+				       reverse_mask,
+				       disarmed_pwm,
+				       min_pwm,
+				       max_pwm,
+				       _outputs.output,
+				       pwm,
+				       &_pwm_limit);
+
+			send_outputs_pwm(pwm);
+
+			if (_outputs_pub != nullptr) {
+				orb_publish(ORB_ID(actuator_outputs), _outputs_pub, &_outputs);
+
+			} else {
+				_outputs_pub = orb_advertise(ORB_ID(actuator_outputs), &_outputs);
+			}
+		}
+
+		bool updated;
+		orb_check(_armed_sub, &updated);
+
+		if (updated) {
+			orb_copy(ORB_ID(actuator_armed), _armed_sub, &_armed);
+		}
+	}
+
+	orb_unsubscribe(_controls_sub);
+	orb_unsubscribe(_armed_sub);
+
+	_is_running = false;
+
+}
+
+int start()
+{
+	g_dev = new DfBebopBusWrapper();
+
+	if (g_dev == nullptr) {
+		PX4_ERR("failed instantiating DfBebopBusWrapper object");
+		return -1;
+	}
+
+	int ret = g_dev->start();
+
+	if (ret != 0) {
+		PX4_ERR("DfBebopBusWrapper start failed");
+		return ret;
+	}
+
+	// Open the MAG sensor
+	DevHandle h;
+	DevMgr::getHandle(BEBOP_BUS_DEVICE_PATH, h);
+
+	if (!h.isValid()) {
+		DF_LOG_INFO("Error: unable to obtain a valid handle for the receiver at: %s (%d)",
+			    BEBOP_BUS_DEVICE_PATH, h.getError());
+		return -1;
+	}
+
+	DevMgr::releaseHandle(h);
+
+  // Start the task to forward the motor control commands
+	ASSERT(_task_handle == -1);
+
+	/* start the task */
+	_task_handle = px4_task_spawn_cmd("bebop_bus_esc_main",
+					  SCHED_DEFAULT,
+					  SCHED_PRIORITY_MAX,
+					  2000,
+					  (px4_main_t)&task_main,
+					  nullptr);
+
+	if (_task_handle < 0) {
+		warn("task start failed");
+		return -1;
+	}
+
+	_is_running = true;
+	return 0;
+}
+
+int stop()
+{
+  // Stop bebop motor control task
+	_task_should_exit = true;
+
+	while (_is_running) {
+		usleep(200000);
+		PX4_INFO(".");
+	}
+
+	_task_handle = -1;
+
+	if (g_dev == nullptr) {
+		PX4_ERR("driver not running");
+		return 1;
+	}
+
+  // Stop DF device
+	int ret = g_dev->stop();
+
+	if (ret != 0) {
+		PX4_ERR("driver could not be stopped");
+		return ret;
+	}
+
+	delete g_dev;
+	g_dev = nullptr;
+	return 0;
+}
+
+/**
+ * Print a little info about the driver.
+ */
+int
+info()
+{
+	if (g_dev == nullptr) {
+		PX4_ERR("driver not running");
+		return 1;
+	}
+
+	PX4_DEBUG("state @ %p", g_dev);
+
+	int ret = g_dev->print_info();
+	if (ret != 0) {
+	  PX4_ERR("Unable to print info");
+	  return ret;
+	}
+
+	return 0;
+}
+
+void
+usage()
+{
+	PX4_INFO("Usage: df_bebop_bus_wrapper 'start', 'info', 'stop'");
+}
+
+} /* df_bebop_bus_wrapper */ 
+
+
+int
+df_bebop_bus_wrapper_main(int argc, char *argv[])
+{
+	int ret = 0;
+	int myoptind = 1;
+
+	if (argc <= 1) {
+		df_bebop_bus_wrapper::usage();
+		return 1;
+	}
+
+	const char *verb = argv[myoptind];
+
+
+	if (!strcmp(verb, "start")) {
+		ret = df_bebop_bus_wrapper::start();
+	}
+
+	else if (!strcmp(verb, "stop")) {
+		ret = df_bebop_bus_wrapper::stop();
+	}
+
+	else if (!strcmp(verb, "info")) {
+		ret = df_bebop_bus_wrapper::info();
+	}
+
+	else {
+		df_bebop_bus_wrapper::usage();
+		return 1;
+	}
+
+	return ret;
+}