fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-01 04:04:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,240 Commits 852 Branches 161 Tags
Commit Graph

86 Commits

Author SHA1 Message Date
Anton Babushkin
f36ffe0859 Partially merge branch 'inav_alt_gps' into vector_control2, only estimator part 2013-12-23 11:13:08 +04:00
Anton Babushkin
63d81ba415 actuator_controls_effective topic removed 2013-11-16 23:16:09 +04:00
Anton Babushkin
d309d0203c Merge branch 'master' into inav_alt_gps. Use GPS for altitude estimation. 2013-10-27 22:03:07 +04:00
Anton Babushkin
3c6f438691 sdlog2: parameters logging implemented (APM-compatible) 2013-10-23 18:57:06 +02:00
Anton Babushkin
3546ded54e Merge branch 'master' into sdlog2_ver 2013-10-23 14:49:11 +02:00
Anton Babushkin
3a571ea18f Merge branch 'master' into inav_sonar_indep 2013-10-18 11:02:55 +02:00
Lorenz Meier
57b8dee709 Bring back proper log conversion copy operation 2013-10-14 13:41:37 +02:00
Anton Babushkin
114b7b696d sdlog2: VER message added instead of FWRV 2013-10-14 11:14:56 +02:00
Anton Babushkin
419cb4bc80 sdlog2: DIST (distance to surface) message added 2013-10-13 19:45:04 +02:00
Anton Babushkin
86c53bee43 position_estimator_inav: use independent estimate for distance to ground (sonar), WIP 2013-10-10 19:10:45 +02:00
Anton Babushkin
2fbd23cf6e sdlog2: position & velocity valid, postion global and landed flags added to LPOS, some refactoring 2013-09-14 17:31:58 +02:00
Anton Babushkin
53813d44a0 sdlog2: "landed" flag logging 2013-08-28 21:41:52 +02:00
Anton Babushkin
330908225e sdlog2: free buffer on exit 2013-08-22 18:23:42 +02:00
Anton Babushkin
ffc2a8b7a3 vehicle_local_position topic updated, position_estimator_inav and commander fixes, only altitude estimate required for SETBELT now. 2013-08-18 23:05:26 +02:00
Anton Babushkin
f78666e0c8 Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new 
WIP, TODO fixedwing
 2013-08-16 13:23:33 +02:00
Lorenz Meier
aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
Lorenz Meier
cd928b64f3 Fixed log conversion scripts copy operation. Each log comes now with the required conversion tools. Eats up only 10 KB flash for the good cause. 2013-08-13 09:10:47 +02:00
Lorenz Meier
0025e9ca90 Hotfix: Copy a current version of the log conversion tools to each log directory 2013-08-13 07:57:39 +02:00
Anton Babushkin
68b7e03155 sdlog2: copyright fix 2013-07-17 22:27:22 +04:00
Julian Oes
bcdedd9a35 Changed location of lots of flags and conditions, needs testing and more work 2013-07-16 18:56:31 +02:00
Julian Oes
1b38cf715d Renamed actuator_safety back to actuator_armed, compiling but untested 2013-07-15 22:15:15 +02:00
Lorenz Meier
bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Anton Babushkin
eb5af244b9 sdlog2: GVSP (global velocity setpoint) message added, cleanup 2013-07-12 21:57:46 +04:00
Anton Babushkin
babbcea3b6 Merge branch 'sdlog2_GPSP' into seatbelt_multirotor 2013-07-12 10:11:08 +04:00
Anton Babushkin
1d986d6c04 sdlog2: Global Position Set Point message added, vehicle_global_position_setpoint topic fixed 2013-07-12 10:09:38 +04:00
Anton Babushkin
c291c4482a Merge branch 'master' into seatbelt_multirotor 2013-07-11 20:49:28 +04:00
Lorenz Meier
ced2871263 Merged mkblctrl 2013-07-08 20:48:30 +02:00
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
Anton Babushkin
320a5b7579 Merge branch 'master' into seatbelt_multirotor 2013-07-08 12:18:32 +04:00
marco
c4dfc345a1 Version from esc_status topic added to sdlog2 2013-07-07 18:27:08 +02:00
marco
209dc7100e mkclctrl 8/11Bit support, uOrb Topic added, ESC Topic to Sdlog2 added 2013-07-02 19:46:15 +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
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
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
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
d563960267 Added Flow messages to sdlog2 2013-06-24 17:24:04 +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
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
462a9c8454 sdlog2: add angular accelerations to ATT message 2013-06-20 11:38:37 +04:00
Julian Oes
26858ad403 Merge remote-tracking branch 'upstream/master' into pid_fixes 
Conflicts:
	src/modules/sdlog2/sdlog2.c
 2013-06-19 10:20:56 +02:00
Julian Oes
34c197c7cc Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-18 10:26:48 +02:00
Anton Babushkin
447fc5e291 sdlog2 bugs fixed 2013-06-18 10:31:24 +04:00
Julian Oes
52f8565f0b Corrected number of ORB structs in sdlog2 2013-06-17 21:02:52 +02:00
Julian Oes
7bb78a4f9b Merge remote-tracking branch 'drton/sdlog2' into new_state_machine 
Conflicts:
	src/modules/sdlog2/sdlog2.c
 2013-06-17 14:45:20 +02:00
Anton Babushkin
a11895ac43 Critical bug fixed, cleanup 2013-06-17 16:06:35 +04:00