Commit Graph

33 Commits

Author SHA1 Message Date
Lorenz Meier fab110d21f Moved math library to library dir, improved sensor-level HIL, cleaned up geo / conversion libs 2013-08-21 18:13:01 +02:00
Lorenz Meier 309ea81460 Merged fmuv2_bringup 2013-08-21 15:19:19 +02:00
Lorenz Meier 5be2f4a792 Moved mavlink log to system lib 2013-08-21 14:54:57 +02:00
Julian Oes 02c23c785e System status load is now from 0 to 1 instead of non-intuitive 0 to 1000 2013-08-16 10:17:57 +02:00
Anton Babushkin d7730a3444 commander, mavlink: fixed base_mode and custom_mode in mavlink 2013-08-14 10:59:22 +02:00
Anton Babushkin 8c1067a017 State machine rewritten, compiles, WIP 2013-07-28 23:12:16 +04:00
Anton Babushkin 963abd66ba commander: WIP, SEATBELT renamed to ASSISTED, added SIMPLE mode, added ASSISTED switch, some cleanup and reorganizing 2013-07-22 21:48:21 +04:00
Lorenz Meier 1575da4390 Merge branch 'master' of github.com:PX4/Firmware into new_state_machine 2013-07-19 12:53:37 +02:00
Lorenz Meier 7bf2edc3bf Script cleanup, WIP on mavlink logging 2013-07-18 14:01:42 +02:00
Lorenz Meier 8d1abf4aa4 Lunchtime HOTFIX: Bring back USB console to operational, allow single-USB connection operation via QGC 2013-07-18 13:16:34 +02:00
Julian Oes bcdedd9a35 Changed location of lots of flags and conditions, needs testing and more work 2013-07-16 18:56:31 +02:00
Julian Oes 1b38cf715d Renamed actuator_safety back to actuator_armed, compiling but untested 2013-07-15 22:15:15 +02:00
Lorenz Meier bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Lorenz Meier 3b9c306d64 Hotfix for relative altitude waypoints 2013-07-12 11:11:26 +02:00
Lorenz Meier 040b8f3802 Cleaned up MAVLink include hierarchy 2013-07-08 14:16:46 +02:00
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
Lorenz Meier 7ca0698a6b Fixed HIL handling 2013-07-05 11:43:42 +02:00
Lorenz Meier 3686431231 Removed leftover mavlink_receiver.c file 2013-07-04 15:41:42 +02:00
Lorenz Meier 9aee419324 Updated mavlink version, massive improvements in mission lib, fixes to HIL (state and sensor level) 2013-07-04 15:40:20 +02:00
Julian Oes 202792294a Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +02:00
Julian Oes 9f5565de32 Controllers should not access state machine anymore but access the vehicle_control_mode flags 2013-06-15 19:41:54 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Lorenz Meier eb76d116cc Minor state machine improvements and fixes for IO safety / in-air restart handling 2013-06-12 12:30:42 +02:00
Julian Oes 7f90ebf537 Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/examples/fixedwing_control/main.c
2013-06-12 12:24:52 +02:00
px4dev 23a6234235 Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different. 2013-06-01 23:31:53 +02:00
Lorenz Meier 327d8751d2 Hotfix: Removing GPS debug output 2013-05-22 17:53:17 +02:00
Lorenz Meier 5d9512eb79 Removed unnecessary cplusplus check 2013-05-21 10:17:37 +02:00
Lorenz Meier e655c0fc57 Fixed missing count 2013-05-21 10:14:16 +02:00
Lorenz Meier 5dfde44c56 Fixed va args in MAVLink, tested with RC config, correct output 2013-05-21 09:14:22 +02:00
Lorenz Meier d720944efe VA args now supported by MAVLink text messages 2013-05-21 09:14:22 +02:00
Julian Oes f5c157e74d Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
2013-05-17 11:24:02 +02:00
Lorenz Meier 3152dae3dc Merged with master 2013-05-09 15:52:36 +02:00
Lorenz Meier d8a3454538 Cut over MAVLink to new build system 2013-04-27 11:45:46 +02:00