15635 Commits

Author SHA1 Message Date
Youssef Demitri
b83170b7c3 use indicated airspeed instead of tas 2015-11-25 15:25:39 +01:00
Roman Bapst
621c5b3e62 Merge pull request #2702 from PX4/vtol_land_detector
extend multicopter landing detector to consider airspeed for vtol
2015-11-25 15:02:19 +01:00
Roman Bapst
7de36b0264 Merge pull request #3267 from PX4/control_state_airspeed_fix
channel airspeed meas over control state for q estimator
2015-11-25 13:53:45 +01:00
Roman
c6408924cf add vtol land detector to CMakeLists.txt 2015-11-25 13:41:57 +01:00
tumbili
c9526af7af start correct land detector for vtol 2015-11-25 13:41:57 +01:00
tumbili
8832e178b0 added class for vtol landing detection 2015-11-25 13:41:57 +01:00
Roman
7cb7245a84 corrected tailsitter actuator control outputs 2015-11-25 13:28:23 +01:00
tumbili
990eb68bbf allow direct switch to fw if disarmed 2015-11-25 13:28:23 +01:00
tumbili
2e7c1e2b36 rename vtol model for SITL to tailsitter 2015-11-25 13:28:23 +01:00
tumbili
330f174967 fix 2015-11-25 13:28:23 +01:00
tumbili
27f027b3e4 ported vtol module to posix 2015-11-25 13:28:23 +01:00
Roman
7127f6a92f fixed code style 2015-11-25 13:28:23 +01:00
tumbili
0a0a074194 use virtual attitude setpoint
Conflicts:
	src/modules/vtol_att_control/tailsitter.cpp
	src/modules/vtol_att_control/tiltrotor.cpp
	src/modules/vtol_att_control/vtol_att_control_main.cpp
	src/modules/vtol_att_control/vtol_att_control_main.h
	src/modules/vtol_att_control/vtol_type.h
2015-11-25 13:28:22 +01:00
tumbili
d1dc8ed432 if vtol, publish virtual attitude setpoint
Conflicts:
	src/modules/mc_pos_control/mc_pos_control_main.cpp
2015-11-25 13:28:22 +01:00
davidvor
932883e303 errors 2015-11-25 13:28:22 +01:00
davidvor
945dda04ca comments 2015-11-25 13:28:22 +01:00
davidvor
76c479170a add transition back throttle value and angular rate 2015-11-25 13:28:22 +01:00
davidvor
19b9606486 simplifying transition for mc control only 2015-11-25 13:28:22 +01:00
davidvor
89b01fd45a turning on fw controler during p2 front transiion
turning on fw controler during p2 front transiion
simpling the weight for testing
setting output more like fw for transition
2015-11-25 13:28:22 +01:00
davidvor
059cffeb40 name change 2015-11-25 13:28:22 +01:00
davidvor
c32f5910e0 name change 2015-11-25 13:28:22 +01:00
davidvor
2721330040 errors 2015-11-25 13:28:22 +01:00
davidvor
2642b3fbea limit for pitch angle set point during transition 2015-11-25 13:28:22 +01:00
davidvor
30bb05487a mixer setup for tests 2015-11-25 13:28:22 +01:00
davidvor
2bf460cdfe adding variables for tailsitter transition 2015-11-25 13:28:22 +01:00
davidvor
0d58429565 poll on att_sp and att 2015-11-25 13:28:22 +01:00
davidvor
c129ebb0ea adding poll for att_sp and make the MC attitude controller work in transition 2015-11-25 13:28:22 +01:00
davidvor
28cc7521ff unnecessary parameter 2015-11-25 13:28:22 +01:00
davidvor
9e28365bbb adding pitch weight for tailsitters 2015-11-25 13:28:22 +01:00
davidvor
093d4fdd15 development of autonomous transition 2015-11-25 13:28:22 +01:00
davidvor
c39935f248 mixer for transition
not final yet
2015-11-25 13:28:22 +01:00
davidvor
6c5638062a tailsitter auto transition test!
Conflicts:
	src/modules/vtol_att_control/tailsitter.cpp
2015-11-25 13:28:22 +01:00
Roman Bapst
0fa8a5286b tiltrotor: publish attitude setpoint when doing a transition
Conflicts:
	src/modules/vtol_att_control/vtol_att_control_main.h
2015-11-25 13:28:21 +01:00
Roman Bapst
d55ccd96c6 let vtol attitude control module publish attitude setpoint during transition
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_att_control/fw_att_control_main.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
2015-11-25 13:28:21 +01:00
Roman Bapst
1f50041311 added flag indicating if vtol is doing a transition
Conflicts:
	msg/vtol_vehicle_status.msg
2015-11-25 13:28:21 +01:00
Roman Bapst
4e6ec2efa8 Merge pull request #3213 from sanderux/master
Added V-Tail VTOL config and mixer
2015-11-25 13:26:53 +01:00
Roman Bapst
bc08d8dc93 Merge pull request #3259 from PX4/mc_pos_hold
reset position hold flag
2015-11-25 13:25:17 +01:00
Youssef Demitri
e5b2c652e2 channel airspeed meas over control state for q estimator 2015-11-25 13:20:19 +01:00
Lorenz Meier
176fb3b185 Gyrosim: Code style fix 2015-11-25 11:16:28 +01:00
Lorenz Meier
24767547e9 Baro sim: Code style fix 2015-11-25 11:16:16 +01:00
Lorenz Meier
6a80d8b3dc Baro sim: Code style fix 2015-11-25 11:16:00 +01:00
Lorenz Meier
58aa8107de Accelsim: Code style fix 2015-11-25 11:15:43 +01:00
Lorenz Meier
c1a2d19459 MAVLink Sim: Use time delta 2015-11-25 11:13:32 +01:00
Lorenz Meier
1216efc5b4 Estimator Q: Fixed code style 2015-11-25 11:12:36 +01:00
Mark Charlebois
f3126e9d3a Fixes for DriverFramework, accelsim and gyrosim
DriverFramework was updated to properly delete nodes in managed lists.

Baro was fixed to use DriverFramework.

Accelsim was fixed with change to DriverFramework to return < 0 when start()
is called and the driver was already started, or stop() is called but the
driver was not running.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-11-24 22:46:20 -08:00
Lorenz Meier
b42bcc48bf Merge pull request #3263 from dagar/true_airspeed
HIL calculate TAS from IAS
2015-11-25 00:25:34 +01:00
Daniel Agar
56a6809486 HIL calculate TAS from IAS 2015-11-24 18:05:42 -05:00
Nate Weibley
483cb11157 Fix comparison error in RC+GPS triggered FTS failsafe check
This bug would cause loss of RC + loss of GPS to trigger a FTS when flying in non-manual modes with a good data link
2015-11-24 23:14:25 +01:00
tumbili
78ace92530 reset position hold flag 2015-11-24 16:57:19 +01:00
Lorenz Meier
17caae00aa Attitude estimator Q: Add performance counters for delay 2015-11-24 14:24:18 +01:00