Commit Graph

10695 Commits

Author SHA1 Message Date
Thomas Gubler 3da1b701ed ros: add type specific use files than can be used by all toplevel launchfiles 2015-01-14 11:31:44 +01:00
Thomas Gubler 6b0d0aa2a5 ros: make mixer name a param 2015-01-14 11:27:32 +01:00
Thomas Gubler f6c0d2310d ros mixer node: add w mixer 2015-01-14 07:41:14 +01:00
Thomas Gubler dd2d53d7e3 add outdoor launch file 2015-01-13 14:49:38 +01:00
Thomas Gubler 0c82600b83 rename launch files and add iris empty world launch file 2015-01-13 11:46:50 +01:00
Thomas Gubler 1cff86b0b5 ros mixer: increase number of controls to default to fix undefined behaviour 2015-01-13 09:13:23 +01:00
Thomas Gubler 2669c699c7 ros attitude estimator dummy: fix topic name 2015-01-13 09:12:49 +01:00
Thomas Gubler 8f8daf6594 ros: house_world launch file 2015-01-10 19:15:01 +01:00
Thomas Gubler 6580d66d45 ros sim: use ardrone model 2015-01-10 19:14:23 +01:00
Thomas Gubler aa8555c02b add house world launch file 2015-01-09 16:56:15 +01:00
Thomas Gubler c2cc247e76 renamed mc_att_control_multiplatform to mc_att_control_m 2015-01-09 09:39:21 +01:00
Thomas Gubler 2b43e0fc30 autstart for mc_att_control_m 2015-01-09 09:15:48 +01:00
Thomas Gubler b2366aaa22 Merge remote-tracking branch 'upstream/master' into ros 2015-01-09 08:07:00 +01:00
Lorenz Meier ab1d218454 Merge pull request #1622 from PX4/rcvariables
rcS: unset MODE and AUTOCNF
2015-01-09 07:59:50 +01:00
Thomas Gubler d1e0606500 unset MODE and AUTOCNF 2015-01-09 07:56:20 +01:00
Lorenz Meier 58b4216cd0 Merge pull request #1614 from PX4-Works/sdio_fix
Updated submodule and config for SDIO fix
2015-01-09 07:12:30 +01:00
Lorenz Meier adbe7246b7 Temporarily disable HoTT support 2015-01-09 07:09:58 +01:00
Lorenz Meier e4a3c3f76d Merge pull request #1600 from anton-matosov/SK450DeadCat.v2
Implemented SK450 DeadCat frame support
2015-01-08 17:55:12 +01:00
Lorenz Meier 28ddd72987 Merge pull request #1620 from PX4/rcvariables
remove/unset startup script variables
2015-01-08 17:54:30 +01:00
Lorenz Meier 0f70b4b846 Merge branch 'px_uploader_improvements' of github.com:Zefz/Firmware 2015-01-08 17:53:11 +01:00
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
Johan Jansen 1eda1f816b px_uploader: Minor code cleanup 2015-01-08 16:30:47 +01:00
Johan Jansen 2aa7b3038a px_uploader: Added progress bar for erasing and uploading firmware 2015-01-08 13:18:50 +01:00
Anton Matosov ba89c9eae2 Adopted sk450_deadcat mixer file name 2015-01-08 13:58:46 +02:00
Anton Matosov 8624e2a775 Fixed naming of the mixer
Added mixer check to set MAV_TYPE correctly
2015-01-08 13:58:46 +02:00
Anton Matosov 2776a705f4 Adopted SK540 config to the latest changes in the init scripts
Lowered the pwm min
2015-01-08 13:58:46 +02:00
Anton Matosov 7d528330d5 Implemented SK450 DeadCat frame support
Implemented the way to specify motor output scale which is required for SK450 DeadCat as it has asymetrical arms (front arms are longer than back ones)
2015-01-08 13:58:46 +02: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
David Sidrane 7cb1d09278 Updated submodule and config for SDIO fix 2015-01-07 17:59:23 -10: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