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

1120 Commits

Author SHA1 Message Date
Lorenz Meier aa1d57c085 Allowed mode switching via command 2012-12-01 16:28:53 +01:00
Lorenz Meier 121a9fc490 Merge branch '#61-px4io-spektrum-decoder' into fixedwing_outdoor 2012-12-01 10:51:25 +01:00
Lorenz Meier de88732e8e Prevented unhealthy RC input from propagating through the system 2012-12-01 10:49:52 +01:00
px4dev ea8872f545 Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder 2012-12-01 00:50:39 -08:00
px4dev efd3b9dea6 Clean up the FMU communications init. 2012-11-30 22:36:17 -08:00
px4dev 7d9d307ab0 We don't need non-blocking I/O for this context anymore; it's OK for it to block. 2012-11-30 22:15:40 -08:00
px4dev 8c4e9de70a Use the right constraint for the output mixer; we might end up wanting more virtual control channels. 2012-11-30 21:52:18 -08:00
px4dev 1e6e06595a Avoid processing S.bus channels that cannot be communicated to FMU 2012-11-30 21:51:36 -08:00
px4dev 2ac0cac11f Build fix - need <termios.h> 2012-11-30 21:50:19 -08:00
Julian Oes 6f572637de Fixed missing heading for mtkcustom and nmea 2012-11-30 14:26:03 -08:00
Lorenz Meier ef4a54666d Harmonized PPM, S.BUS and DSM input (order: first preference S.Bus, then DSM, then PPM, first available and valid source is chosen), tested with FMU, valid channel inputs 2012-11-30 14:57:54 +01:00
px4dev e0df7e6a76 save ~200 bytes of RAM by correctly positioning the S.bus decoder table in flash. 2012-11-30 01:46:14 -08:00
Lorenz Meier 31c5425e50 Merge remote-tracking branch 'origin/#61-px4io-spektrum-decoder' into sbus 2012-11-30 10:42:36 +01:00
Lorenz Meier d16d66f990 Enabled UART3, added JTAG make target for IO, removed potentially problematic usleep 2012-11-30 10:42:27 +01:00
px4dev c961dd8bab Just for fun, add a (completely untested) S.bus decoder. 2012-11-30 01:34:33 -08:00
px4dev 9fa794a8fa Rework the PX4IO software architecture: 
- Use a separate thread for handing R/C inputs and outputs.
 - Remove all PX4IO R/C receiver configuration; it's all automatic now.
 - Rework the main loop, dedicate it to PX4FMU communications after startup.
 - Fix several issues in the px4io driver that would cause a crash if PX4IO was not responding.
 2012-11-30 00:02:47 -08:00
px4dev 9c8101d4f1 Add some more information to comments. 2012-11-29 10:18:21 -08:00
Lorenz Meier 401c54bdd3 Merge branch '#78-px4io-firmware-updater' of github.com:PX4/Firmware into sbus 2012-11-29 09:54:23 +01:00
px4dev d0efd1a419 Fix the DSM (spektrum) protocol decoder, and add some format auto-detection to it. 2012-11-29 00:35:21 -08:00
px4dev 3321ca0888 Don't print the status line so much; we seem to drop a lot of receive characters this way. 2012-11-29 00:34:44 -08:00
px4dev 03a82e0a03 Fix includes for debug output. 2012-11-29 00:33:44 -08:00
px4dev 92e1d5eb78 Possible fix for #78 - increase the wait timeout for discard when flashing PX4IO. It's not clear this solves the issue, but I can't reproduce it with this added. 2012-11-28 20:12:36 -08:00
Lorenz Meier 00b79764d7 minor code cleanup, not changing functionality 2012-11-28 23:00:43 +01:00
Lorenz Meier 520f335b55 fix for ground speed minimum, untested 2012-11-28 15:02:24 +01:00
Lorenz Meier 54d624f7c7 Added feedforward throttle to pitch compensation, heading from position controller still broken 2012-11-27 18:11:48 +01:00
Lorenz Meier cc1e0ef235 Removed old fixed wing control process 2012-11-27 17:38:16 +01:00
Lorenz Meier e5177b383b Merge branch 'master' into fixedwing_outdoor 2012-11-27 17:27:55 +01:00
Lorenz Meier 98283e16b0 Merged 2012-11-27 17:27:52 +01:00
Lorenz Meier 15236d1ff2 Hotfix: calibration status returns sanity checks with better granularity 2012-11-27 17:26:04 +01:00
Lorenz Meier caf0fefa32 Cleaned up different uorb topics, cleaned up excessive stack sizes 2012-11-27 17:24:33 +01:00
Lorenz Meier 67fbe415dc Merge branch 'delay_test' into fixedwing_outdoor 2012-11-27 14:17:51 +01:00
Lorenz Meier 4d6fb3a037 Added delay test to measure comm delays with a led / scope 2012-11-27 12:45:17 +01:00
Lorenz Meier 90b94b5050 Ported all mixers to actuator_controls_effective topic, mixers do not output the limited result yet 2012-11-27 11:53:50 +01:00
Lorenz Meier 7777d4416d Changed to actuators effective in mavlink app 2012-11-27 11:29:48 +01:00
Lorenz Meier 7d485c117b Merge branch 'rates_setpoint' into fixedwing_outdoor 2012-11-26 21:09:17 +01:00
Lorenz Meier 98657b8ae4 Added rates setpoints as system outputs 2012-11-26 21:03:21 +01:00
Lorenz Meier 80b84819d2 Merged fixed wing branches 2012-11-26 21:02:36 +01:00
Lorenz Meier eca12343fd Merge branch 'io_arming' into fixedwing_outdoor 2012-11-26 17:52:30 +01:00
Lorenz Meier 11b0242f55 Not arming FMU in HIL mode 2012-11-26 17:50:14 +01:00
Lorenz Meier 4298f68fcd IO does not arm in HIL mode 2012-11-26 17:43:07 +01:00
Lorenz Meier 9bc044eae9 More fixed wing improvements 2012-11-26 17:42:08 +01:00
Lorenz Meier 7cc712b286 More fixed wing improvements 2012-11-26 17:41:51 +01:00
Thomas Gubler 4366d9e319 fw_controller testing 2012-11-25 18:20:54 +01:00
Lorenz Meier 2ca09ab3d1 Merged with coordinated turn effort 2012-11-25 17:10:49 +01:00
Lorenz Meier 20a29bff99 Fixes for roll/pitch feedforward 2012-11-25 16:42:31 +01:00
Lorenz Meier 346d93b271 Merged 2012-11-25 13:56:19 +01:00
Lorenz Meier faa672f8bb mode switching for all platforms, additional fixed wing modes 2012-11-25 13:55:28 +01:00
Thomas Gubler dd05426002 manual merge of origin/master into fw_control 2012-11-25 00:50:25 +01:00
Lorenz Meier dc72d467d4 fixed wing manual setpoints in manual mode 2012-11-25 00:28:15 +01:00
Lorenz Meier 9f35de51a6 Removed unneeded header 2012-11-24 22:39:43 +01:00
Lorenz Meier c184d7baeb Enabled aux manual control channels 2012-11-24 19:37:51 +01:00
Lorenz Meier b1bc5e0e46 Improved drivers, allowed parallel use of multiple gyros 2012-11-23 22:52:37 +01:00
px4dev adb04f632f Local changes to match upstream changes. 2012-11-22 20:35:08 -08:00
px4dev a3842eb4d1 Merge branch 'master' of file:///Users/Shared/NuttX/NuttX into nuttx-merge-cbf2eea 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5383 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-22 20:34:32 -08:00
patacongo cbf2eea7f0 A few more fixes for ez80 Windows Native build (still not enough) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5381 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-21 23:22:38 +00:00
Thomas Gubler 6fb54ec62c manual merge of origin/master into fw_control 2012-11-21 21:35:13 +01:00
patacongo 27ec2129d7 /configs/stm32f4discovery/winbuild and configs/cloudctrl upated to use Mike's Toolchain.defs; Fix error introduced into tools/configure.sh 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5380 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-21 19:54:44 +00:00
Lorenz Meier 0193d590db Removed debug printf 2012-11-21 17:37:52 +01:00
Lorenz Meier d9a3103413 Merge branch 'development' of github.com:PX4/Firmware into development 2012-11-21 17:37:00 +01:00
Lorenz Meier 4d1256e3f3 Removed left-over comment 2012-11-21 17:36:52 +01:00
Lorenz Meier e24c349d1d Temporarily very verbose on flow output 2012-11-21 15:42:42 +01:00
Lorenz Meier 25e304c869 Added vicon, actuator controls effective and optical flow to logging 2012-11-21 15:32:59 +01:00
Lorenz Meier ffda224b41 Added actuator controls effective topic 2012-11-21 14:59:55 +01:00
Lorenz Meier d1cde9858d Fixed typo in console message string 2012-11-21 14:59:17 +01:00
Lorenz Meier 13000a7121 Yaw rate sanity checking for controller 2012-11-20 16:51:13 +01:00
Lorenz Meier 7820024d90 Disabling commander black magic 2012-11-20 16:50:55 +01:00
patacongo f552862bb5 Missing comma in EVERY DELFILE/DELDIR macro call in every Makefile 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5373 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-20 15:47:41 +00:00
Lorenz Meier 3bfc309856 Added setpoint triplet 2012-11-20 15:20:13 +01:00
Lorenz Meier 6ff4520904 Cleaned up PI wrapping code, still subject to testing 2012-11-20 15:19:51 +01:00
patacongo 6833671f0c 0001-some-fixes-for-FreeMODBUS-and-MODBUS-example.patch from Freddi Chopin 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5372 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-20 13:36:07 +00:00
Julian Oes 129e6d73de Changed yaw position control to yaw speed control for multirotors, tested with ardrone 2012-11-19 16:17:52 -08:00
Julian Oes 2652b16d37 Distinction between yaw position and yaw speed control, just messsed around in the code, untested 2012-11-19 09:26:38 -08:00
Lorenz Meier 9c8e031f6b Fixed minor optical flow receive and retransmit issue, value was not re-transmitted 2012-11-19 13:37:38 +01:00
Lorenz Meier d006a3fe2d Added onboard, receive-only MAVLink app for onboard UART networks 2012-11-18 16:19:10 +01:00
Lorenz Meier 340323830c Minor cleanups in docs and output 2012-11-18 16:17:09 +01:00
patacongo d4dca58d93 Most of the changes needed to support Windows native clean; distclean is has a problem 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5367 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-17 18:54:53 +00:00
patacongo 8b823f6bee Mostly cosmetic build changes 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5362 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-16 14:13:04 +00:00
patacongo da3dd04ea5 Changes from Mike 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-16 12:41:58 +00:00
Julian Oes e9acc18df4 Lowered arm button prelling 2012-11-15 11:57:55 -08:00
Julian Oes 33e750602a Merge remote-tracking branch 'upstream/master' into io 
Fixed Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c

rc loss failsafe throttle tested
 2012-11-15 11:55:55 -08:00
patacongo 9129fb715b Fix a place that had a '\' but needed a '/' 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5359 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-15 19:35:15 +00:00
patacongo afda776368 Fix various build-related typos 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5358 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-15 19:22:47 +00:00
patacongo 2581506dfb Move some (hopefully) un-necessary quotes in Makefiles for Mike 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5356 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-15 17:43:29 +00:00
Lorenz Meier 3016ae72a3 minor cosmetic changes in commander 2012-11-15 17:20:14 +01:00
Lorenz Meier 7f916779df Minor cleanup of param load / store 2012-11-15 17:19:52 +01:00
Lorenz Meier df5e4d1904 Improved self-test logic 2012-11-15 17:19:21 +01:00
Lorenz Meier 74d543cfc9 Made u-blox timeouts more forgiving 2012-11-15 17:14:24 +01:00
Lorenz Meier 1e213ea53c Fixed sensors test 2012-11-15 15:14:28 +01:00
Lorenz Meier c0c7266255 Added preflight_check app 2012-11-15 15:13:45 +01:00
Lorenz Meier 5020a0a063 Addes sensor self test commands 2012-11-15 15:13:27 +01:00
Lorenz Meier 68346fbfeb Cleaned up include list 2012-11-15 13:21:09 +01:00
Lorenz Meier f803540415 Added preflight_check app which checks core system sensors, so far only mag 2012-11-15 13:21:00 +01:00
Thomas Gubler 1f798efd17 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-14 22:42:29 +01:00
Thomas Gubler f0e39397fe fw control: work in progress, heading rate control loop 2012-11-14 22:42:00 +01:00
patacongo 5bba2c1508 Simple window natives OS test build now works; Probabaly more to do for other configs; clean targets still have problems 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5355 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-14 20:59:36 +00:00
patacongo 2afceac487 Qencoder fixes from Ryan Sundberg 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5354 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-14 19:26:13 +00:00
patacongo 21f348544f Kconfig updates from Freddie Chopin 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5353 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-14 17:04:03 +00:00
patacongo 81caf90b8d ModBus fixes from Freddie Chopin 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5351 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-14 14:29:01 +00:00
Lorenz Meier c4bf3ea3ed better system status reporting, work in progress 2012-11-14 15:18:16 +01:00
Lorenz Meier 3eb36bbd21 Fix led assignment for FMU 2012-11-14 15:17:49 +01:00
Lorenz Meier 722af669fe Better integrate calibration check 2012-11-14 15:17:30 +01:00
Lorenz Meier aeea27d16a Increased interface slightly to better match 200 Hz, adjusted led flash speed 2012-11-14 15:17:06 +01:00
Lorenz Meier ffac5cba2f Requiring at least four channels for a successful PPM frame 2012-11-14 13:42:16 +01:00
Lorenz Meier c2abe3997c Minor cleanups in attitude control 2012-11-14 10:42:46 +01:00
Lorenz Meier d9d002f3aa Fixed line breaks in ADC test 2012-11-14 10:42:02 +01:00
Lorenz Meier 01eed6e946 Added perf counter, cleaned up 2012-11-14 10:41:44 +01:00
Nick Butcher ed87f7d12c Merge commit 'a6294be6f076913d7b2c04e42aae1c0c93193a6f' 2012-11-14 07:51:35 +01:00
Julian Oes b7c6a11e67 Merge remote-tracking branch 'upstream/master' into io 2012-11-13 14:20:31 -08:00
Julian Oes 359cc4bb86 Merge remote-tracking branch 'upstream/master' into io 2012-11-13 14:18:59 -08:00
patacongo bcdd7936ce Centralized the definition of the INCDIR script in tools/Config.mk 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5346 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-13 20:24:30 +00:00
Thomas Gubler 5ea79ad1b9 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-13 20:26:27 +01:00
Thomas Gubler c1e28f5f13 first version of yaw control loop, needs testing 2012-11-13 20:24:23 +01:00
Lorenz Meier a6294be6f0 Merge branch 'fw_control' of https://github.com/thomasgubler/Firmware 2012-11-13 18:57:35 +01:00
Lorenz Meier d15e6ae73a Merge branch 'master' of github.com:PX4/Firmware 2012-11-13 10:58:24 +01:00
Lorenz Meier 050698bedc Added missing channel count in px4io driver 2012-11-13 10:03:39 +01:00
Nick Butcher b5665c2a71 GPS watchdog - health detection fixes 2012-11-12 23:18:20 +01:00
Lorenz Meier a1059c5657 Added missing GPS message fields 2012-11-12 23:10:12 +01:00
Lorenz Meier e52c7e3c4b Merge branch 'master' of github.com:PX4/Firmware 2012-11-12 21:08:57 +01:00
Lorenz Meier e9942e4af7 minor HIL related tweaks 2012-11-12 21:08:51 +01:00
Lorenz Meier 66e806754b Fixed GPS status detection 2012-11-12 17:36:17 +01:00
patacongo d3ac724c7b Changes to get a clean ez80 build using the ZDS 5.1.1 toolchain 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5341 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-12 15:22:27 +00:00
Lorenz Meier 2c12802f25 Fixed HIL compile warnings 2012-11-12 10:59:35 +01:00
Lorenz Meier 03d58e9b00 Merge branch 'master' of github.com:PX4/Firmware 2012-11-12 10:48:00 +01:00
px4dev dca3bce1ca Add a new performance counter for measuring periodic/interval events. 2012-11-12 01:35:51 -08:00
Lorenz Meier c57be7a7a7 Merge branch 'master' of github.com:PX4/Firmware 2012-11-12 08:38:39 +01:00
patacongo fe19d5bea1 A few more build fixes 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5340 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-12 01:54:54 +00:00
patacongo 63e8e1bed3 Correct some issues with last check-in; ez80 still does not build 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-11 23:44:31 +00:00
Julian Oes a8dfcaace2 Several fixes, hex flies, failsafe not really tested yet 2012-11-11 11:55:27 -08:00
Thomas Gubler 403874d313 change sign of elevator in mixer to match standard convention (positive --> more lift) 2012-11-11 17:55:05 +01:00
Thomas Gubler 60198e3a2d small code cleanup 2012-11-11 17:35:55 +01:00
patacongo 24a0389152 Partial change: Removing bash ARCHIVE loop 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5336 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-11 16:24:40 +00:00
Thomas Gubler 8edf02681b merge origin master into fw_control 2012-11-11 16:48:33 +01:00
Lorenz Meier 7d8d7a76b9 Fixed scalings for fixed wing and multirotors 2012-11-11 12:55:57 +01:00
Thomas Gubler 2b1e199b91 Merge branch 'hil_scaling' into fw_control 2012-11-10 20:03:17 +01:00
Thomas Gubler 3e6e7647c9 corrected hil scaling factors 2012-11-10 20:02:16 +01:00
Thomas Gubler bbfd31dd68 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-10 19:14:50 +01:00
Lorenz Meier f8291711d3 Correct scaling for throttle 2012-11-10 19:10:57 +01:00
Thomas Gubler 596224883b Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-10 19:07:29 +01:00
Lorenz Meier fb022f40e5 Fixed zero offset in HIL 2012-11-10 19:06:58 +01:00
Thomas Gubler d3693ea993 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-10 19:05:13 +01:00
Lorenz Meier 6adab3b319 Hack to detect the number of control inputs 2012-11-10 19:04:04 +01:00
Thomas Gubler 4fae74e4c1 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-10 18:36:11 +01:00
Thomas Gubler e1cfa102a2 Merge branch 'master' of https://github.com/PX4/Firmware into fw_control 2012-11-10 18:35:58 +01:00
Lorenz Meier 92fe049f65 Sending correct actuator scaling 2012-11-10 18:35:53 +01:00
Thomas Gubler 12e6905834 merge origin/master 2012-11-10 18:35:46 +01:00
Lorenz Meier 13443e43bf Silenced attitude ekf if not getting sensor data in HIL mode 2012-11-10 18:32:42 +01:00
Lorenz Meier 596d20e2a3 Increased stack sizes, 1K is not enough when calling printf() from within app 2012-11-10 18:32:20 +01:00
Lorenz Meier d29c66b028 Code cleanup in mavlink app 2012-11-10 18:31:50 +01:00
Lorenz Meier 41629e0ddb Operational mixing and outputs in hil 2012-11-10 18:14:25 +01:00
Lorenz Meier ee5abb0745 Fixed the number of control inputs for simple mixer. Contributed by Thomas Gubler 2012-11-10 17:21:13 +01:00