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

1935 Commits

Author SHA1 Message Date
Lorenz Meier 754572f25a Merge branch 'master' of https://github.com/julianoes/Firmware into io 2012-11-09 16:07:05 +01:00
Lorenz Meier b48fc5362c Minor cleanup of leftover function definition 2012-11-09 16:05:14 +01:00
Lorenz Meier 50558d5cb7 Fixed indices in logger 2012-11-09 16:04:30 +01:00
Lorenz Meier 4338dd1e48 Merge branch 'master' of github.com:pixhawk/Firmware 2012-11-09 16:03:07 +01:00
Thomas Gubler 8768b7ddbf merge hil into fw_control 2012-11-08 19:17:03 +01:00
Thomas Gubler aaa13267b9 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-08 19:11:56 +01:00
Lorenz Meier bb0c7450c8 Fixed mixer loading for FMU 2012-11-08 18:43:38 +01:00
Julian Oes 9f45770dc2 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-08 09:26:53 -08:00
Julian Oes 52143d6a68 Reverting commenting, that happened by accident 2012-11-08 09:26:37 -08:00
Julian Oes 6c3a340d6e Made param name shorter, don't know if it was needed 2012-11-08 09:25:42 -08:00
Lorenz Meier 9221addebd Added HIL/fake PWM out mode to be able to run a mixer against HIL 2012-11-08 18:15:23 +01:00
Lorenz Meier 2c32157e02 Merge branch 'master' of github.com:PX4/Firmware into hil 2012-11-08 18:14:20 +01:00
Lorenz Meier 0245d7be86 Removed outdated docs 2012-11-08 18:11:53 +01:00
Lorenz Meier 81afd23c6c Merge branch 'master' into hil 2012-11-08 18:11:16 +01:00
Lorenz Meier ce01aff241 Set mag scale to 1 as default 2012-11-08 18:11:03 +01:00
Lorenz Meier 35fae44527 Nulling controller parameters for additional safety 2012-11-08 18:10:03 +01:00
Lorenz Meier 1da7fc2549 Improved commandline handling 2012-11-08 18:09:13 +01:00
Julian Oes 0b5da8b599 Got rid of the control limitation at high throttle 2012-11-07 16:24:12 -08:00
Julian Oes 2b5f551838 Revert "Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs."" 
This reverts commit 38b20f2a1a.
 2012-11-07 14:56:03 -08:00
Lorenz Meier 1b322c7764 Fixed bug in HIL message handling, operational with actuator outputs now 2012-11-07 23:50:06 +01:00
Julian Oes 38b20f2a1a Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs." 
This reverts commit ff3a014971.
 2012-11-07 14:46:28 -08:00
Lorenz Meier 0f6ec03939 Merge branch 'master' of github.com:PX4/Firmware into hil 2012-11-07 21:56:04 +01:00
Julian Oes 25ed791b70 Forgot to comment 2012-11-07 10:56:25 -08:00
Julian Oes 5995240a07 Failsafe throttle when RC is lost is now a parameter 2012-11-07 10:50:52 -08:00
Julian Oes 9f92c6df67 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-07 10:24:49 -08:00
px4dev ff3a014971 Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs. 2012-11-07 02:47:01 -08:00
Julian Oes 74f7600602 Again some hacking to make arming/disarming work for now 2012-11-06 19:03:08 -08:00
Julian Oes 7da799d154 Scale control signals with thrust for low thrust 2012-11-06 19:02:01 -08:00
Julian Oes 08d6ade585 Some failsafe hack when RC signal is lost 2012-11-06 19:01:04 -08:00
Julian Oes e0e96c005a Corrected two small bugs considering arming and disarming 2012-11-06 18:57:42 -08:00
Lorenz Meier 88800b38f8 HIL testing / cleanup for fixed wing and multirotors 2012-11-07 00:08:04 +01:00
Lorenz Meier 847ff7c5e2 Merge pull request #2 from daregger/sdlog_pullreq 
add attitude + rotation Matrix to sdlog.c and adapt logconv.m accordingly
 2012-11-06 03:53:17 -08:00
daregger 0ee48db90f add attitude + rotation Matrix to logging 2012-11-06 11:25:31 +01:00
Julian Oes 3398820631 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-05 16:22:21 -08:00
Thomas Gubler b842957d87 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-05 23:00:17 +01:00
Thomas Gubler 518630268f Merge branch 'fw_control' of https://github.com/thomasgubler/Firmware into fw_control 2012-11-05 22:52:25 +01:00
Thomas Gubler 0eea4bfb4e fw control: minor cleanup (work in progress) 2012-11-05 22:51:41 +01:00
Thomas Gubler c4c49ecfa7 fw control: minor cleanup (work in progress) 2012-11-05 22:36:09 +01:00
Lorenz Meier 7d76a8a57b Merge pull request #45 from thomasgubler/master_origin 
re-adding pid limitation & mavlink waypoint handling fix
 2012-11-05 13:15:35 -08:00
Lorenz Meier 976545861a Minor cleanup in position control skeleton 2012-11-05 22:13:55 +01:00
Thomas Gubler 9d2c27bbd0 Merge branch 'master_origin' into fw_control 2012-11-05 21:54:22 +01:00
Thomas Gubler 59725ccd3a fixing mavlink waypoint handling 2012-11-05 21:53:21 +01:00
Thomas Gubler 808d897d28 fixing mavlink waypoint handling 2012-11-05 21:51:39 +01:00
Thomas Gubler 5344e89167 work in progress: line following working 2012-11-05 20:42:43 +01:00
Thomas Gubler be9b58e1b9 re-adding pid limitation 2012-11-05 20:22:00 +01:00
Thomas Gubler 572084f357 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-05 17:56:10 +01:00
Lorenz Meier 706a7e4dd5 Merge branch 'master' of github.com:pixhawk/Firmware 2012-11-05 17:47:11 +01:00
Lorenz Meier 242d49402e Merge pull request #1 from daregger/geo_pull 
Geo pull
 2012-11-05 08:47:01 -08:00
daregger 776333a9e5 revert console setting 2012-11-05 17:34:04 +01:00
daregger 801cf3af3e add tangent plane mapping to geo.c 2012-11-05 17:17:28 +01:00