dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
8,479 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

8479 Commits

Author SHA1 Message Date
Thomas Gubler 722fe92425 Fix compile error: rename field in rc_channels.h 2014-07-02 16:45:42 +02:00
Thomas Gubler 2179f1e123 Merge remote-tracking branch 'upstream/mavlinkexternalsetpoints' into offboard2_merge 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
 2014-07-02 15:53:34 +02:00
Thomas Gubler e14cd7edae Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpoints 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
 2014-07-02 15:45:55 +02:00
Thomas Gubler 8f7fc27c5b sync with mavlink externalsetpoint branch 
0d55cc7e88
 2014-07-02 15:40:28 +02:00
Julian Oes 73d6121a9d Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/uORB/topics/rc_channels.h
 2014-07-02 15:15:26 +02:00
Julian Oes fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
 2014-07-02 14:59:43 +02:00
Thomas Gubler a366f76efa mavlink as git submodule 
Mavlink is now a git submodule because auto generated header files are
available at https://github.com/mavlink/c_library
 2014-07-02 14:18:55 +02:00
Thomas Gubler 44b875428e delete mavlink header files 2014-07-02 14:15:04 +02:00
Lorenz Meier f428ebb04f gps: Comment-only fix 2014-07-02 11:39:56 +02:00
Thomas Gubler 0d7ada14bb rc.autostart entry for hk micro pcb quad 2014-07-02 09:36:47 +02:00
Thomas Gubler 756a2bb7e6 hk micro pcb startup script 2014-07-02 09:35:50 +02:00
Lorenz Meier 171b1678f2 Merge pull request #1108 from PX4/gnss_rework 
Gnss rework
 2014-07-02 00:48:19 +02:00
Lorenz Meier a9fd5ed90a Merged master to gnss_rework 2014-07-02 00:33:36 +02:00
Lorenz Meier 4cd66a3242 Fix sdlog2 GPS time copy for log_on_start situation 2014-07-02 00:25:19 +02:00
Lorenz Meier 8c638d2add XML tool 2014-07-01 14:28:48 +02:00
Lorenz Meier 8f957aeb5f Merge pull request #1074 from t0ni0/reset_xy_v 
INAV: Reset XY velocities when we can't estimate them
 2014-07-01 13:45:50 +02:00
Lorenz Meier 545e207d13 Merge pull request #1106 from PX4/reconfig_fix 
Reconfig fix
 2014-07-01 13:43:56 +02:00
Lorenz Meier d0b78aa8a0 Add param command which does not reset the autostart params to not hamper auto-config 2014-07-01 13:42:32 +02:00
Lorenz Meier 29cd95ebad Move param reset to right autoconfig check 2014-07-01 12:05:10 +02:00
Lorenz Meier 6042999aab Add vital comment to circuit breaker 2014-07-01 11:59:25 +02:00
Lorenz Meier 2b82f22a03 Merge branch 'master' into reconfig_fix 2014-07-01 11:37:15 +02:00
Lorenz Meier 1733e8d1b9 Merge branch 'master' of github.com:PX4/Firmware 2014-07-01 11:36:11 +02:00
Lorenz Meier 15a7a0ce7f autoconfig: Enforce clean defaults 2014-07-01 11:31:24 +02:00
Lorenz Meier 2466cfba3e Merge pull request #1104 from philipoe/master 
TECS: Small fix to throttle feed-forward
 2014-07-01 11:03:33 +02:00
philipoe 534c377ec6 TECS: Small fix to throttle feed-forward 2014-07-01 10:49:59 +02:00
Lorenz Meier 1ba4f3e8ef Merge branch 'master' of github.com:PX4/Firmware 2014-07-01 09:53:04 +02:00
Lorenz Meier fb98251e4d Warning fixes in commander 2014-07-01 09:52:36 +02:00
Lorenz Meier 45433c3711 Hotfix: Fix use of circuit breaker param 2014-07-01 09:52:18 +02:00
Lorenz Meier 48f4a1e5cd Merge pull request #793 from PX4/yaw_acceptance_fix 
MC: default MC_YAWRATE_I changed for all setups, navigator: increase yaw...
 2014-07-01 09:30:54 +02:00
Lorenz Meier 4f7e66bba2 Merged master in yaw_acceptance_fix 2014-07-01 09:28:49 +02:00
Lorenz Meier 8408993a67 Hotfix, non-code change: Raise RC config error warnings to audio 2014-06-30 17:45:50 +02:00
Lorenz Meier ffc3cbd72e Merge pull request #1078 from PX4/prearm_checks 
Prearm checks
 2014-06-30 17:40:27 +02:00
Lorenz Meier 40407d0cc9 Merge branch 'master' of github.com:PX4/Firmware into prearm_checks 2014-06-30 17:24:17 +02:00
Lorenz Meier 45016b0df0 Merge pull request #984 from PX4/rc_channels 
rc_channels cleanup
 2014-06-30 17:11:14 +02:00
Lorenz Meier 68c8090a39 Merge pull request #1011 from PX4/mpc_in_flight_lock 
position_estimator_inav: handle in-flight GPS fix properly
 2014-06-30 17:03:19 +02:00
Lorenz Meier 478f923331 Merged master into mpc_in_flight_lock 2014-06-30 17:03:02 +02:00
Lorenz Meier bbdf2bc07a commander: Notify negative on manual arming fails 2014-06-30 16:58:05 +02:00
Lorenz Meier 77af7a5beb Merge branch 'master' of github.com:PX4/Firmware into prearm_checks 2014-06-30 16:34:50 +02:00
Lorenz Meier e88bbe288d Merge branch 'warning_fixes_v3' into prearm_checks 2014-06-30 16:34:15 +02:00
Lorenz Meier 3c5f35da73 Merge pull request #1100 from PX4/warning_fixes_v3 
Warning fixes v3
 2014-06-30 16:33:53 +02:00
Lorenz Meier ad4411bfc1 Fix line endings for patch 2014-06-30 16:32:32 +02:00
Lorenz Meier 9dbc83cce1 Merged master into prearm_checks 2014-06-30 16:24:48 +02:00
Lorenz Meier ff84fb2ac6 Merge pull request #1005 from PX4/power_enforce 
Disallow servorail-only powered flight.
 2014-06-30 14:51:59 +02:00
Lorenz Meier 799f568ab4 commander: Minor checks / improvements to power enforce patch 2014-06-30 14:33:56 +02:00
Lorenz Meier a5e7f5ca30 Merge branch 'master' of github.com:PX4/Firmware into power_enforce 2014-06-30 13:27:42 +02:00
Anton Babushkin a1655bb8c4 rcS: start dataman before commander 2014-06-30 12:42:26 +02:00
Lorenz Meier d45d204691 Merge branch 'master' into warning_fixes_v3 2014-06-30 12:31:51 +02:00
Anton Babushkin 0a159e1a24 mavlink, commander: bugs fixed 2014-06-30 12:31:29 +02:00
Anton Babushkin 1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Lorenz Meier 04efee0bc8 nshterm: Hotfix for retries counter 2014-06-30 12:23:38 +02:00