fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-29 16:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,653 Commits 852 Branches 161 Tags
88389ea2554c6f56a4fdd86cdd86a1e7b6affc21
Commit Graph

3653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine 
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
 2013-07-08 10:31:32 +02:00
Lorenz Meier cf2dbdf9a1 Merge pull request #320 from PX4/integration 
NuttX integration merge
 2013-07-07 10:59:43 -07:00
Lorenz Meier 7cf121472e Merge pull request #325 from sjwilks/airspeed 
Don't zero out the reported airspeed when below 15km/h
 2013-07-07 02:31:14 -07:00
Simon Wilks 2b41e1a23b Merge remote-tracking branch 'upstream/master' into airspeed 2013-07-07 01:11:10 +02:00
Simon Wilks 01255a4cec Remove the <15kmh cuttoff and report kmh via HoTT. 2013-07-07 01:10:47 +02:00
Lorenz Meier 422c675c55 Commented flow example slightly better 2013-07-05 11:44:25 +02:00
Lorenz Meier 5f2d35d715 Added gyro scaling as parameter 2013-07-05 11:44:10 +02:00
Lorenz Meier 7ca0698a6b Fixed HIL handling 2013-07-05 11:43:42 +02:00
Lorenz Meier 2cfe9ee1b4 Improved limits handling 2013-07-05 11:43:16 +02:00
Lorenz Meier 05d6815401 Improved return statement of sensors app 2013-07-04 15:49:13 +02:00
Lorenz Meier cefebb9699 Small improvements in system lib 2013-07-04 15:48:01 +02:00
Lorenz Meier d72e9929aa Fixes to fixed wing control example, fixes to the way the control lib publishes estimates 2013-07-04 15:46:53 +02:00
Lorenz Meier b01673d1d8 Fixes to estimator and HIL startup script 2013-07-04 15:45:32 +02:00
Lorenz Meier f42b3ecd96 Substantial improvements to math lib 2013-07-04 15:43:38 +02:00
Lorenz Meier 3686431231 Removed leftover mavlink_receiver.c file 2013-07-04 15:41:42 +02:00
Lorenz Meier 9aee419324 Updated mavlink version, massive improvements in mission lib, fixes to HIL (state and sensor level) 2013-07-04 15:40:20 +02:00
Lorenz Meier 5691c64ff0 Update to uORB topics, added / improved position triplet, added radio status 2013-07-04 15:39:29 +02:00
Lorenz Meier e9290e7fc0 Merge branch 'master' of github.com:PX4/Firmware into origin_integration 2013-07-02 16:40:26 +02:00
sjwilks 697c0a1a1d Merge pull request #314 from DrTon/att_control_der_fix 
Multirotor attitude controller updated
 2013-07-02 01:19:14 -07:00
sjwilks 4edb6ce76b Merge pull request #319 from PX4/kalman_nav 
Kalman navigation fixes
 2013-06-30 11:58:38 -07:00
sjwilks bff6eae3a2 Merge pull request #318 from PX4/global_pos_log 
Added global position to logging
 2013-06-30 11:53:44 -07:00
Lorenz Meier d51b97fe2f Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-30 19:47:12 +02:00
Lorenz Meier aa04701c89 Added global position to logging 2013-06-30 19:15:02 +02:00
Lorenz Meier 7d59ee6839 Fixed yaw estimate, minor comment and code style improvements. Added option for upfront init, prepared process for removal (later) of sensors app and subscription to individual topics. Prototyping rework of params / subscriptions to resolve GCC 4.7 incompatibility of control lib (or rather the fact that we need to work around something which looks like a compiler bug) 2013-06-30 00:38:01 +02:00
Julian Oes 76346bfe19 Corrected merge mistake 2013-06-27 20:20:27 +02:00
Julian Oes f052442c2b Merge remote-tracking branch 'upstream/master' into new_state_machine 
Conflicts:
	src/modules/sdlog2/sdlog2.c
	src/modules/sdlog2/sdlog2_messages.h
 2013-06-27 09:23:11 +02:00
sjwilks 8191130bbc Merge pull request #315 from DrTon/sdlog2 
sdlog2: FLOW message added
 2013-06-25 21:41:06 -07:00
Anton Babushkin 85d35777e0 sdlog2: bugfix in FLOW message 2013-06-25 22:51:51 +04:00
Anton Babushkin fdc7247fcf sdlog2: FLOW message added, bug fixed in optical_flow topic 2013-06-25 21:04:08 +04:00
Julian Oes 0ecc9c4bf4 Shrinking the main commander file a bit 2013-06-25 16:30:35 +02:00
Julian Oes 9ce2b62eb5 Beep when arming or disarming with RC 2013-06-25 14:45:27 +02:00
Julian Oes a6ba7e4485 Dropped superseded safety topic, added warning tones before arming 2013-06-25 13:15:38 +02:00
Julian Oes 2096da2d4d Don't interrupt a playing tune unless its a repeated one 2013-06-25 13:11:15 +02:00
Julian Oes 794a2248f0 Only some small cleanup to att control 2013-06-24 17:24:49 +02:00
Julian Oes d563960267 Added Flow messages to sdlog2 2013-06-24 17:24:04 +02:00
Julian Oes 60e9ea977d Conditions where set wrongly in the first 2s after boot 2013-06-24 09:50:55 +02:00
Julian Oes 53dec130c4 Adapted flow estimator, position and velocity control to new state machine 2013-06-24 09:49:46 +02:00
Lorenz Meier 582ee13d2a Merge branch 'mag-correct-yaw' of github.com:jgoppert/Firmware into fw_hil_test 2013-06-22 11:49:52 +02:00
Anton Babushkin 72694825de Copyright fixes 2013-06-22 11:28:21 +04:00
Lorenz Meier c8f4f84c2b Merged master 2013-06-21 19:20:52 +02:00
Anton Babushkin 5cb1f4662f multirotor_attitude_control performance improved, tested in flight. PID library new functionality and bugfixes. 2013-06-20 19:25:37 +04:00
Julian Oes a183f3e273 Merge remote-tracking branch 'drton/pid_fixes_drton_debug' into new_state_machine 
Conflicts:
	src/modules/multirotor_att_control/multirotor_att_control_main.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.h
	src/modules/sdlog2/sdlog2.c
 2013-06-20 12:52:16 +02:00
Anton Babushkin bf0de77532 Critical bugfix in PID 2013-06-20 12:33:35 +04:00
Anton Babushkin dec1fdbde0 Cleanup: remove useless angular rates from attitude rate controller 2013-06-20 11:52:05 +04:00
Anton Babushkin 462a9c8454 sdlog2: add angular accelerations to ATT message 2013-06-20 11:38:37 +04:00
Anton Babushkin 3bfc4ed517 Att rate PID fix 2013-06-20 11:38:19 +04:00
Julian Oes 9b6c9358ed First try for an ESC calibration tool 2013-06-20 01:13:49 +02:00
Julian Oes 23858a6726 Added functionality to enable PWM output for stupid ESCs even when safety is not off, arming button functionality remains as is 2013-06-19 22:59:40 +02:00
Julian Oes ece93ab628 Added integral reset for rate controller 2013-06-19 12:24:14 +02:00
Julian Oes c1049483a8 Added integral reset for rate controller 2013-06-19 12:01:22 +02:00