Commit Graph

2204 Commits

Author SHA1 Message Date
Lorenz Meier ab407a82ba Merge branch 'master' into mount_tests 2014-01-07 22:42:09 +01:00
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +01:00
Lorenz Meier 76477b2057 Added support for Octo Cox 2014-01-06 09:25:53 +01:00
Lorenz Meier 7590d91cf2 Improved mount test 2014-01-04 17:05:52 +01:00
Lorenz Meier 97e8386290 Auto-restarting mount test if config file present 2014-01-04 13:54:14 +01:00
Anton Babushkin 5bedd8c714 Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 14:52:00 +04:00
Anton Babushkin 6a5d5f7136 Merge master into navigator_new 2014-01-02 14:51:48 +04:00
Lorenz Meier 1d9e8a7b72 Reboot if IO update startup fails on first try 2014-01-01 23:43:39 +01:00
Anton Babushkin b7f2c89a16 Merge branch 'master' into navigator_new_vector 2014-01-01 14:14:35 +04:00
Anton Babushkin a71b04775c Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector 2013-12-30 08:55:26 +04:00
Lorenz Meier bc76924b7e Cleanup, removed commander start calls in locations where its not needed 2013-12-30 00:52:50 +01:00
Julian Oes c1e50b8a1f Merge remote-tracking branch 'px4/master' into navigator_new 2013-12-29 14:48:54 +01:00
Lorenz Meier 07c1ff77a2 Fixed MAV type and typo 2013-12-28 23:21:31 +01:00
Lorenz Meier 5e8857e411 Further cleanup, added octos 2013-12-28 22:52:23 +01:00
Lorenz Meier ab330de180 Fixed typo 2013-12-28 22:34:09 +01:00
Lorenz Meier 501c5ff49f Cleaned up startup, should be completely compatible, but allows clean QGC indices 2013-12-28 22:18:07 +01:00
Lorenz Meier d7a3aaba45 Getting multicopter startup back to generic, trimming down number and content of different startup scripts 2013-12-28 22:16:06 +01:00
Simon Wilks b20e07a1c5 Updated defaults following recent test flight that included autostart and land 2013-12-28 18:12:55 +01:00
Simon Wilks 1cca94defc Whitespace fix 2013-12-28 17:23:52 +01:00
Simon Wilks 1637c62751 Set the tested defaults 2013-12-28 17:19:09 +01:00
Simon Wilks 988c5351e3 Merge remote-tracking branch 'upstream/master' into fx79 2013-12-28 17:15:16 +01:00
Simon Wilks 3f84ad79c5 Typo fix. 2013-12-28 14:46:55 +01:00
Simon Wilks 4e5f743e41 Added config for the FX-79 2013-12-28 14:45:29 +01:00
Simon Wilks f17538a7f3 Updated parameters to latest flight tested values 2013-12-28 09:03:42 +01:00
Simon Wilks d9f75a751b Startup script for Wing Wing (Z-84) 2013-12-28 08:56:58 +01:00
Anton Babushkin 7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Julian Oes 40f2d581bf Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator
Conflicts:
	src/drivers/px4fmu/fmu.cpp
	src/modules/dataman/dataman.c
	src/modules/dataman/dataman.h
	src/modules/mavlink/orb_listener.c
	src/modules/mavlink/waypoints.c
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_mission.cpp
	src/modules/navigator/navigator_mission.h
	src/modules/uORB/topics/mission.h
2013-12-27 00:04:32 +01:00
Julian Oes 05ec96b0f7 Startup script for simple logging 2013-12-26 23:46:33 +01:00
Anton Babushkin e1f949163b makefiles and rc scripts fixed to use new attitude and position controllers 2013-12-26 23:06:36 +04:00
Anton Babushkin 1e4bb764a6 Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:31:12 +04:00
Thomas Gubler 80986ce813 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups 2013-12-23 16:59:20 +01:00
Thomas Gubler 1450903fa9 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/modules/navigator/navigator_main.cpp
2013-12-23 11:47:17 +01:00
Thomas Gubler 68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
2013-12-23 11:13:42 +01:00
Lorenz Meier a707e8cdb3 Added missing folder 2013-12-21 18:58:28 +01:00
Lorenz Meier 8c518aa237 Useful bits for high-rate logging 2013-12-20 14:25:35 +01:00
Anton Babushkin 948acd28cc Merge branch 'master' into vector_control2 2013-12-19 19:47:31 +04:00
Lorenz Meier f042ea1623 Removed whitespace 2013-12-17 10:20:22 +01:00
Anton Babushkin 084287132a HIL rc scripts fixed 2013-12-16 12:56:27 +04:00
Anton Babushkin 7cbb4cfdb8 Merge branch 'master' into vector_control2 2013-12-16 12:47:40 +04:00
Lorenz Meier b63d4809de Enabled MPU6K and updated startup script to start all sensors 2013-12-15 19:35:23 +01:00
Lorenz Meier ea10d55d71 Auto-update of IO firmware, shorter preflight check alarm 2013-12-14 15:08:56 +01:00
Thomas Gubler c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/drivers/px4io/px4io.cpp
2013-12-13 21:07:27 +01:00
Anton Babushkin deac4eefc6 Merge branch 'master' into vector_control2 2013-12-13 21:15:21 +04:00
Lorenz Meier 0b9b68f0d9 Merge pull request #535 from NosDE/master
Device renamed, custom device on parameter switch
2013-12-13 08:10:57 -08:00
Anton Babushkin 6705e9518b Merge branch 'master' into vector_control2 2013-12-13 17:26:07 +04:00
Thomas Gubler b86161dd45 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator
Conflicts:
	src/modules/mavlink/missionlib.c
	src/systemcmds/tests/module.mk
2013-12-05 10:53:41 +01:00
Julian Oes 03a5426001 Merge branch 'fw_autoland_att_tecs_navigator' into bottle_drop_navigator
Conflicts:
	src/modules/navigator/navigator_main.cpp
2013-12-03 20:50:52 +01:00
Julian Oes 83b09614e7 Dataman: Start dataman and use it in waypoints and navigator instead of mission items in mission topic 2013-12-03 16:25:11 +01:00
Julian Oes 0ec609f491 Bottle drop: added custom HIL startup script 2013-12-02 23:01:02 +01:00
Julian Oes 193692cc0d Hex Startup: Set rate of all 8 PWM outputs (6 are not possible because rate can only be changed for channel groups 2013-12-01 22:44:36 +01:00