10668 Commits

Author SHA1 Message Date
Thomas Gubler
12ae4fe869 Merge remote-tracking branch 'upstream/rcvariables' into ros 2015-01-08 17:08:59 +01:00
Thomas Gubler
fb151a855f Merge remote-tracking branch 'upstream/master' into ros 2015-01-08 17:08:30 +01:00
Thomas Gubler
450d8ee452 remove/unset startup script variables 2015-01-08 17:03:51 +01:00
Lorenz Meier
aa2a00b56a Merge branch 'MixerNaming' of github.com:anton-matosov/Firmware 2015-01-08 12:45:43 +01:00
Anton Matosov
e405fafe88 Applied code review comments (newline at end of file, whitespaces in empty lines) 2015-01-08 13:35:02 +02:00
Simon Wilks
1df7939072 Remove bottle_drop as it should be optional. 2015-01-08 12:16:31 +01:00
Anton Matosov
25054d389a Broke down the elif into else and if as nsh doesn't support elif
Fix invalid set of the variable
2015-01-08 12:55:50 +02:00
Thomas Gubler
bb0d04212f remove copy of std_msgs 2015-01-08 11:33:59 +01:00
Thomas Gubler
42430fb5ef remove .catkin_workspace file 2015-01-08 11:29:16 +01:00
Thomas Gubler
f960bbf529 bring back switch_pos_t 2015-01-08 10:54:09 +01:00
Thomas Gubler
f86c0ed892 remove fw_att_control base classes: as long as they are not integrated into fw_att_control_main they are useless 2015-01-08 09:21:11 +01:00
Thomas Gubler
94ab82ba40 R_adapted.data is 2d, making this more obvious 2015-01-08 09:14:21 +01:00
Thomas Gubler
f13f41f704 point uavcan submodule to same commit as master 2015-01-08 09:08:50 +01:00
Thomas Gubler
74af4807a1 Matrix.hpp: remove wrong and correct formatting changes which are not on master for clarity 2015-01-08 08:26:04 +01:00
Thomas Gubler
c118d17cb5 fix code style in src/platforms 2015-01-08 08:15:44 +01:00
Thomas Gubler
34b023d0a6 revert strange change in nsh Make.defs 2015-01-08 08:08:45 +01:00
Daniel Agar
cc2d0f00d6 move sf0x_test to gtest 2015-01-07 23:17:31 -05:00
Daniel Agar
a4db73dad8 move st24_test to gtest 2015-01-07 23:15:12 -05:00
Anton Matosov
08062e6546 Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu
Implemented automatic lookup for the .aux.mix file if it exists
2015-01-08 00:53:52 +02:00
Thomas Gubler
143ff444e4 fix merge error of tests target change 2015-01-07 17:28:56 +01:00
Thomas Gubler
154111d4c0 move checksubmodules and generateuorbtopicheaders dependency 2015-01-07 17:01:03 +01:00
Thomas Gubler
fe279d340d Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	Makefile
2015-01-07 16:00:59 +01:00
Thomas Gubler
417a82c699 add ros setup scripts 2015-01-07 13:48:20 +01:00
Lorenz Meier
6ed2f77ca5 Merge pull request #1599 from PX4/mtk_time
GPS driver: Add missing wall clock setup for MTK GPS modules
2015-01-07 13:02:50 +01:00
Thomas Gubler
a01a8f9553 add missing defines for unittests 2015-01-07 08:20:35 +01:00
Thomas Gubler
e855e4454c exclude macro hack for tests target 2015-01-07 00:19:30 +01:00
Thomas Gubler
213f08ee07 generate uorb topic headers for tests make target 2015-01-06 23:52:04 +01:00
Lorenz Meier
74b63d08e1 Mixer load: Be less chatty 2015-01-06 19:53:52 +01:00
Roman Bapst
5c5bba5d5f specify secondary elevon mixer 2015-01-06 19:51:04 +01:00
Roman Bapst
7ab58a8bc1 allow to specify secondary mixer which drives fmu PWM outputs 2015-01-06 19:51:04 +01:00
Roman Bapst
ff932820e3 use two mixers, one for rotors via px4io and one for elevons via fmu outputs 2015-01-06 19:51:04 +01:00
Lorenz Meier
648cb78268 FMU driver: Show up as secondary interface to allow mixer loads. 2015-01-06 19:51:04 +01:00
tumbili
ef9b1b134e get MAV_TYPE by mixer file for FireFly6 2015-01-06 19:51:04 +01:00
tumbili
f4c294bf5d added startup script and mixer file for FireFly6 2015-01-06 19:51:04 +01:00
Thomas Gubler
f37fdd95af add and use PX4_ROS preprocessor define 2015-01-06 19:45:57 +01:00
Thomas Gubler
ee561947e9 makefile: fix order 2015-01-06 19:14:57 +01:00
Thomas Gubler
5056b03ab0 geo: fix include 2015-01-06 19:14:01 +01:00
Thomas Gubler
0893f9fd96 remove uavcan from multiplatform build, problems with linking 2015-01-06 19:13:39 +01:00
Lorenz Meier
78cde98ea8 GPS driver: Add missing wall clock setup for MTK GPS modules 2015-01-06 18:22:44 +01:00
Thomas Gubler
c6722fce0b fw att control: cleanup, create base class for ECL
Adding a new base class to remove a lot of boilerplate code, no
functionality changes
2015-01-06 16:11:31 +01:00
Lorenz Meier
c1161d4e89 Merge pull request #1592 from dagar/unittests
Move all unittests to cmake
2015-01-06 15:33:08 +01:00
Daniel Agar
620df8ba0b cmake unittests add PX_SRC variable to cleanup long paths 2015-01-06 08:50:45 -05:00
Daniel Agar
3606f5370a cmake generate mixer_multirotor.generated.h for unittests 2015-01-06 08:46:58 -05:00
Daniel Agar
e23b73e415 Merge remote-tracking branch 'upstream/master' into unittests 2015-01-06 08:38:08 -05:00
Lorenz Meier
4a3145f0ed Merge pull request #1594 from PX4/multitablespython3
Multitables script fixes
2015-01-06 12:09:44 +01:00
Thomas Gubler
581d4e1110 travis: apt-get install python-empy 2015-01-06 11:58:04 +01:00
Thomas Gubler
3436abdf0b add multiplatform makefile to work around flash size issues 2015-01-06 11:10:52 +01:00
Thomas Gubler
f871b777ab destructors for px4_nodehandle 2015-01-06 11:09:11 +01:00
Thomas Gubler
94b9251a69 Merge remote-tracking branch 'upstream/multitablespython3' into dev_ros 2015-01-06 10:34:53 +01:00
Thomas Gubler
a42febc993 remove output of multi_tables script 2015-01-06 10:29:36 +01:00