fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 07:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,244 Commits 852 Branches 161 Tags
d3fd3d8219179251d10655944992da75abb8932b
Commit Graph
2244 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenz Meier d3fd3d8219 Merged, compiling 2013-01-06 11:25:17 +01:00
Lorenz Meier 0ef1d6d752 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing 2013-01-06 10:53:23 +01:00
px4dev 532c694ec3 Merge pull request #122 from PX4/sbus_rcloss_fix 
Fixed connection loss / failsafe detection, added decoding of two switches
 2013-01-06 01:53:14 -08:00
Lorenz Meier 7922f56f4b Merge branch 'sbus_rcloss_fix' of github.com:PX4/Firmware into fixedwing_io_mixing 2013-01-06 10:52:17 +01:00
Lorenz Meier 329ac2f4ba Merged master 2013-01-06 10:50:41 +01:00
Lorenz Meier e2317edde8 Code style fix 2013-01-06 10:45:19 +01:00
Lorenz Meier 1b2e886878 Removed unwanted cast 2013-01-06 10:24:00 +01:00
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
Lorenz Meier 8eb8909a3c Merge branch 'master' of github.com:PX4/Firmware into px4io-adc-integration-battery-msg 2013-01-06 00:50:51 +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
Lorenz Meier 803352e722 Fixed stupid copy/paste typo 2013-01-01 13:39:00 +01:00
Lorenz Meier 4eb7df6ff5 Introduced battery_status uORB topic, changed sensors app to publish to it, extended px4io driver to publish to it. Both do only so if the battery voltage is reasonably high, at 3.3V 2013-01-01 13:30:24 +01:00
px4dev d93fda20fd Add ADC measurements and reporting to PX4IO, including calibration for the battery input. 2012-12-31 21:06:26 -08:00
px4dev 9be1f99935 Add trivial ADC support to PX4IO. 2012-12-31 19:41:18 -08:00
px4dev bd2f6b58e6 Configure ADC GPIOs on IO 2012-12-31 19:40:41 -08:00
px4dev b167912b1b Enable the temperature sensor channel for F2/F4 devices. 2012-12-31 18:31:37 -08:00
px4dev bc432b1feb Cleanup and add support for multiple channels. 2012-12-31 17:06:30 -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
px4dev 22f5a1dc94 First cut at a simple® ADC driver built on our driver framework. 2012-12-31 01:30:57 -08:00
px4dev 476db46869 kill off the NuttX ADC driver config; we're not going to use it 2012-12-31 01:26:58 -08:00
Lorenz Meier 0cc723dbc3 Fixed connection loss / failsafe detection, added decoding of two switch channels if IO supports 18 RC channels. Loss is tested, switch channels are not. 2012-12-31 09:21:44 +01: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 668d1b3301.
 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