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

86 Commits

Author SHA1 Message Date
Lorenz Meier
11fa104a2a Merge branch 'master' into navigator_rewrite_estimator 2014-06-23 14:57:19 +02:00
Lorenz Meier
68442e31ac Hotfix: Move channel count to right position 2014-06-23 14:56:48 +02:00
Lorenz Meier
194aa49110 Merged rate config changes 2014-06-23 14:35:59 +02:00
Lorenz Meier
f02de30c32 Merge branch 'master' into navigator_rewrite_estimator 2014-06-23 13:53:22 +02:00
Lorenz Meier
87857cdd48 Hotfix: Fix message name typo 2014-06-23 13:45:20 +02:00
Lorenz Meier
9a1b724070 Merged master 2014-06-22 18:21:03 +02:00
Julian Oes
62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Anton Babushkin
e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Julian Oes
d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Anton Babushkin
44481e3773 mavlink: sign of climb rate fixed in VFR_HUD message 2014-06-12 12:01:54 +02:00
Anton Babushkin
e076b5a636 Merge branch 'master' into mavlink_stack 2014-06-12 10:12:09 +02:00
Anton Babushkin
342e08977a MavlinkOrbSubscription API reworked 2014-06-11 14:00:44 +02:00
Julian Oes
cfcba921a1 Merge remote-tracking branch 'px4/master' into navigator_rewrite 2014-06-11 13:29:28 +02:00
Anton Babushkin
fb4bcf87ba Merge branch 'master' into mavlink_stack 2014-06-10 15:12:09 +02:00
Julian Oes
064a75a3c2 mavlink: put update call back in 2014-06-10 15:02:20 +02:00
Julian Oes
d5c0933d65 mavlink: report global position setpoint and do this always no just when updated, otherwise the values are not visible in QGC 2014-06-10 14:29:17 +02:00
Julian Oes
d1d03c34b9 Merge remote-tracking branch 'px4/master' into navigator_rewrite 
Conflicts:
	src/modules/navigator/navigator_main.cpp
 2014-06-03 16:04:39 +02:00
Lorenz Meier
325d5026bb Hotfix: Fix scaling for battery current 2014-06-03 13:37:31 +02:00
Julian Oes
ed6c2a5168 commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP) 2014-05-27 21:56:32 +02:00
Julian Oes
063caba36b Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/drivers/gps/gps.cpp
	src/drivers/gps/mtk.cpp
	src/modules/commander/commander.cpp
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
	src/modules/navigator/mission.cpp
	src/modules/navigator/mission.h
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_state.h
	src/modules/position_estimator_inav/position_estimator_inav_main.c
 2014-05-26 20:19:11 +02:00
Anton Babushkin
fb801b6fae mavlink: minor fix 2014-05-20 21:46:42 +02:00
Anton Babushkin
b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Lorenz Meier
7bfcaafc16 mavlink app: Finish porting all messages to new scheme 2014-05-16 17:10:33 +02:00
Lorenz Meier
7926a1f8ae Converted streams to new API, saving a bunch of RAM 2014-05-16 14:01:34 +02:00
Lorenz Meier
fbb3adde06 mavlink app: Clean up allocations 2014-05-16 14:00:58 +02:00
Thomas Gubler
7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
 2014-05-12 09:39:52 +02:00
Thomas Gubler
6d9ea86bc9 mavlink receiver: use new manual control setpoint variable names and fix sending of manual control setpoint mavlink message 2014-05-12 09:23:51 +02:00
Anton Babushkin
88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Lorenz Meier
e18bdfdf65 Merge pull request #858 from TickTock-/rc_merged 
Rc merged
 2014-05-08 23:21:22 -07:00
Julian Oes
26f5e550c4 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params 
Conflicts:
	src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
 2014-05-07 21:11:21 +02:00
Lorenz Meier
df6a0d5a1a mavlink: Only send the distance sensor message if the topic actually updates 2014-05-06 12:55:39 +02:00
Thomas Gubler
5f786af8fa mavlink: status is a pointer 2014-05-04 15:02:37 +02:00
Thomas Gubler
0e31b5935e remove trailing whitespace 2014-05-04 15:02:30 +02:00
Lorenz Meier
ee580206b4 mavlink: Only sending HIL control commands if the system is actually armed 2014-05-04 14:06:38 +02:00
TickTock-
31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock-
269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
Julian Oes
e882824ee1 eph and epv renaming, make this compile again 2014-04-26 23:31:15 +02:00
Julian Oes
fd56c15a20 Merge remote-tracking branch 'px4/master' into navigator_cleanup 
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_messages.cpp
	src/modules/mavlink/module.mk
	src/modules/sdlog2/sdlog2_messages.h
 2014-04-22 11:10:48 +02:00
Julian Oes
c3c0328e8b navigator: lot's of cleanup (WIP) 2014-04-21 17:36:59 +02:00
Anton Babushkin
1f2e972ea6 mavlink: remaining battery scaling fixed 2014-04-21 12:16:45 +02:00
Lorenz Meier
2ea32b315f Merged master 2014-04-20 02:04:05 +02:00
Helen Oleynikova
ebf0678333 More whitespace all the time. 2014-04-18 22:05:48 +02:00
Helen Oleynikova
d6647d841a More whitespace all the time. 2014-04-18 22:05:48 +02:00
Helen Oleynikova
5c996065e2 Added vicon stream. 2014-04-18 22:05:47 +02:00
Lorenz Meier
a96d83e4ec Revert "Merge pull request #816 from PX4/mavlink_commandlongstream" 
This reverts commit 00ef10f307d3c4a262a15ab5747d854eb4c568d5, reversing
changes made to d55e64d1e54542762510387a22897f504c68a5a6.
 2014-04-18 22:05:46 +02:00
Anton Babushkin
84aa96cf23 mavlink: minor comments and formatting fixes 2014-04-18 22:05:46 +02:00
Thomas Gubler
b2bc8c1f08 mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send mavlink_msg_command_long 2014-04-18 22:05:46 +02:00
Julian Oes
d662fa4c14 Send camera command to all, use own sysid 2014-04-18 22:05:46 +02:00
Anton Babushkin
a66dcbf7e9 mavlink: publish SYS_STATUS at constant rate, don't look at update() result 2014-04-18 22:05:45 +02:00
Julian Oes
15defeb0f1 mavlink: implemented multicasting between mavlink instances (two options: forwarding: forward received messages from self to other mavlink instances, passing: send out messages received from other mavlink intances over serial 2014-04-18 22:05:45 +02:00