Commit Graph
50 Commits
Author SHA1 Message Date
Simon Wilks 5adb3cc308 Add support for a 'standard' VTOL with pusher/tractor motor. 2015-08-06 10:49:39 +02:00
Simon Wilks 809b6591c3 Bring back the ability to transition plus a partial cleanup of tiltrotor support and firefly6 config updates. 2015-08-05 16:16:03 +02:00
Lorenz Meier 4cf9976ad8 Merge branch 'master_release' of github.com:PX4/Firmware into master_release 2015-06-30 15:43:53 +02:00
Lorenz Meier 50ba1f7365 merged release_v1.0.0 into master 2015-06-30 15:30:45 +02:00
Lorenz Meier 77ff09792e vtol: Fix param meta data 2015-06-30 07:00:54 +02:00
Lorenz Meier ac6abacac9 VTOL controller: Fix usage of old uORB API, fix indentation 2015-06-29 16:28:33 +02:00
Lorenz Meier 454becdae5 Merged release_v1.0.0 branch into master 2015-06-25 21:45:17 +02:00
tumbili 60857c7940 add option to lock elevons for tailsitters in mc mode 2015-06-19 09:53:04 +02:00
tumbili b3c3d6634c added vtol types 2015-06-19 00:04:24 +02:00
tumbili 526698854c adapt vtol attitude control class to new vtol type classes 2015-06-19 00:04:24 +02:00
tumbili 77077cb92a added tailsitter attitude control class 2015-06-19 00:04:24 +02:00
tumbili a212e45744 added tiltrotor attitude control class 2015-06-19 00:04:24 +02:00
tumbili 1ccded0305 added generic class for vtol types 2015-06-18 23:55:30 +02:00
Mark Charlebois 1ca05aaa64 orb_advert_t changed to void * and checks changed to nullptr
The existing orb_advert_t use thoughout the code sometimes tries
to treat it as a file descriptor and there are checks for < 0
and ::close calls on orb_advert_t types which is an invalid use
of an object pointer, which is what orb_advert_t really is.

Initially I had changed the -1 initializations to 0 but it was
suggested that this should be nullptr. That was a good recommendation
but the definition of orb_advert_t had to change to void * because
you cannot initialize a uintptr_t as nullptr.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-27 14:42:49 -07:00
Mark Charlebois a734fc96d1 extensive orb_advert_t fixes
The calls to orb_advertise were being mishandled throughout the code.
There were ::close() calls on memory pointers, there were checks
against < 0 when it is a pointer to a object and values larger than
0x7ffffffff are valid. Some places orb_advert_t variables were
being initialized as 0 other places as -1.

The orb_advert_t type was changed to uintptr_t so the pointer value
would not be wrapped as a negative number. This was causing a failure
on ARM.

Tests for < 0 were changed to == 0 since a null pointer is the valid
representation for error, or uninitialized.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-27 14:41:33 -07:00
Mark Charlebois db52227409 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/accelerometer_calibration.cpp
2015-05-06 15:51:39 -07:00
Mark Charlebois c5237f7f6f Removed extra abstracton layer in systemlib
The calls to task_spawn_cmd, kill_all, and systemreset  were wrappers
around the px4_{task_spawn_cmd|kill_all|systemreset} implementations.

Removed the wrappers and changed all calls to the px4_ equivalents.

NuttX specific code was moved into px4_tasks.h

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-06 14:43:11 -07:00
Roman Bapst 525e605b92 vtol: publish actuator controls in manual mode 2015-05-06 22:53:56 +02:00
Mark Charlebois f63ab3d5e3 Merge branch 'master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	makefiles/firmware.mk
2015-04-22 10:38:46 -07:00
Roman Bapst 67956341e6 FireFly6: make landing gear manual pass-through 2015-04-22 13:40:49 +02:00
Roman Bapst 15f11ae1e2 add control output for tilting rotors 2015-04-21 13:22:57 +02:00
Mark Charlebois 9758112e31 Use px4_config.h instead of nuttx/config.h
Modified code to use OS independent header file for config settings.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:55:41 -07:00
Mark Charlebois bf429188b4 Reverted: Use OS independent API for task creation/deletion
Keep existing API use in code. Bind the use of the OS independent
implementation in the systemlib layer.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:49:44 -07:00
Mark Charlebois ddb32742eb Use OS independent API for task creation/deletion
Calls to task_delete and task_spawn_cmd are now
px4_task_delete and px4_task_spawn_cmd respectively.

The px4_tasks.h header was added to the affected files
and incusions of nuttx/config.h were removed.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:49:44 -07:00
Daniel Agar 2e824bbeea fix incorrect argc < 1 check for no arguments
-requiring arguments should be argc < 2
2015-04-18 12:02:58 +02:00
Don Gagne 3dc8cf8769 Clean up parameter meta data as needed by QGC 2015-04-14 23:26:14 -07:00
Matt Beall 220fb19eb7 Removed actuator_control_mode flags...Using pre-existing flags instead 2015-02-28 15:19:16 +01:00
Matt Beall e2de72b882 Added offboard actuator controls flags to offboard control mode and vehicle control mode to disable controls in att_control apps 2015-02-28 15:19:16 +01:00
Lorenz Meier e67c8529f1 VTOL: Move to 0-based indices 2015-02-09 22:56:23 +01:00
Thomas Gubler 14aa5f9441 add topic header includes 2015-01-25 15:00:35 +01:00
tumbili beab89367f calculate total airflow over elevons using physical of flow behind propeller. read local position topic for future use. 2015-01-18 18:00:14 +01:00
tumbili a7bc38869e added pitch trim for vtol in fixed wing mode 2015-01-01 14:51:18 +01:00
tumbili 72eafad510 introduced vtol_fw_permanent stabilization: allows vtol to be attitude-stabilized in manual mode 2014-12-31 16:40:16 +01:00
Lorenz Meier 6fae021a00 Merge pull request #1527 from dagar/Werror
turn on -Werror and fix resulting errors
2014-12-25 17:44:44 +01:00
Daniel Agar 5b600a815c Replace use of -Wno-error and only ignore specific warnings 2014-12-23 11:18:36 -05:00
Lorenz Meier 0aaabaee09 VTOL: Remove unneeded headers 2014-12-23 15:02:01 +01:00
Daniel Agar d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
Roman Bapst f3b5b67eec shortened parameter names to max 16 bytes 2014-12-18 12:43:23 +01:00
Roman Bapst 669e1f96d8 fixed parameter issue for VTOL so that parameter wiki tool can document them 2014-12-18 10:46:36 +01:00
tumbili 89e2e08de0 removed white space noise 2014-12-15 22:47:10 +01:00
tumbili 51a7fbeee0 added sanity checkto prevent false low airspeed readings during transition 2014-12-15 22:12:11 +01:00
tumbili 9bf19c8d1e merged with caipi_airspeed_scale 2014-12-10 21:23:06 +01:00
tumbili d0fb862a01 fixed _loop_perf message 2014-12-06 20:13:42 +01:00
tumbili 945c8df18b added scaling of mc pitch control with airspeed 2014-12-06 17:37:46 +01:00
Roman Bapst 590489d498 make sure vtol attitude control module is started with idle speed set for multicopter mode 2014-12-04 17:36:16 +01:00
Roman Bapst bed53e810b introduced vtol_motor_count and idle_pwm_mc parameter 2014-12-04 16:57:06 +01:00
Roman Bapst 7ea4d10bc9 added parameter file to makefile 2014-12-04 16:56:08 +01:00
Roman Bapst 4fd3e0720f added parameter file for vtol attitude control module 2014-12-04 16:55:12 +01:00
tumbili 563de3b49c in fw mode, publish also yaw and throttle on control group 1 for logging 2014-12-03 09:47:56 +01:00
Roman Bapst 887ed69099 added VTOL attitude control module 2014-12-02 10:50:25 +01:00