Commit Graph

752 Commits

Author SHA1 Message Date
Thomas Gubler 84ff3c671d Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
	src/drivers/px4fmu/fmu.cpp
2015-02-01 11:06:47 +01:00
Lorenz Meier 8de411619a Initial stab at supporting multiple publications on the same base name and auto-enumeration of additional publications. 2015-01-29 16:33:52 +01:00
Thomas Gubler 1915537281 initial port of multiplatform version of mc_pos_control 2015-01-28 16:32:20 +01:00
Thomas Gubler 2728889f78 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_attctlposctl 2015-01-28 16:29:14 +01:00
Lorenz Meier 18d756dd59 USB startup: Ensure that we are not talking to the peripheral too soon. Startup does not take longer due to smart rearrangement of launch calls 2015-01-26 08:59:19 +01:00
Pavel Kirienko d87bb4dfcb Revert "Intrusive changes made for UAVCAN profiling. Will be reverted in the next commit (this one is needed to keep the changes in history)"
This reverts commit 4c301d9dcf180e39186fa6753c7a3d3215b3cfa7.
2015-01-21 14:54:23 +01:00
Pavel Kirienko 6bbacc4271 Intrusive changes made for UAVCAN profiling. Will be reverted in the next commit (this one is needed to keep the changes in history) 2015-01-21 14:54:23 +01:00
Thomas Gubler dcdde8ea88 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
	src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
2015-01-21 14:41:03 +01:00
Lorenz Meier dad2f754e9 Logging: Reduce logging on FMUv1 to free system resources 2015-01-21 09:54:31 +01:00
Johan Jansen e40d207311 AStyle: Fixed file formatting 2015-01-15 14:37:51 +01:00
Johan Jansen 73c7b44f6a ROMFS: Corrected land detector startup scripts 2015-01-15 14:37:51 +01:00
Johan Jansen b5c7c6a15b ROMFS: Added the respective land detector to the startup scripts 2015-01-15 14:37:50 +01:00
Thomas Gubler 96db9e8188 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	src/platforms/px4_middleware.h
2015-01-15 12:42:28 +01:00
Lorenz Meier 78b603bb35 ROMFS: Fix up VTOL autostarts 2015-01-12 17:20:58 +01:00
Simon Wilks 8ed6612c1a Fix PWM OUT command and update fligth tested params. 2015-01-09 12:44:31 +01:00
Thomas Gubler 2b43e0fc30 autstart for mc_att_control_m 2015-01-09 09:15:48 +01:00
Lorenz Meier eab9ddb212 ROMFS: Set unneeded string during startup 2015-01-09 09:08:51 +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 e4a3c3f76d Merge pull request #1600 from anton-matosov/SK450DeadCat.v2
Implemented SK450 DeadCat frame support
2015-01-08 17:55:12 +01:00
Thomas Gubler 450d8ee452 remove/unset startup script variables 2015-01-08 17:03:51 +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
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
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
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
Anton Matosov 68978b814a Fixed autoconf variable check 2015-01-05 13:23:47 +02:00
Thomas Gubler bccc37cfb9 send MANUAL_CONTROL stream over usb 2015-01-04 12:31:21 +01:00
Lorenz Meier 5f147f3a6f Mixer: Rename to .md and change syntax to markup 2015-01-04 00:14:09 +01:00
Lorenz Meier 4d9e4949fc Merge pull request #1566 from AndreasAntener/update-mixer-readme
Mixer README: reference wiki and remove duplicated information
2015-01-04 00:11:58 +01:00
Andreas Antener 7866904093 Reference wiki and remove duplicated information 2015-01-03 22:47:00 +01:00
Lorenz Meier 7d712a4cd1 Test image ROMFS: Start all sensors 2015-01-03 17:54:49 +01:00
Lorenz Meier d638cbda83 start MS5611 in parallel 2015-01-02 12:28:22 +01:00
Lorenz Meier d8ff76bf7e Fix parameter name for initial setup parameter config 2014-12-30 10:44:23 +01:00
Lorenz Meier b097b13ba6 Companion computer interface: Add SYS_COMPANION parameter. Setting it to 921600 enables the companion interface. 2014-12-26 18:01:52 +01:00
Lorenz Meier 407889ea2c Merged master into indoor branch 2014-12-26 17:06:19 +01:00
Roman Bapst f3b5b67eec shortened parameter names to max 16 bytes 2014-12-18 12:43:23 +01:00
Roman Bapst 669e1f96d8 fixed parameter issue for VTOL so that parameter wiki tool can document them 2014-12-18 10:46:36 +01:00
Roman Bapst 0e79cbf234 fixed startup for VTOL -> some variable names were changed lately 2014-12-18 10:43:32 +01:00
Simon Wilks d39e29e6ae Up the min PWM slightly. 2014-12-17 16:07:57 +01:00
Simon Wilks a65151d1c0 Airframe config and autostart for the TBS Discovery Long Range 2014-12-17 14:50:11 +01:00
tumbili 89e2e08de0 removed white space noise 2014-12-15 22:47:10 +01:00
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
Lorenz Meier aa40c69853 Ensure no SD alarm always plays. Fixes #1500 2014-12-15 15:34:19 +01:00
Thomas Gubler 642b2088c3 autostart ll40ls 2014-12-14 11:43:25 +01:00
Thomas Gubler 29eab8ebd4 change [init] to [i]
This change was introduced in pull #1461. This fixes some missed
occurrences.
2014-12-14 11:28:25 +01:00
Lorenz Meier 24fd099e58 ROMFS: Better commenting, save some more RAM 2014-12-13 15:57:38 +01:00
Lorenz Meier e1c12bf67c ROMFS: rc.interface: Make output less verbose to clutter boot log less 2014-12-13 15:33:42 +01:00
Thomas Gubler 58d69052e2 Merge remote-tracking branch 'upstream/master' into romfs_clean
Conflicts:
	ROMFS/px4fmu_common/init.d/rc.interface
	ROMFS/px4fmu_common/init.d/rcS
2014-12-13 15:05:56 +01:00
Lorenz Meier 4bb07514c8 Give Skywalker its own mixer 2014-12-12 23:22:21 +01:00
Roman Bapst 692af62885 set vtol motor count- and idle pwm parameter 2014-12-04 16:58:43 +01:00
tumbili 21465bc287 added missing newline 2014-12-03 09:59:18 +01:00
tumbili fa8ca2fc10 set correct number of PWM outputs and PWM Rate for caipirinha VTOL 2014-12-03 09:42:12 +01:00
Roman Bapst e027bf2213 removed remainings of quadshot for now 2014-12-02 11:02:23 +01:00
Roman Bapst 48ba912f08 adapted and added ROMFS-scripts to support VTOL 2014-12-02 10:30:26 +01:00
Roman Bapst 39169c35fe added configuration file and mixer file for for caipironha VTOL 2014-12-02 10:28:30 +01:00
Lorenz Meier 2a9a649adb Make boot less verbose to not hide the important status messages 2014-11-26 18:21:54 +01:00
Lorenz Meier 00961b5592 ROMFS: Do only output necessary information on boot 2014-11-22 16:34:01 +01:00
Lorenz Meier f3a224e30d Merged master 2014-11-22 12:47:08 +01:00
Thomas Gubler 1b47f05b14 rename DO_AUTOCONFIG to AUTOCNF in all files 2014-11-17 17:10:47 +01:00
Thomas Gubler 32f88bbe84 rename PWM_OUTPUTS to PWM_OUT in all files 2014-11-17 17:02:57 +01:00
Thomas Gubler b808cc9a1b fix variable name in rc.uavcan 2014-11-17 16:38:20 +01:00
Lorenz Meier 489b4c4839 Reduce too chatty content, de-allocate non-needed string buffers 2014-11-17 14:58:29 +01:00
Lorenz Meier b06f7f4f2e Reduce ROMFS footprint 2014-11-17 14:56:11 +01:00
Lorenz Meier 6d59df1a5f Make ROMFS less chatty 2014-11-15 16:19:51 +01:00
Lorenz Meier 780451dd65 Remove unneeded file 2014-11-15 13:48:30 +01:00
fludwig c8a8305326 added switch to send PWM to Brushless Controller in unarmed state 2014-11-10 23:49:52 +01:00
Simon Wilks 99f839b038 Add a min PWM output so motors idle on arming. 2014-10-23 10:57:31 +02:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Thomas Gubler cc05f0f185 Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
2014-09-30 15:38:27 +02:00
Julian Oes d9bb3a5112 viper: removed wrong failsafe values 2014-09-23 06:08:24 +10:00
Julian Oes bdddcf338d viper: changed some values for doors and bottle drop servos 2014-09-20 22:53:56 +10:00
Don Gagne deda5d0a04 Upgraded unit test framework 2014-09-13 19:59:44 -07:00
Vladimir Ermakov ed66097ebc FTP: Update unit test for new header size.
_list_test failed.
2014-09-10 11:54:42 +04:00
Lorenz Meier 75e9497ab1 Fix FX79 mixer 2014-09-03 18:15:30 +02:00
Don Gagne 7db57310d5 New mavlink_ftp unit test data 2014-09-02 15:32:16 -07:00
Lorenz Meier cc944da1a4 Merge branch 'master' of github.com:PX4/Firmware into indoor 2014-09-01 20:30:07 +02:00
Lorenz Meier c9a92e6030 Merge branch 'master' into swissfang 2014-08-31 21:12:23 +02:00
Lorenz Meier 84d26185df Better initial config for Phantom 2014-08-31 21:11:20 +02:00
Lorenz Meier 0df878d2d5 Start flow driver, start MAVLink instance with right arguments 2014-08-27 09:49:19 +02:00
Lorenz Meier 863b6d2d94 Merge branch 'master' of github.com:PX4/Firmware into indoor 2014-08-27 09:46:21 +02:00
Lorenz Meier e14366fef3 Merged master 2014-08-26 20:17:57 +02:00
Lorenz Meier 65dab36910 Improve startup and payload handling 2014-08-26 10:13:52 +02:00
Lorenz Meier 47e39841df Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang 2014-08-26 09:37:56 +02:00
Pavel Kirienko 1fa49aaea9 UAVCAN: clarification 2014-08-24 01:41:54 +04:00
Pavel Kirienko 6a8971e28f New UAVCAN initialization logic 2014-08-23 17:31:46 +04:00
Lorenz Meier 8a2089e257 Enable TELEM2 MAVLink, forward local pos at 30 Hz if connected via USB 2014-08-21 14:30:17 +02:00
Lorenz Meier ebf7e1c22f Merge branch 'master' of github.com:PX4/Firmware into indoor 2014-08-20 20:23:13 +02:00
Lorenz Meier 20ceba48cf Do not modify startup where not absolutely required 2014-08-15 20:34:04 +02:00
Simon Wilks 0c78794e57 Fix the index numbers and command max travel in the app for the drop servo. 2014-08-14 16:43:49 +02:00