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
2,226 Commits 852 Branches 161 Tags
Commit Graph

2226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenz Meier
f89cd312ec Used correct datatype, removed unwanted cast 2013-01-06 10:16:50 +01:00
Lorenz Meier
a9e87c791d Fixed header for sbus input 2013-01-06 10:13:53 +01:00
Lorenz Meier
3c85f8267f merged relay changes from master 2013-01-06 09:51:38 +01:00
px4dev
94fa60fa04 Merge pull request #132 from PX4/#111-px4io-integrated-mixing 
#111 px4io integrated mixing
 2013-01-06 00:40:45 -08:00
px4dev
9df2aaf312 Merge branch 'master' into #111-px4io-integrated-mixing 
Fix a botched merge for #106 at the same time.
 2013-01-06 00:40:17 -08:00
px4dev
b3e16b4861 Merge pull request #123 from PX4/#106-px4io-relays 
Initial implementation of application access to the PX4IO relays.
 2013-01-06 00:32:04 -08:00
px4dev
76277ec622 Ignore more. 2013-01-05 22:37:26 -08:00
Lorenz Meier
ad7637861d Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing 2013-01-06 01:32:55 +01:00
Lorenz Meier
83039e76d3 Reverted unwanted S.Bus changes 2013-01-06 01:32:39 +01:00
Lorenz Meier
ab85d201ee Merge branch 'text_startscripts' into fixedwing_io_mixing 2013-01-06 01:01:44 +01:00
Lorenz Meier
d593820bf5 Allow text files (rc.txt) in addition to rc files. We will get a very huge load of complaints and big trouble from the regular user base else. 2013-01-06 01:01:25 +01:00
Lorenz Meier
aaa9af2293 Reverting EKF change, as it did not really help. 2013-01-06 00:58:35 +01:00
px4dev
69cdab9afc Fix a typo that caused PWM_SERVO_GET ioctls to fail on the FMU PWM outputs. 2013-01-04 23:41:21 -08:00
px4dev
91ca80e634 Fix the handling of FIONREAD/FIONWRITE; thanks Tridge. 2013-01-04 21:28:26 -08:00
px4dev
e787fa5bce Add FIONWRITE to allow applications to sniff the amount of writable space on a descriptor. Implement this for serial devices only. 2013-01-03 00:33:22 -08:00
Julian Oes
805c08815e The multirotor mixer return 0 instead of the number of channels, my Hex is flying now (not reliably now, random flips 2012-12-31 16:12:55 -08:00
Julian Oes
8d1b1354e1 A wrong parameter name in commander was responsible for manual override always ok 2012-12-31 12:31:31 -08:00
Lorenz Meier
7972a56076 State machine / switching improvements 2012-12-31 00:41:11 +01:00
Lorenz Meier
1b82dbb58d Merge branch '#111-px4io-integrated-mixing' of github.com:PX4/Firmware into fixedwing_io_mixing 2012-12-31 00:34:12 +01:00
px4dev
dbb841b0dc Rework the way we scan text for scaler definitions; something weird was going on with sscanf's handling of %n that wasn't obvious. This seems to work around the issue. 2012-12-30 15:09:21 -08:00
px4dev
f2d4eb2887 Revert "Removed text reuse, causing crash with stack trace" 
This reverts commit 668d1b330114fefc0ae7a6c476074f2c263c1476.
 2012-12-30 15:08:25 -08:00
Lorenz Meier
36d556256f Merge branch '#111-px4io-integrated-mixing' into fixedwing_io_mixing 2012-12-30 14:03:33 +01:00
Lorenz Meier
668d1b3301 Removed text reuse, causing crash with stack trace 2012-12-30 13:58:30 +01:00
Lorenz Meier
234af06571 Fixed merge error 2012-12-30 12:05:38 +01:00
Lorenz Meier
1da1b8f49c Merge branch 'fixedwing_outdoor' into fixedwing_io_mixing 2012-12-30 11:01:59 +01:00
Lorenz Meier
2577e1a749 Removed compile errors, removed non-wanted MAVLink dependency in commander app 2012-12-30 11:01:09 +01:00
Lorenz Meier
abe1b9759a Merged IO mixing branch 2012-12-30 10:49:27 +01:00
px4dev
f6ea42ab5e Fix px4io signal test command to force FMU armed state. 2012-12-30 01:28:07 -08:00
px4dev
fd016abd46 Implement the remaining pieces of mixer upload to PX4IO. 2012-12-30 01:17:19 -08:00
px4dev
c740e9c616 Add a receive error counter for debugging purposes. 2012-12-30 01:16:54 -08:00
px4dev
b14abad3a0 Fix logic for handling partial buffers. 2012-12-30 01:16:28 -08:00
Lorenz Meier
142556b442 merged 2012-12-30 10:03:05 +01:00
Lorenz Meier
62a95bf8e6 Stabilization enabling / switching 2012-12-30 09:53:45 +01:00
px4dev
85375c2201 Rename the FMU->IO output controls to reflect the fact that they are controls, not servo values. 2012-12-29 17:15:48 -08:00
px4dev
b8250de1e6 Assorted compile fixes. 2012-12-29 16:22:30 -08:00
px4dev
d81edb09cf whitespace/formatting 2012-12-29 16:01:24 -08:00
px4dev
f9520ee39d Factory method for a simple mixer that converts PWM/PPM values to the standard internal format. 2012-12-29 16:00:50 -08:00
Lorenz Meier
0298714db5 Merge branch 'fixedwing_outdoor' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-30 00:04:54 +01:00
px4dev
0ae5997bd0 Fix some scaling errors in the PWM <-> mixer-internal conversions. 2012-12-29 13:28:32 -08:00
px4dev
6b9d5dac4d Rough in the new mixer path for PX4IO. 2012-12-29 12:58:41 -08:00
px4dev
6ede0e2f18 Add the ability to reset a mixer group. Report the remaining buffer size from load_from_buf. 2012-12-29 12:58:10 -08:00
px4dev
d5da457e29 Fix PX4IO to run C++ static ctors 2012-12-29 12:57:29 -08:00
Lorenz Meier
4976a3a47d Added accel magnitude check, added conversion functions for various standard cases 2012-12-29 16:21:59 +01:00
Lorenz Meier
b240e31c1c Safer fixed wing mode switching 2012-12-29 11:18:49 +01:00
Lorenz Meier
c652f718c0 Minor fixes, pushing WIP 2012-12-29 11:00:15 +01:00
px4dev
35c82ff2fc Make mixer ioctls load from a memory buffer rather than a file. This is prep for uploading the memory buffer to IO to be processed there. 2012-12-29 00:01:04 -08:00
px4dev
f0da789626 Remove the unused complex-multirotor setup ioctl, since it's not implemented anywhere. 2012-12-28 16:44:17 -08:00
Lorenz Meier
be85589e48 Fixed some typos 2012-12-28 20:19:47 +01:00
Lorenz Meier
9e2076b4e4 Cleared last differences, ready for testing 2012-12-28 15:10:25 +01:00
Lorenz Meier
913f5a7812 Cleared last diff items between origin/master and fixedwing_outdoor 2012-12-28 15:06:19 +01:00