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
px4dev
dc50d96b5d
Merge commit '0f2decb70f505b108999fcdb80e89d7aae6760ce' into nuttx-merge-0f2decb
2013-01-01 15:33:39 -08:00
patacongo
5d6b2017a0
All lm3s6965-ek configurations converted to use kconfig-frontends
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5471 42af7a65-404d-4744-a932-0658087f49c3
2013-01-01 16:34:12 +00: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
patacongo
167854a980
Remove non-functional WLAN examples, configurations
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5468 42af7a65-404d-4744-a932-0658087f49c3
2012-12-31 13:44:36 +00: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
patacongo
e88ff3cdfa
Fix the nxlines configuration for the zp214xpa board
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5467 42af7a65-404d-4744-a932-0658087f49c3
2012-12-30 21:12:43 +00: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
patacongo
e0be95b9a0
Add board support at configs/zp214xpa for the The0.net ZP213X/4XPA board with the LPC2148; Add configurations sim/nxlines. convert mcu123-lpc214x/nsh to use the kconfig-frontends.
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5465 42af7a65-404d-4744-a932-0658087f49c3
2012-12-28 23:40:54 +00: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
patacongo
954529e8c5
Add support for key release events
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5464 42af7a65-404d-4744-a932-0658087f49c3
2012-12-27 14:01:59 +00:00
patacongo
88bccb641e
Verified USB HID KBD driver encoding of special characters; apps/examples/hidkbd now decodes encoded keyboar characters.
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5463 42af7a65-404d-4744-a932-0658087f49c3
2012-12-26 21:37:50 +00:00
patacongo
8ed19bb07d
Add UG_2965SWEG01 driver from Darcy Gong; fix logic error in how waiters are reawakened in the USB HID keyboard driver
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5462 42af7a65-404d-4744-a932-0658087f49c3
2012-12-26 20:04:57 +00:00
patacongo
373e145e54
Implement encoding the usbhost HID keyboard driver; configre olimex-lpc1766stk HID keyboard configuration to use the kconfig-frontends tool
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5461 42af7a65-404d-4744-a932-0658087f49c3
2012-12-26 18:54:59 +00:00
patacongo
292d4db37a
Add logic to serialize and marshal out-of-band keyboard commands
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5460 42af7a65-404d-4744-a932-0658087f49c3
2012-12-25 17:22:58 +00:00
patacongo
6953365d30
Fix several build issues noted by Mike Smith
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5459 42af7a65-404d-4744-a932-0658087f49c3
2012-12-24 20:22:14 +00:00
patacongo
7c73fe57c6
Fixes for l3s, USB composite, nfsmount, apps context build problems
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5458 42af7a65-404d-4744-a932-0658087f49c3
2012-12-24 17:49:58 +00:00
patacongo
5859e0d353
Correct round-to-ticks logic in sigtimedwait()
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5457 42af7a65-404d-4744-a932-0658087f49c3
2012-12-24 14:31:02 +00:00
patacongo
424d1af00f
Some fixes to apps/builtin/registry need to handle some additional cases
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5456 42af7a65-404d-4744-a932-0658087f49c3
2012-12-24 13:15:57 +00: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
patacongo
3fe53af6be
Remove .context kludge from apps/ directory
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5455 42af7a65-404d-4744-a932-0658087f49c3
2012-12-23 22:17:09 +00:00
patacongo
5cfde412bb
Rename namedapp as simply builtin
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5454 42af7a65-404d-4744-a932-0658087f49c3
2012-12-23 20:22:41 +00: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
Lorenz Meier
720a1140b2
Merged NuttX
2012-12-23 20:23:30 +01:00
patacongo
edb3871913
Remove some dependencies of distclean on clean. This should not be necessary in higher level makefiles and should speed up make distclean
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5453 42af7a65-404d-4744-a932-0658087f49c3
2012-12-23 17:35:06 +00:00
Lorenz Meier
f2fb8c7960
Fix typo
2012-12-23 18:10:00 +01:00
Lorenz Meier
6d34211630
Merge branch 'gyros_parallel' into fixedwing_outdoor
2012-12-22 00:57:50 +01:00
Lorenz Meier
a2aa9dd8fd
Made MPU-6000 gyro optional
2012-12-22 00:56:37 +01:00
Lorenz Meier
4cf2266b79
Robustified actuator output topic, added number of mixed outputs
2012-12-22 00:47:52 +01:00
patacongo
c67fdb87f7
Patches from Petteri Aimonen (plus a few other things)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5448 42af7a65-404d-4744-a932-0658087f49c3
2012-12-21 20:09:32 +00:00
px4dev
5b92c51777
Initial implementation of application access to the PX4IO relays.
2012-12-20 21:31:02 -08:00
patacongo
0f2decb70f
Prep for release 6.24
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5447 42af7a65-404d-4744-a932-0658087f49c3
2012-12-20 20:22:21 +00:00
Julian Oes
8053b4b9f7
Revert "I don't want a switch for failsafe for the copter"
...
This reverts commit 28b3ecd9c6
.
2012-12-20 08:55:54 -08:00
px4dev
73763353d0
Merge branch 'master' into DSM-decoder-fix
2012-12-19 22:24:00 -08:00
Julian Oes
06407b166f
My PID integral part fixes
2012-12-19 17:54:18 -08:00
Julian Oes
28b3ecd9c6
I don't want a switch for failsafe for the copter
2012-12-19 17:06:01 -08:00
patacongo
272fc3b523
Some minor fixes for CONFIG_ADDRENV=y
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5444 42af7a65-404d-4744-a932-0658087f49c3
2012-12-19 21:16:03 +00:00
patacongo
56a6504618
Incorporate address environment interfaces in binfmt/ logic
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5443 42af7a65-404d-4744-a932-0658087f49c3
2012-12-19 17:54:26 +00:00
Lorenz Meier
fe6496a04d
Correctly do position lock led signalling on IO and position lock measurement on FMU, tested with HIL.
2012-12-19 14:20:40 +01:00
Lorenz Meier
4676b71d8a
Cleanup in ADC driver, re-add all inputs that are present
2012-12-19 14:19:11 +01:00
Lorenz Meier
bc3b66043f
Cleaned up HIL on FMU / IO combo
2012-12-19 11:34:51 +01:00
Lorenz Meier
f41e5728fc
Correct demixing scaling for v-tail mixers
2012-12-18 13:18:36 +01:00
Lorenz Meier
4c2862f6c0
Merged PWM fixes
2012-12-18 12:32:19 +01:00
px4dev
76895af6eb
Fix several aspects of the PWM output driver; enable auto-reload, use named constants for various control bits, and use a more polite mechanism at disarm time to avoid runt pulses.
...
This may address an issue we've seen where we get occasional malformed PWM output pulses, possibly due to a race between compare updates and the timer.
2012-12-18 00:35:28 -08:00
px4dev
8d716dea45
Teach 'fake' to set the arming state as well.
...
Whitespace.
2012-12-18 00:33:33 -08:00
px4dev
b8044d9786
use <err.h> more consistently in the fmu driver.
2012-12-18 00:29:22 -08:00
px4dev
6d0bea0298
Fix the PWM servo ioctl base so it's not overlapping the GPIOs
2012-12-18 00:27:12 -08:00
Lorenz Meier
97a94e3b89
Fixed MAV_TYPE parameter readout
2012-12-16 16:31:17 +01:00
Lorenz Meier
df5c09ead1
Fixed MAVLink parameter initialization
2012-12-16 16:31:02 +01:00
Lorenz Meier
b9606d0d6e
Reverted arming state machine back to its original state, operational again
2012-12-16 16:30:41 +01:00
Lorenz Meier
e56911bf2d
Fixed signal loss detection on S.Bus parsing, stripped PX4IO code parts from S.Bus parser to allow FMU / IO parser code sharing. Added S.Bus channels 17 and 18 if channel data struct has enough space. Tested with receiver and PX4FMU.
2012-12-16 15:31:44 +01:00
Lorenz Meier
f81d00594c
Made PX4IO FMU timeout based on IOs HRT, updating mixers now on every FMU update and not at fixed rate, this is WIP and currently does not support mixing with RC-only
2012-12-15 23:28:03 +01:00
Lorenz Meier
1fc0a6546e
Merged IO feature branch
2012-12-13 11:12:34 +01:00
Lorenz Meier
03076a72ca
Added required additional fields: If system is ok to launch (required for LED indicator), if system is ok to override fully by RC (required for multirotors which should not support this), desired PWM output rate in Hz (again required for some multirotors).
2012-12-13 10:23:02 +01:00
Lorenz Meier
26faab64e5
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor
2012-12-09 19:19:59 +01:00
patacongo
200ce6d7ff
configs/xtrs/nsh and pashello now use kconfig-frontends and build Windows native
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5422 42af7a65-404d-4744-a932-0658087f49c3
2012-12-09 17:34:53 +00:00
Simon Wilks
03b51c69e0
Added more LED state logic and improve code.
...
The LED will now also indicate when the FMU is ARMED. Switched to using
a 16-bit value where each bit indicates what state the LED should be
in.
2012-12-08 13:39:28 +01:00
Simon Wilks
197e573885
Add an additional safety switch LED blink sequence when FMU and IO are armed
...
If both the FMU and the IO board are armed then the secure switch will
blink two times quickly then a pause followed by two quick blinks and
so on.
2012-12-07 21:34:41 +01:00
Lorenz Meier
82cbac70ee
Fixed calibration check
2012-12-07 17:07:42 +01:00
Simon Wilks
097aeddcad
Push single wire operations into stm32_serial.c and added a test to verify HoTT telemetry setup.
2012-12-06 17:24:27 +01:00
Lorenz Meier
1ebb3b4ada
Merged DSM fixes
2012-12-05 19:55:33 +01:00
px4dev
fd771f67f2
Adjust the control mapping from DSM receivers to correspond to the standard PPM control mapping for channels 0-4.
2012-12-04 22:00:24 -08:00
px4dev
7c3b28d503
Lock out the PPM decoder if the DSM or S.bus decoders have seen a frame recently.
2012-12-04 09:52:16 -08:00
px4dev
1485a4ec1a
Fix breakage to the DSM parser introduced with the input prioritisation logic. Back out to a "any input wins" strategy; connecting multiple receivers to I/O at the same time is currently not supported (read: strange things will happen).
2012-12-03 23:20:28 -08:00
px4dev
6e328b4d7a
Add a 'monitor' verb to the px4io command so we can watch inputs to IO (it could get smarter).
2012-12-03 23:19:12 -08:00
px4dev
451ecc1bf4
Remove a few cut-and-paste author attributions.
2012-12-02 17:53:31 -08:00
px4dev
ad6c60c77c
Merge pull request #90 from PX4/#89-BlinkM-driver
...
BlinkM driver
2012-12-01 22:59:36 -08:00
px4dev
b02c69243d
Merge pull request #75 from PX4/delay_test
...
Added delay test to measure comm delays with a led / scope
2012-12-01 22:55:55 -08:00
px4dev
55e2e18885
Merge pull request #73 from PX4/io_arming
...
Made sure IO and FMU obey the lockdown flag when arming motors
2012-12-01 22:55:33 -08:00
px4dev
c09ed414fd
Merge pull request #80 from PX4/#61-px4io-spektrum-decoder
...
#61 px4io spektrum decoder
2012-12-01 22:54:06 -08:00
px4dev
d92827c54c
Merge pull request #76 from PX4/topics_cleanup
...
Cleaned up different uorb topics, cleaned up excessive stack sizes
2012-12-01 22:53:15 -08:00
px4dev
269bd9f403
Force the fade speed to something sensible. Deal better with failed probes.
2012-12-01 19:36:02 -08:00
px4dev
2a8ef50df4
A driver and shell command for the BlinkM I2C LED controller.
2012-12-01 19:29:36 -08:00
patacongo
7f7356cdc9
standard keypad inteface and apps/examples/keypadtest from Denis Carikli
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5403 42af7a65-404d-4744-a932-0658087f49c3
2012-12-01 15:43:51 +00:00
Lorenz Meier
126e6ac207
Enabled manual override switch, work in progress. Added initial demix testing code to support delta mixing on the remote for convenient manual override
2012-12-01 16:30:21 +01:00
Lorenz Meier
2bfb672791
Cleaned up mode indication
2012-12-01 16:29:06 +01:00
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
Simon Wilks
9924c4f425
Addressed compiler warnings and handle non-supported devices properly.
2012-11-30 08:12:20 +01:00
Simon Wilks
c149b26dd4
Code formatting cleanup.
...
Fixed code style with Tools/fix_code_style.sh
2012-11-30 08:06:19 +01:00
patacongo
c9230359ef
All ZNEO configurations converted to use the mconf/Kconfig tool
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 18:44:02 +00:00
px4dev
9c8101d4f1
Add some more information to comments.
2012-11-29 10:18:21 -08:00
Simon Wilks
2eccf5ff19
Cleanup a bit.
2012-11-29 16:48:52 +01:00
Simon Wilks
d82c62e95b
Single wire now working once moving away from UART5.
2012-11-29 16:42:13 +01:00
patacongo
cdada458a1
z8 configurations will now build in Windows native environment
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5399 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 15:24:27 +00:00
patacongo
724d3c4c0d
Patches for NSH disable background, and ARMv7M assembly from Freddie Chopin
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5398 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 13:58:53 +00: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
Simon Wilks
d6e54c3ce4
Trying to get single wire working. Not quite there yet.
2012-11-29 02:30:46 +01: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
patacongo
3c20b3a3cd
Add chip ID funcitions for Shenzhou and Cloudctrl boards; Extened NSH ifconfig command and improve DHCPC -- All from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5393 42af7a65-404d-4744-a932-0658087f49c3
2012-11-27 16:26:54 +00: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
patacongo
8c5b57d449
configs/z8f64200100kit/ostest at same level as ez80 configurations; nuttx/arch/arm/src/lpc17xx/lpc17_i2c.cuninitialization fix
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5392 42af7a65-404d-4744-a932-0658087f49c3
2012-11-27 15:09:12 +00: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
Simon Wilks
14d874f4a1
Fix some memory corruption bugs.
2012-11-22 16:20:48 +01:00
Simon Wilks
cc7952ea94
Messaging cleanup.
2012-11-22 12:48:52 +01:00
Simon Wilks
c296ffb708
Tried cleaning up console messaging a bit.
2012-11-22 11:46:23 +01:00
Simon Wilks
ae906dee98
Shorten the post read delay slightly.
2012-11-22 02:03:50 +01:00
Simon Wilks
bc27a495a0
Make the reading and sending of data independant of the message type.
...
This will allow us to cleanly support various sensor types by having a
byte array interface for send_data() and read_data().
2012-11-22 01:54:41 +01: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
Simon Wilks
054c65535f
General code cleanup.
2012-11-21 23:37:20 +01: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
Simon Wilks
4a509684a7
Merge remote-tracking branch 'upstream/master' into hott
2012-11-21 07:32:59 +01:00
Simon Wilks
6894c4d1bf
Added a note on the inclusion of libraries for UART access in the Makefile.
2012-11-21 00:19:45 +01:00
Simon Wilks
aa7873dee1
Introducing an initial implementation of HoTT telemetry support.
2012-11-21 00:16:43 +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
Simon Wilks
46ab48ab94
Added a missing comment.
2012-11-14 00:36:01 +01:00
Simon Wilks
efdfa2b8b4
Setup skeleton code (basic daemon).
2012-11-14 00:33:26 +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
Lorenz Meier
b43f692d3a
Correctly handling 8+ outputs, currently only first 8 supported
2012-11-10 17:07:17 +01:00
Lorenz Meier
84a0261278
Outputting mixed actuators instead of raw control output
2012-11-10 16:54:28 +01:00
Lorenz Meier
e8eb887515
Added hil command to emulate PWM outputs
2012-11-10 16:52:06 +01:00
Lorenz Meier
f08e99311f
Better printing of baro test values
2012-11-10 16:51:38 +01:00
Lorenz Meier
e99a684fd8
Removed debug ioctl output
2012-11-10 16:51:17 +01:00
Thomas Gubler
536ab4bce3
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
2012-11-10 15:22:42 +01:00
Lorenz Meier
90466afe05
Comments cleanup / polishing
2012-11-10 12:13:40 +01:00
Lorenz Meier
15f43b1acc
improved ADC test, not yet stable
2012-11-10 12:13:15 +01:00
Lorenz Meier
f0860ee8cb
Merge branch 'master' of github.com:PX4/Firmware
2012-11-10 11:43:20 +01:00
Lorenz Meier
127ae32997
Completed sensors test, WIP on ADC test
2012-11-10 11:43:05 +01:00
Lorenz Meier
0baca3ee31
Better, platform independent failsafe handling
2012-11-09 16:30:00 +01:00
Lorenz Meier
a866fb2f2c
Disable failsafe until its actually tested
2012-11-09 16:20:23 +01:00
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
patacongo
d04ce723f0
Several patches from Petteri Aimonen (mostly NxWidgets)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5324 42af7a65-404d-4744-a932-0658087f49c3
2012-11-09 14:54:29 +00: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
patacongo
0bb1b8c74c
Convert configs/stm32f4discovery/nxlines to use Kconfig tool
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5320 42af7a65-404d-4744-a932-0658087f49c3
2012-11-07 23:55:49 +00: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
patacongo
a1d2cc2cb4
Fix apps/netutils/webclient build problem
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5317 42af7a65-404d-4744-a932-0658087f49c3
2012-11-06 16:59:45 +00:00
daregger
0ee48db90f
add attitude + rotation Matrix to logging
2012-11-06 11:25:31 +01: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
0eea4bfb4e
fw control: minor cleanup (work in progress)
2012-11-05 22:51:41 +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
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
patacongo
7961d6ce58
Make ostest RR scheduler test use less memory from Freddie Chopin; Plus build fix from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5314 42af7a65-404d-4744-a932-0658087f49c3
2012-11-05 20:02:56 +00: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
daregger
801cf3af3e
add tangent plane mapping to geo.c
2012-11-05 17:17:28 +01:00
patacongo
5d0999c859
Prep for 6.23 release
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5313 42af7a65-404d-4744-a932-0658087f49c3
2012-11-05 15:42:58 +00:00
Lorenz Meier
e7f2c053c2
Quickly separated low-level raw RC from mapped / scaled RC, supports FMU PPM and IO PPM / Spektrum now
2012-11-05 16:04:45 +01:00
px4dev
39659e57f8
Add prototypical support for Spektrum satellite remotes to PX4IO.
2012-11-05 00:55:45 -08:00
px4dev
87fd9fcc06
Fix red/blue LED assignment.
2012-11-05 00:55:45 -08:00
Lorenz Meier
ec43e7b7be
Increased output rates at 115200 baud
2012-11-05 09:45:25 +01:00
px4dev
7fbad5adea
Fix PWM channel zero output; pin configuration was being overwritten by USART2 setup.
2012-11-04 16:44:36 -08:00
px4dev
06e17eae5d
Fix off-by-one reading PWM output values. Minor robustness tweaks.
2012-11-04 16:44:06 -08:00
patacongo
f6de06f9f9
Add interfaces flags, extend ifconfig, add ifup and ifdown commands (Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5308 42af7a65-404d-4744-a932-0658087f49c3
2012-11-04 18:54:04 +00:00
patacongo
baeabacae3
Massive clean-up of linker scripts from Freddie Chopin
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5307 42af7a65-404d-4744-a932-0658087f49c3
2012-11-04 17:18:25 +00:00
patacongo
9583fa1abd
Relay example from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5306 42af7a65-404d-4744-a932-0658087f49c3
2012-11-04 16:08:02 +00:00
px4dev
487597b385
Checkpoint; messages from FMU now make it to IO intact; fix HRT init timing, process more bytes from the serial port, add some simple packet counting.
2012-11-03 01:14:25 -07:00
px4dev
b0da90b6db
When starting the px4io driver, check that data is being received from the PX4IO board.
2012-11-03 01:14:25 -07:00
px4dev
37682f852f
Clean up perf counters attached to an HX protocol stream.
2012-11-03 01:14:25 -07:00
px4dev
f11cf48bb9
Attach the interrupt before powering on the HRT timer.
2012-11-03 01:14:25 -07:00
px4dev
ccc7b13185
There are four relay channels (two are power switches)
2012-11-03 01:14:25 -07:00
px4dev
5af84e3b11
Check for transmit errors.
2012-11-03 01:14:24 -07:00
px4dev
e36bd4b243
Fix transmit error reporting.
2012-11-03 01:14:24 -07:00
px4dev
ad7db28929
Let's use poll. It's more friendlier.
2012-11-03 01:14:24 -07:00
px4dev
ea539031da
Cleanup and refactor of the PX4IO firmware and board support. Builds, not tested yet.
2012-11-03 01:14:24 -07:00
patacongo
df77815b8b
Add support for wget POST interface; from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5301 42af7a65-404d-4744-a932-0658087f49c3
2012-11-03 00:00:56 +00:00
patacongo
23e8d5321a
Create an STM32F4Discovery configuration for testing uClibc++
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5300 42af7a65-404d-4744-a932-0658087f49c3
2012-11-02 23:22:48 +00:00
patacongo
708ebb52f0
More uClibc++ build fixes
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5299 42af7a65-404d-4744-a932-0658087f49c3
2012-11-02 16:35:37 +00:00
Lorenz Meier
82c4dbaaa8
param load / store cleanup, storage location selection now exclusively through dedicated "param select <path>" command
2012-11-02 15:21:37 +01:00
Lorenz Meier
55515f2e7e
Merge branch 'master' of github.com:pixhawk/Firmware
2012-11-02 12:50:15 +01:00
Lorenz Meier
a5193ba841
Merge branch 'master' of github.com:PX4/Firmware
2012-11-02 12:49:46 +01:00
patacongo
d7aefb08f7
Fixes for warnings from Freddie Chopin
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5294 42af7a65-404d-4744-a932-0658087f49c3
2012-11-01 21:21:54 +00:00
patacongo
f5776dec9f
uClibc++ compiles... but it is a long way from linking
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5293 42af7a65-404d-4744-a932-0658087f49c3
2012-11-01 21:08:56 +00:00
Tobias Naegeli
80ac43e21d
Fine tuning of manual control
2012-11-01 16:50:52 +01:00
Lorenz Meier
6af2ea9fbc
Minor tweaks to offboard control reception
2012-11-01 10:51:55 +01:00
Lorenz Meier
5e1416178a
Merged
2012-11-01 08:14:31 +01:00
Lorenz Meier
18dbdf0a54
Report mag status to system, sanity-check calibration
2012-11-01 08:11:55 +01:00
Lorenz Meier
4d6ac93aff
Print selectively by name
2012-11-01 08:11:36 +01:00
patacongo
25136e9a50
Convert configs/sim/ostest to use mconf tool; Add configs/sim/cxxtest
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5285 42af7a65-404d-4744-a932-0658087f49c3
2012-10-31 22:06:31 +00:00
patacongo
05a1bb2abf
Add apps/examples/cxxtest from Qiang Yu
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5284 42af7a65-404d-4744-a932-0658087f49c3
2012-10-31 20:13:28 +00:00
Thomas Gubler
904efa8fa8
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
2012-10-31 21:07:01 +01:00
px4dev
8bfceef89c
Remove the arbitrary limit on the path to the default parameter file. Add a verb to the param command to set the default parameter file.
2012-10-31 12:59:24 -07:00
patacongo
a74dd08492
Documentation update
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5282 42af7a65-404d-4744-a932-0658087f49c3
2012-10-31 17:53:28 +00:00
Lorenz Meier
3c987d6368
Casting and fix default param path
2012-10-31 18:50:00 +01:00
Lorenz Meier
fbdf30b7d4
Merge branch 'master' of github.com:PX4/Firmware
2012-10-31 17:09:11 +01:00
patacongo
33a3edbaf7
Add apps/examples/wgetjson from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5281 42af7a65-404d-4744-a932-0658087f49c3
2012-10-31 16:04:45 +00:00
Lorenz Meier
0ddfd7c75c
New param interface for microSD and EEPROM
2012-10-31 16:31:21 +01:00
Lorenz Meier
8dcde7f8cd
prevent double-precision promotion where its not required
2012-10-31 15:49:01 +01:00
Lorenz Meier
939fc83c4a
Fix compile warnings
2012-10-31 15:44:45 +01:00
patacongo
26cbab4570
Add apps/netutils/codecs and associated NSH commands from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5280 42af7a65-404d-4744-a932-0658087f49c3
2012-10-31 14:36:00 +00:00
Lorenz Meier
472010b10b
Extended GPS struct with velocity vector
2012-10-31 12:59:14 +01:00
px4dev
34a3b260f3
Move the last of the board-specific code for PX4FMU out of the NuttX tree. Now it's just configuration.
2012-10-31 00:37:15 -07:00
px4dev
b685d46dbf
Clean out remains of the old EEPROM driver.
2012-10-30 20:51:45 -07:00
Lorenz Meier
137afdbd3c
Remove excessive mem usage
2012-10-30 19:11:27 +01:00
Thomas Gubler
ee1e98babb
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
2012-10-30 18:30:35 +01:00
Thomas Gubler
e716bd02ce
Merge branch 'FW_control' of https://github.com/dougweibel/Firmware into fw_control
2012-10-30 18:29:31 +01:00
Lorenz Meier
edd2715f84
reverted memory change, sdlog app needs more than 2K
2012-10-30 18:26:36 +01:00
Doug Weibel
18831db444
Work in process - beginning of navigation/position control implementation. Compiles, but has not been tested.
2012-10-30 11:01:56 -06:00
Lorenz Meier
56a0f14b34
Minor last tweaks
2012-10-30 17:57:26 +01:00
Lorenz Meier
12e1cf3710
Fixed error term calculation for yaw position
2012-10-30 17:38:26 +01:00
Lorenz Meier
ab63a77edf
Reducing stack sizes to free some RAM
2012-10-30 16:44:57 +01:00
Lorenz Meier
96dc901cae
Fixed mag calibration
2012-10-30 16:44:16 +01:00
Lorenz Meier
b1a83be611
Fixed extremely stupid copy-paste bug in mag scale loading
2012-10-30 11:32:23 +01:00
Lorenz Meier
4db0ec03ce
Better yaw position control, but not quite there yet
2012-10-30 11:16:01 +01:00
Lorenz Meier
01932a2dc3
Merge branch 'master' of github.com:PX4/Firmware
2012-10-30 07:50:13 +01:00
Lorenz Meier
fedf5470d6
Correctly initializing and updating yaw setpoint, sign still to be checked
2012-10-30 07:20:23 +01:00
px4dev
66da4395b4
Kill the old board info code.
2012-10-29 23:07:15 -07:00
px4dev
0616d58340
Add 'show' and 'test' verbs to the boardinfo command. Teach rcS how to use the new version.
2012-10-29 21:47:51 -07:00
px4dev
7203ba797e
bson-based boardinfo working
2012-10-29 21:47:51 -07:00
px4dev
3420e7b828
Fix param handling of 32-bit BSON nodes
2012-10-29 21:47:51 -07:00
px4dev
4c18aced36
BSON coder unit tests, fixes arising from test failures.
2012-10-29 21:47:51 -07:00
px4dev
3d750bc38c
Build fixes
2012-10-29 21:47:50 -07:00
px4dev
c522b5446d
Work in progress on to/from memory BSON coding.
2012-10-29 21:47:50 -07:00
px4dev
270a5d351f
Warning fixes.
2012-10-29 21:47:37 -07:00
px4dev
9a85801cb0
Doxyheader fixes
2012-10-29 18:01:31 -07:00
Doug Weibel
09ec869ae9
Merge branch 'master' of https://github.com/PX4/Firmware into FW_control
2012-10-29 18:24:47 -06:00
Thomas Gubler
9ad9d62f34
Corrected some bugs, thanks to Doug for spotting them
2012-10-29 23:09:07 +01:00
patacongo
5681b615ec
C++ constructors work with ELF load now
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5273 42af7a65-404d-4744-a932-0658087f49c3
2012-10-29 19:32:05 +00:00
Lorenz Meier
574eb96a2e
Calibration improvement
2012-10-29 16:41:53 +01:00
Lorenz Meier
c3c76ef3d5
Hardened the EEPROM attach routine for param storage
2012-10-29 09:44:59 +01:00
patacongo
71fad980c5
Finish implemention of ELF loader static constructor support. Still some issues.
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5272 42af7a65-404d-4744-a932-0658087f49c3
2012-10-29 00:52:23 +00:00
Thomas Gubler
db8d369c55
added a very simple altitude controller for testing
2012-10-28 19:44:30 +01:00
Thomas Gubler
b692c300d0
fw control: added Dougs horizontal navigation controller
2012-10-28 18:35:08 +01:00
Thomas Gubler
69e938aac3
moved elevator (-1) multipliction, ultimately this has to go into the mixer
2012-10-28 16:56:05 +01:00
Thomas Gubler
8fff4e19d6
roll compensation and default paramter values, pitch value has a sign error
2012-10-28 16:15:51 +01:00
Thomas Gubler
2f4cb6ca84
reverting my workaround in mavlink orb_listener so that the fix of Lorenz is active
2012-10-28 16:14:06 +01:00
Thomas Gubler
8d764170aa
Merge remote-tracking branch 'origin/master' into fw_control
2012-10-28 15:27:13 +01:00
Thomas Gubler
e5f56a1a8f
fw control: moved and renamed parameters, attitude: roll and pitch working
2012-10-28 15:26:49 +01:00
Lorenz Meier
1a70b2f4ed
Added missing event type
2012-10-28 15:04:51 +01:00
patacongo
0b6dd037e6
DNS fixes from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5268 42af7a65-404d-4744-a932-0658087f49c3
2012-10-28 13:20:36 +00:00
Thomas Gubler
62581fe55b
fw control: attitude, added pid elements
2012-10-28 11:54:02 +01:00
px4dev
98791bc674
Remove reboot() API, replace with a prototype for up_systemreset() which is portable.
2012-10-27 22:42:43 -07:00
px4dev
22b0add293
Turn off C++ constructor debug messages.
2012-10-27 21:51:18 -07:00
px4dev
f04c522f4f
Get us a bit closer to having c++ static constructors working.
2012-10-27 21:42:27 -07:00
px4dev
9184753f17
Remove an annoying message.
2012-10-27 11:38:14 -07:00
px4dev
0272fc49aa
Build fix due to missing include.
2012-10-27 11:37:11 -07:00
px4dev
6cec7f131e
Minor board.h changes.
2012-10-27 11:34:20 -07:00
patacongo
4f104b5e3d
Add port of cJSON from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5267 42af7a65-404d-4744-a932-0658087f49c3
2012-10-27 18:21:26 +00:00
Thomas Gubler
17772afdaa
fw control: fixed parameter reloading, disabled old fw control app
2012-10-27 19:43:03 +02:00
Thomas Gubler
56f4849e87
changed headers
2012-10-27 18:56:45 +02:00
Thomas Gubler
abcfe29c64
small temporary bugfix/workaround in mavlink uorb listener
2012-10-27 17:16:10 +02:00
px4dev
5135e5308b
Hoist the GPIO driver out and integrate it with the px4fmu driver. Move these pieces into the drivers tree.
2012-10-27 01:39:10 -07:00
patacongo
1f1319f25b
The ELF loader is basically functional (needs more testing)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5265 42af7a65-404d-4744-a932-0658087f49c3
2012-10-27 00:04:47 +00:00
patacongo
7bc6a69f46
ARM and ARMv7-M ELF support; STM32F4Discovery ELF loader test configuration
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5264 42af7a65-404d-4744-a932-0658087f49c3
2012-10-26 19:53:20 +00:00
Thomas Gubler
f321e7f419
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
2012-10-26 21:21:07 +02:00
Lorenz Meier
faa4033f7e
More compile fixes
2012-10-26 13:01:34 +02:00
Lorenz Meier
e5fd37f719
Build fix after cleanup
2012-10-26 12:48:00 +02:00
Lorenz Meier
67e4584407
Deleted old cruft
2012-10-26 12:45:07 +02:00
patacongo
7f2512627e
Rename elf.h to elf32.h; Additional ELF loader changes
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5263 42af7a65-404d-4744-a932-0658087f49c3
2012-10-26 02:42:39 +00:00
patacongo
a6e577e3c4
More ELF loader changes
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5261 42af7a65-404d-4744-a932-0658087f49c3
2012-10-25 22:10:56 +00:00
patacongo
92bbd36612
Add an example for testing the ELF loader
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5260 42af7a65-404d-4744-a932-0658087f49c3
2012-10-25 20:06:46 +00:00
Lorenz Meier
5f01688490
Fixed automatic log conversion / plotting script
2012-10-25 18:53:03 +02:00
Lorenz Meier
c71f2ea204
Proper attitude initialization, finite check on attitude outputs
2012-10-25 16:29:17 +02:00
Lorenz Meier
569938e680
Copying log analysis file directly to the SD card during logging
2012-10-25 15:47:14 +02:00
Lorenz Meier
8e4c45322e
Final GPS state, not nice, but working
2012-10-25 13:23:28 +02:00
Lorenz Meier
2b9cf08dc2
GPS tested and working
2012-10-25 13:07:26 +02:00
patacongo
8a2348d18d
Move binfmt.h, nxflat.h, elf.h, and symtab.h to include/nuttx/binfmt/
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5252 42af7a65-404d-4744-a932-0658087f49c3
2012-10-24 20:19:44 +00:00
Lorenz Meier
4d03d020af
Merge branch 'master' of github.com:PX4/Firmware into gps
2012-10-24 10:39:27 +02:00
px4dev
1065118ebc
Separate config from implementation for the STM32 pwm servo driver.
2012-10-24 00:55:37 -07:00
px4dev
2fc1032069
Major formatting/whitespace cleanup
2012-10-23 23:51:13 -07:00
px4dev
34f99c7dca
Hoist the ADC and CAN board-specific pieces.
2012-10-23 23:51:13 -07:00
px4dev
db044b64cd
Hoist the oard-specific USB pieces.
2012-10-23 23:51:13 -07:00
px4dev
7b4118a5e7
Hoist SPI functions.
2012-10-23 23:51:13 -07:00
px4dev
4c82f7a1af
Cleanup after moving the low-level PWM code.
2012-10-23 23:51:13 -07:00
px4dev
eaf91f05bd
Fix a filename
2012-10-23 23:51:13 -07:00
px4dev
3d79b9a0b0
Tease the PWM driver out and fix some build issues after cleaning up behind the cpuload pieces.
2012-10-23 23:51:13 -07:00
px4dev
c3fe915b44
Checkpoint - moving things out of the NuttX configs/*/src directories
2012-10-23 23:51:12 -07:00
patacongo
2327d0eedc
Fewer shell invocations in apps/Makefile
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5248 42af7a65-404d-4744-a932-0658087f49c3
2012-10-23 15:51:45 +00:00
Lorenz Meier
18c009d2c1
Better U-Blox struct packing
2012-10-23 13:16:17 +02:00
Lorenz Meier
d7d373f465
System state updates
2012-10-23 13:15:36 +02:00
Lorenz Meier
a24e50b931
Merge branch 'master' of github.com:PX4/Firmware
2012-10-23 10:59:01 +02:00
Lorenz Meier
f13c7821d9
Fixed mavlink app termination, terminates now cleanly
2012-10-23 10:58:47 +02:00
px4dev
0afeeb5dd8
Move the PX4IO driver into the drivers folder.
2012-10-22 21:39:55 -07:00
Lorenz Meier
3f240a70ba
mavlink cleanup, drop rate estimation is finally correct
2012-10-22 23:04:11 +02:00
Thomas Gubler
b9d03c7c27
[work in progess] some copy paste for pitch and yaw, but not enabled yet
2012-10-22 19:13:21 +02:00
Thomas Gubler
69185643c0
added parameters
2012-10-22 18:52:25 +02:00
Thomas Gubler
836c55e122
Merge branch 'master' into fw_control
2012-10-22 18:11:47 +02:00
Lorenz Meier
ea36154e39
Accomodating for offboard control setups
2012-10-22 16:08:48 +02:00
Lorenz Meier
64c5096c9f
Merged with fixed-wing stabilization work, multirotor control tested
2012-10-22 14:42:50 +02:00
Lorenz Meier
9e8a02b928
Switched to a more convenient audio tune
2012-10-22 13:58:13 +02:00
Lorenz Meier
3a26708203
Resolved wrong TX drop display
2012-10-22 13:28:53 +02:00
Lorenz Meier
3932bad137
Merge branch 'master' of github.com:PX4/Firmware into calibration
2012-10-22 12:14:40 +02:00
Lorenz Meier
a3f2114d54
Removed bogus time scalings
2012-10-22 11:25:26 +02:00
Lorenz Meier
df8148033a
Cleaned up calibration, added text messages ring buffer
2012-10-22 08:14:43 +02:00
px4dev
5b9c469770
Function type fix
2012-10-21 19:12:32 -07:00
px4dev
5925d146bc
Move the tone_alarm driver out of the NuttX configs area and add it as an stm32-specific driver in the PX4 apps space.
...
Add a new tone_alarm command that can be used to start/stop alarm tones from the shell.
2012-10-21 17:51:21 -07:00
Doug Weibel
1e0a34a102
Add functions for computation of the distance and bearing to the nearest point of a line segment or arc segment.
2012-10-21 16:39:53 -06:00
Doug Weibel
64ba024db2
Merge branch 'master' of https://github.com/PX4/Firmware
2012-10-21 14:27:36 -06:00
Thomas Gubler
ab447ac713
[work in progess]roll attitude and roll rate loop works
2012-10-21 21:36:29 +02:00
Thomas Gubler
5616f5c4b1
[work in progess] added pos control skeleton
2012-10-21 21:01:22 +02:00
Thomas Gubler
6c8fb8177e
Started implementing fw controller according to controller layout of the ASL lecture
2012-10-21 18:45:24 +02:00
Lorenz Meier
096bf2dc93
Checkpoint: Working, but non-verified full mag calibration
2012-10-21 15:36:29 +02:00
Lorenz Meier
28171fb596
Merge branch 'master' of github.com:PX4/Firmware into calibration
2012-10-21 11:24:51 +02:00
px4dev
73521cbc66
Fix stack allocation (now probably too large) for PX4IO debugging. Disable nonblocking serial comms to avoid losing tx data.
2012-10-20 23:11:04 -07:00
px4dev
bfbd17a2fa
Make it possible to run fmu and px4io simultaneously with full control over both sets of possible PWM outputs. First started wins.
2012-10-20 16:53:52 -07:00
Lorenz Meier
f868c99f06
Merge branch 'mavlink-cleanup' of github.com:PX4/Firmware into calibration
2012-10-21 01:52:00 +02:00
patacongo
4de5307aa3
Update documentation for recently added configuration options
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5241 42af7a65-404d-4744-a932-0658087f49c3
2012-10-20 21:42:19 +00:00
Lorenz Meier
42c61271ea
remove bogus dt from att rate
2012-10-20 19:53:49 +02:00
patacongo
f44266675e
Several bugfixes contributed by Petteri Aimonen
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
2012-10-20 16:07:49 +00:00
patacongo
736ac8982a
Add MAX11802 touchscreeen driver from Petteri Aimonen
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5237 42af7a65-404d-4744-a932-0658087f49c3
2012-10-20 15:17:19 +00:00
patacongo
dbdf7cb3ae
Ping/DNS fixes (part 2 of 2)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5236 42af7a65-404d-4744-a932-0658087f49c3
2012-10-20 14:15:59 +00:00
patacongo
78ba846c06
DNS fixes from Darcy Gong (part 1 of 2)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5235 42af7a65-404d-4744-a932-0658087f49c3
2012-10-20 13:47:30 +00:00
px4dev
d2ef2afb0b
Major rework of the PX4IO driver; pull it closer up to date
2012-10-19 22:10:12 -07:00
px4dev
f12b9d0706
Fix an error message
2012-10-19 22:09:56 -07:00
px4dev
4f20d9a24b
Retire old test cases for drivers that have been removed.
2012-10-19 18:59:44 -07:00
Lorenz Meier
d3ae83cb22
Merge branch 'daregger_rate_control' of github.com:PX4/Firmware into calibration
2012-10-19 00:39:06 +02:00
Lorenz Meier
5ec5754f26
brought controller back to last tuned state
2012-10-18 17:34:06 +02:00
Lorenz Meier
c70c626915
Removed dead code
2012-10-18 13:40:17 +02:00
Lorenz Meier
dff0051568
Map inputs to the controller we actually want
2012-10-17 19:02:57 +02:00
Lorenz Meier
d1429f266d
Calibration progress, needs sphere fitting
2012-10-17 18:27:49 +02:00
Lorenz Meier
6a48b91bea
Lowering default rates at 57600
2012-10-17 18:27:21 +02:00
Lorenz Meier
2d631fb005
Various fixes to attitude control, flyable, needs parameter tuning
2012-10-17 18:26:56 +02:00
Lorenz Meier
e4645c0a41
Initialized all sensor fields to zero
2012-10-17 15:10:32 +02:00
Lorenz Meier
d4e6a9d7a1
Minor code style fixes, removed dead code
2012-10-17 15:10:04 +02:00
Lorenz Meier
8b000b3317
Fixed an abort condition, fixed value initialization, implemented naive three-step calibration
2012-10-17 15:09:28 +02:00
Lorenz Meier
23d294453b
Fixed a range of initialization issues in filter, does not any more emit NaN in first iteration
2012-10-17 15:08:33 +02:00
Lorenz Meier
5d3d17d025
Increased priority of MAVLink receiver thread
2012-10-17 10:38:23 +02:00
Lorenz Meier
97726fa679
Calibration WIP, not compiling
2012-10-17 08:02:50 +02:00
daregger
32e586d4b7
Controller and estimator updates
2012-10-16 18:02:28 +02:00
daregger
b50bc7798a
Wip on inner rate loop
2012-10-16 16:49:45 +02:00
Lorenz Meier
0b26ca84d4
Merged
2012-10-16 11:13:05 +02:00
Lorenz Meier
fef4362e79
Merged new EKF version
2012-10-16 11:10:09 +02:00
Lorenz Meier
a720bfff5e
Merge branch 'tobi'
2012-10-16 11:07:41 +02:00
Lorenz Meier
3ccc6849ac
Fixed stupid typo in GPS app
2012-10-16 00:12:48 +02:00
Lorenz Meier
965bd35e2b
Ignore measurement parts not projected to the plane
2012-10-16 00:02:53 +02:00
Lorenz Meier
40abed787c
fixed wrong status indication of sd log command if startup fails
2012-10-15 23:58:16 +02:00
Lorenz Meier
e8c4506a12
Minor documentation style fixes
2012-10-15 08:59:15 +02:00
Lorenz Meier
084cde72f7
Reworked calibration
2012-10-15 08:52:41 +02:00
Lorenz Meier
642f3426a7
Added mag calibration routine, fixed minor typos without runtime effects
2012-10-15 08:52:17 +02:00
Lorenz Meier
6e4398c30d
Merge branch 'master' of github.com:PX4/Firmware into mavlink-cleanup
2012-10-15 08:35:44 +02:00
px4dev
c1958bdaa9
Teach top how to precisely determine stack usage.
2012-10-14 23:35:32 -07:00
px4dev
ae29617543
No joy with getopt_long
2012-10-14 23:09:48 -07:00
px4dev
cf6e763c58
Beat up on the mavlink app startup a bit.
2012-10-14 22:40:18 -07:00
px4dev
7c20e66681
Refactor and start tidying up the MAVLink app.
2012-10-14 17:59:15 -07:00
px4dev
db0ec8eb02
Merge branch 'master' of https://github.com/PX4/Firmware
2012-10-13 22:09:16 -07:00
Doug Weibel
0a0215338a
Merge branch 'master' of https://github.com/PX4/Firmware
2012-10-13 16:38:18 -06:00
patacongo
8345d911e0
Add a THTTPD configuration for the Shenzhou board (Darcy Gong)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5233 42af7a65-404d-4744-a932-0658087f49c3
2012-10-13 15:12:44 +00:00
patacongo
a03e58b7ac
ADC support for the Shenzhou board from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5232 42af7a65-404d-4744-a932-0658087f49c3
2012-10-13 13:19:56 +00:00
Lorenz Meier
4dbf7befe3
Disable rate control, disable offset estimation
2012-10-13 12:25:30 +02:00
px4dev
0ccaa1330b
Merge branch 'master' of file:///Users/Shared/NuttX
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
2012-10-13 00:08:02 -07:00
patacongo
e4ccbe7508
You can now configure a login for Telnet NSH session -- from Darcy Gong
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
2012-10-12 16:59:17 +00:00
px4dev
d62ec78ab8
Remove obsolete warning.
2012-10-11 00:23:13 -07:00
Lorenz Meier
7ccc4f6096
Merge branch 'master' of https://github.com/tnaegeli/Firmware into tobi
2012-10-10 17:47:44 +02:00
Lorenz Meier
87ce36eef3
Fixed logging, merged
2012-10-10 17:47:28 +02:00
tnaegeli
ec018e7b64
Merge branch 'master' of https://github.com/PX4/Firmware
...
Conflicts:
apps/commander/state_machine_helper.c
apps/multirotor_att_control/multirotor_att_control_main.c
apps/multirotor_att_control/multirotor_rate_control.c
solved
2012-10-10 09:52:37 +02:00
px4dev
1e59a592a6
Split the parameter load/save commands out of the 'eeprom' command, since that's not really the obvious place for them. Add parameter printing functionality (though, it's a mess due to %f being busted)
...
Update the script examples to use the new command.
2012-10-09 22:45:36 -07:00
tnaegeli
613e12fcac
working offboard
2012-10-09 16:31:04 +02:00
Lorenz Meier
bd3f3b1031
Sensor rate and throttle inversion fixes
2012-10-09 16:26:29 +02:00
px4dev
a2ab5e8691
Don't treat end-of-document-structure as an error.
2012-10-08 22:37:18 -07:00
Doug Weibel
77e6375920
Change parameter names in FW control to fit within MAVLink parameter name size limit
2012-10-08 14:14:43 -06:00
Lorenz Meier
0edd4063af
Merge branch 'master' of github.com:PX4/Firmware into tobi
2012-10-08 18:00:00 +02:00
Lorenz Meier
dd50c88f07
Fixed GPS lost issue, fixed accel scale initialization, fixed code style in rate controller
2012-10-08 17:59:43 +02:00
Doug Weibel
4fea0a3fc1
This commit changes the inner loop control structures for fixed wing attitude control. Nested rate and angle loops are used with limits on both the rate setpoint
...
A simple outer navigation loop is retained for navigation control. This will be replaced later. The pitch set point is hard coded to zero. Pitch stabilization should work.
This commit compiles, but needs further testing.
2012-10-07 14:50:07 -06:00
Doug Weibel
2bb1d17c7e
Changes to the PID controller. Adds "limit" to the parameter set. Implements an output limit where the output magnitude is limited by the parameter value "limit". Also changes the integrator saturation such that the integrator is not updated (added to) if either updating it will cause the integrator values magnitude to exceed "intmax" or if the output magnitude would exceed "limit" with an updated integrator value.
...
Arbitrary large limit values were hard coded into multirotor_attitude_control.c. These should be changed to parametric values or something sensible.
This commit will temporarily break fixedwing_control.c. A following commit will repair it along with significant changes to the inner loop control.
This commit has been tested to compile with fixedwing_control.c temporarily removed. No other testing has been completed.
2012-10-07 14:46:26 -06:00
px4dev
4c14e4f5f1
Add a 'secret' subcommand to bl_update that manipulates the option bits to change the brown-out detector configuration.
...
This is an experiment to see if we can improve the boot-time behavior when powered off noisy supplies.
2012-10-06 16:08:07 -07:00