Commit Graph
73 Commits
Author SHA1 Message Date
Lorenz Meier 15e8f28c88 VTOL att control: Move param file to generated version 2015-11-07 09:53:52 +01:00
Roman 9ef2994134 fix code style of vtol files 2015-10-29 07:55:47 +01:00
Roman 6634952a0c removed unused vtol variables 2015-10-29 07:54:38 +01:00
tumbili b6c19400c0 build vtol att control module for sitl 2015-10-27 10:42:04 +01:00
tumbili 93e557ab75 ported vtol module to posix 2015-10-27 10:18:28 +01:00
Lorenz Meier fa5071b3c5 Remove module.mk files to prevent confusion of adopters upgrading 2015-10-06 11:23:20 +02:00
James Goppert 1d6b31d196 Switch to cmake build system. 2015-09-07 20:37:45 -04:00
Simon Wilks 22690ce897 Take throttle from the appropriate controller given the current mode. 2015-08-23 20:54:53 +02:00
Andreas Antener 9aca1701f4 code-style fixes 2015-08-18 11:44:01 +02:00
Andreas Antener 80a3c74cfc evaluate transition command in vtol controller instead of vtol type, use distinct state variables instead of additional command struct 2015-08-18 11:44:01 +02:00
Andreas Antener 5463c6767d reset transition command to current state when not in offboard 2015-08-18 11:44:01 +02:00
Andreas Antener 1da703a13d implemented MAVLink command for VTOL transitions, pulled switch up for each type 2015-08-18 11:44:01 +02:00
Andreas Antener f1ab7cc880 wait until back transition time has passed 2015-08-17 16:27:20 +02:00
tumbili 04f55ce784 vtol fixes:
- mc pos control: publish attitude setpoint when vtol is in trans mode
- fw att control: do not publish attitude setpoint when in transition mode
- introduce flag in_transition_mode in vehicle status message for vtol
- improve tiltrotor code based on flight testing
2015-08-12 20:33:17 +02:00
Simon Wilks c448f955e0 Position control needs to be deactivated during the transition otherwise it will fight itself. 2015-08-12 20:33:16 +02:00
Simon Wilks e7364d302a Allow the user to provide the motor/channel numbers that should be disabled in fixed wing mode in the airframe config. 2015-08-12 20:33:16 +02:00
tumbili c21dd735ed replaced tiltrotor defines by parameters 2015-08-12 20:33:16 +02:00
tumbili b3613dea83 - use index definitions to access actuator controls struct for better readability
- defined vector for mc_att_ctrl_weights
- more cleanup
2015-08-12 19:34:44 +02:00
tumbili 17a92b51c7 adapted code for standard vtol to new structure in vtol_att_control_main 2015-08-12 19:34:44 +02:00
tumbili 5a6bcf3834 removed unused functions 2015-08-12 19:34:44 +02:00
tumbili c1025ca44e adapted tailsitter code to structural changes in vtol_att_control_main 2015-08-12 19:34:44 +02:00
tumbili 02fda7a0f5 major cleanup of tiltrotor code 2015-08-12 19:34:43 +02:00
tumbili 4ecde8661f - removed unnecessary process function calls
- use one function call to fill actuator outputs
2015-08-12 19:18:20 +02:00
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