Commit Graph

4684 Commits

Author SHA1 Message Date
Lorenz Meier bb5819a13f Merge branch 'multirotor' of github.com:cvg/Firmware_Private into multirotor 2013-08-25 16:33:24 +02:00
Lorenz Meier e119bbb0f1 A lot more on calibration and RC checks. Needs more testing, but no known issues 2013-08-25 16:33:14 +02:00
Anton Babushkin 41dfdfb1a4 Use common rc.multirotor script (now only in 01_fmu_quad_x). 2013-08-24 20:32:46 +02:00
Anton Babushkin 8579d0b7c9 Allow disarm by RC in assisted modes if landed and in AUTO_READY state. 2013-08-24 20:31:01 +02:00
Lorenz Meier 8df6acbfaf Merge branch 'multirotor' of github.com:cvg/Firmware_Private into multirotor 2013-08-24 13:42:10 +02:00
Lorenz Meier c42c28ebf4 Merge branch 'seatbelt_multirotor_new' of github.com:PX4/Firmware into multirotor 2013-08-23 23:08:12 +02:00
Anton Babushkin 5e9b508ea0 Indicate AUTO submodes in mavlink custom_mode. 2013-08-23 23:03:59 +02:00
Lorenz Meier 6865c1f599 Merge pull request #14 from tstellanova/multirotor_test
Need to set timestamp on rates_sp after updating
2013-08-23 13:55:12 -07:00
tstellanova d1fd1bbbf7 Fix timestamp on rates_sp 2013-08-23 13:27:16 -07:00
Lorenz Meier a897b3d88e Added complete attitude control framework 2013-08-23 16:28:53 +02:00
Julian Oes 1fed9ef1b1 Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3 2013-08-23 13:37:58 +02:00
Lorenz Meier 686d150800 Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into multirotor
ge aborts
2013-08-23 09:28:43 +02:00
px4dev 54711bbcfe In order to save people from themselves, force a given FMU version to depend on the corresponding _default IO version. This avoids the risk of building a new FMU ROMFS with an old IO firmware, at the cost of the sanity of anyone reading this. 2013-08-23 00:23:32 -07:00
px4dev f70a4b3b70 Add support for adding extra files to the ROMFS from the config.
If there is an IO firmware image already built when we build the corresponding FMU ROMFS, copy it into the ROMFS. Note - due to there being no fixed build ordering, to be certain that you have the most current IO firmware, you must build the IO firmware explicitly first.
2013-08-22 23:47:55 -07:00
Lorenz Meier ccf0916f16 Merge branch 'fmuv2_bringup_new_state_machine_drton' of github.com:cvg/Firmware_Private into multirotor 2013-08-23 08:34:00 +02:00
Lorenz Meier 29b926db1b Merged seatbelt_multirotor_new 2013-08-23 08:33:42 +02:00
Lorenz Meier 379a9fc24f Merge pull request #13 from tstellanova/update_config_files
Add new config file for X550; Add position estimator and position control
2013-08-22 22:15:51 -07:00
tstellanova 201bda4579 start position estimator and position control 2013-08-22 17:36:10 -07:00
tstellanova ac45c5afb3 Merge branch 'master' of https://github.com/tstellanova/px4v2_priv 2013-08-22 17:30:47 -07:00
tstellanova 64f402ce83 add placeholder autoconfig file for X550 2013-08-22 17:30:38 -07:00
tstellanova ca9aabf48b add placeholder autoconfig file for X550 2013-08-22 17:29:06 -07:00
Anton Babushkin 330908225e sdlog2: free buffer on exit 2013-08-22 18:23:42 +02:00
Anton Babushkin 41fac46ff0 mavlink VFR_HUD message fixed, minor fixes and cleanup 2013-08-22 18:05:30 +02:00
Anton Babushkin bb91484b26 Default flight mode switches parameters changed. 2013-08-22 17:34:59 +02:00
Anton Babushkin c0c5c1c70c Merge branch 'master' into seatbelt_multirotor_new 2013-08-22 17:32:59 +02:00
Anton Babushkin b5bb20995b multirotor_att_control: yaw setpoint reset fix 2013-08-22 17:31:59 +02:00
Julian Oes 5f1004117f Restore proper feedback (mavlink and tone) for calibration commands, etc 2013-08-22 15:57:17 +02:00
Julian Oes 6c3da5aedd Reset yaw position when disarmed in multirotor controller 2013-08-22 15:55:33 +02:00
Julian Oes ca96140b21 Allow the tone alarms to be interrupted 2013-08-22 15:53:46 +02:00
Julian Oes ab5ec0da0b Changed the default PID gains for the F330 2013-08-22 15:53:19 +02:00
Lorenz Meier 966cee66df Add navigator - not enabled for compilation, WIP 2013-08-22 15:32:58 +02:00
Lorenz Meier 85eafa323a Fix to RC param updates on IO 2013-08-22 10:43:19 +02:00
Lorenz Meier e97c39a125 Merge branch 'fmuv2_bringup' into multirotor 2013-08-22 10:14:01 +02:00
Lorenz Meier 11257cbade Fixed commandline handling 2013-08-22 10:13:47 +02:00
Lorenz Meier cfa9054aa4 Moved to USART1 for the main console, starting a 2nd NSH instance on USB if needed, reworked start scripts to not fall over 2013-08-22 09:25:13 +02:00
Lorenz Meier 3005c8aae0 Added missing config files, compiling 2013-08-21 18:37:22 +02:00
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
Simon Wilks 5a8dc9c504 Added TBS script 2013-08-21 15:15:34 +02:00
Lorenz Meier db1229dca3 Merge pull request #12 from cvg/fmuv2_bringup_lsm303d_config
Fmuv2 bringup lsm303d config
2013-08-21 06:10:33 -07:00
Kevin Hester 1c371a6cf8 openocd: lost change from my cherry-picking 2013-08-21 15:02:34 +02:00
Kevin Hester fa8f8f2a02 add step hooks to make stepping work correctly for non isrs
Conflicts:

	Debug/openocd.gdbinit
	Debug/px4fmu-v1-board.cfg
2013-08-21 15:02:18 +02:00
Kevin Hester f665ace38c Add scripts for debugging with openocd
Note: We now use the version of stm32f4x that comes with openocd 0.7.0 or later
2013-08-21 15:01:51 +02:00
Andrew Tridgell 2bcf4385f6 build: use unqualified com port names on windows
the qualified names were not working with current versions of python
2013-08-21 15:00:19 +02:00
Lorenz Meier 5be2f4a792 Moved mavlink log to system lib 2013-08-21 14:54:57 +02:00
Julian Oes 4f51f333a9 Adapted the MPU6000 to have the same get range ioctls and defines for defaults 2013-08-21 14:52:20 +02:00
Julian Oes 1ede95d252 L3GD20 and LSM303D reset and range config working properly now 2013-08-21 14:21:54 +02:00
Julian Oes 8083efb60c Use gyro at correct rate 2013-08-21 14:21:11 +02:00
Julian Oes 7db420b9b2 Get units right in config 2013-08-21 14:20:42 +02:00
Lorenz Meier 64b8f5232b Build fix, added command line switch norc to disable RC 2013-08-21 13:54:37 +02:00