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

1215 Commits

Author SHA1 Message Date
Lorenz Meier 0945a2cc2f Fixed RC mapping transmission, tested. Fixed RC scaling in manual mode 2013-01-06 14:43:37 +01:00
Lorenz Meier ef2efabbd4 Removed unlimited printing status message 2013-01-06 14:43:10 +01:00
Lorenz Meier ac784dc638 Merge branch 'master' into fixedwing 2013-01-06 12:41:19 +01:00
Lorenz Meier ec3d298720 Fixed minor compile error 2013-01-06 12:40:29 +01:00
Lorenz Meier 2bd4301849 Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-06 12:37:13 +01:00
Lorenz Meier c94076f673 Added missing ADC start command, fixed return value / error behavior of ADC init 2013-01-06 12:36:46 +01:00
Lorenz Meier f788d452ea Merged 2013-01-06 11:47:30 +01:00
Lorenz Meier 34d078b556 Merged latest master 2013-01-06 11:32:08 +01:00
Lorenz Meier 359989a2eb Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc 2013-01-06 11:25:24 +01:00
Lorenz Meier d3fd3d8219 Merged, compiling 2013-01-06 11:25:17 +01:00
px4dev 58309fd6a8 Merge branch 'master' of https://github.com/PX4/Firmware 2013-01-06 02:02:14 -08:00
px4dev 6ae9f03544 Merge commit '375d3c14d742248b434c080527886a95ea1d563f' 2013-01-06 02:01:53 -08:00
px4dev 5cc76018ff Merge commit '920608bf3671662f94b4939ffdaf6fde2b08edff' 2013-01-06 02:01:41 -08:00
px4dev a03396e3f3 Merge commit '0fff8aa23b477bebda9c1a79f5cd0b5eceeb95d1' 2013-01-06 01:55:21 -08:00
px4dev 18385c2d97 Merge commit '63464a8959d90bd92c4998a80992c416b85c2057' 2013-01-06 01:55:00 -08: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 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
Simon Wilks 7842caf3b2 Moved the channel mappings and attributes to the config section 2013-01-06 04:21:04 +01: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 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
Simon Wilks 0a89ab7075 Send rc channel ordering and channel attributes from FMU to IO 2013-01-05 22:13:12 +01:00
Andrew Tridgell 318609bf59 fixed PWM_SERVO_GET 
this was using the wrong channel
 2013-01-06 06:31:37 +11:00
Andrew Tridgell 0134186420 fixup rate 2013-01-06 06:31:00 +11:00
Andrew Tridgell 219ab05a70 added PWM_SERVO_SET_UPDATE_RATE ioctl 
this allows apps to set the PWM update rate. APM needs this to honor
the user configurable PWM rate setting for copters.
 2013-01-06 06:29:28 +11:00
Simon Wilks 1b81724ef7 Manually remap the channel assignements for testing. 2013-01-05 15:46:26 +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
Julian Oes e4bfd78847 Attention: flipped the yaw direction of multirotors in order to be compatible to APM 2013-01-02 13:29:33 -08:00
Andrew Tridgell 8ffba22771 build: allow for external apps via EXTERNAL_APPS 
this is used by the APM build
 2013-01-02 17:39:12 +11:00
Andrew Tridgell 0fff8aa23b GPS: added comment on units for variance 2013-01-02 17:38:28 +11:00
Andrew Tridgell 63464a8959 mavlink: fixed build warning 2013-01-02 17:37:55 +11: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
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
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
Lorenz Meier a1e1e7bf42 Cleaning up calibration requests 2012-12-28 13:18:52 +01:00
Lorenz Meier d96add5b61 Even more cleanup, diff now clean 2012-12-28 13:16:34 +01:00
Lorenz Meier 38a1076a33 Cleaned up attitude control in HIL, implemented very simple guided / stabilized mode with just attitude stabilization 2012-12-28 13:12:27 +01:00
Lorenz Meier cc582b2b44 Only send actuator HIL commands if armed 2012-12-28 13:10:58 +01:00
Lorenz Meier 8b8330a015 Reverted nuttx merge, back to master 2012-12-28 13:10:06 +01:00
Lorenz Meier 45a4bcb6ef Merged relay activation 2012-12-27 19:06:09 +01:00
Lorenz Meier 7526dd46a2 Added header for common priority bands 2012-12-27 19:01:00 +01:00
Lorenz Meier e2196bca4f Added position lock check 2012-12-27 18:36:37 +01:00
Lorenz Meier f5bad08bd0 Cleaned up control mode state machine / flight mode / navigation state machine still needs a bit cleaning up 2012-12-27 18:27:08 +01:00
Lorenz Meier 61d7e1d285 Reverted changes to multirotor rate controller, changing to a discrete derivative does not help 2012-12-27 17:47:51 +01:00
Lorenz Meier a6f2c6022e Merge branch 'fixedwing_outdoor' of https://github.com/julianoes/Firmware into fixedwing_outdoor 2012-12-27 17:13:52 +01:00
Lorenz Meier b2068b4e0e WIP on mode switching input 2012-12-27 17:13:48 +01:00
Julian Oes d4edf2e85c Override is now really disabled for multirotors, also I don't think the parameter got ever read by the commander but I might be wrong 2012-12-23 17:20:53 -08:00
Lorenz Meier 9102b25bce Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-24 01:14:55 +01:00
Lorenz Meier c08135ffef Merged rates setpoints 2012-12-23 21:15:01 +01:00
px4dev 95b3828e41 Merge branch '#102-pwm-output-correctness' 2012-12-23 11:38:16 -08:00
px4dev 6b3f36020c Merge pull request #94 from PX4/DSM-decoder-fix 
Untangle the DSM decoder from the input source priority logic, clean up input handling some more.
 2012-12-23 11:31:31 -08:00
px4dev a8451a2d18 Update apps/drivers/mpu6000/mpu6000.cpp 
Don't call ::close on ORB publication handles.
 2012-12-23 11:24:54 -08:00