659543f852
Merge pull request #96 from sjwilks/autostart-scripts
...
Updated PX4IO autostart script.
2013-01-06 04:19:22 -08:00
ac784dc638
Merge branch 'master' into fixedwing
2013-01-06 12:41:19 +01:00
ec3d298720
Fixed minor compile error
2013-01-06 12:40:29 +01:00
2bd4301849
Merge branch 'master' of github.com:PX4/Firmware into fixedwing
2013-01-06 12:37:13 +01:00
c94076f673
Added missing ADC start command, fixed return value / error behavior of ADC init
2013-01-06 12:36:46 +01:00
f788d452ea
Merged
2013-01-06 11:47:30 +01:00
4462a25ce9
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing
2013-01-06 11:45:06 +01:00
309980cd4d
Merge pull request #130 from PX4/px4io-adc-integration-battery-msg
...
Enables the PX4IO ADC (from px4io-adc-integration branch)
2013-01-06 02:40:41 -08:00
34d078b556
Merged latest master
2013-01-06 11:32:08 +01:00
359989a2eb
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc
2013-01-06 11:25:24 +01:00
d3fd3d8219
Merged, compiling
2013-01-06 11:25:17 +01:00
58309fd6a8
Merge branch 'master' of https://github.com/PX4/Firmware
2013-01-06 02:02:14 -08:00
6ae9f03544
Merge commit '375d3c14d742248b434c080527886a95ea1d563f'
2013-01-06 02:01:53 -08:00
5cc76018ff
Merge commit '920608bf3671662f94b4939ffdaf6fde2b08edff'
2013-01-06 02:01:41 -08:00
0a4ef92b75
Merge commit '890b1ac0689984cb6bc4638cc2aa8ec869d14f91'
2013-01-06 01:55:37 -08:00
a03396e3f3
Merge commit '0fff8aa23b477bebda9c1a79f5cd0b5eceeb95d1'
2013-01-06 01:55:21 -08:00
18385c2d97
Merge commit '63464a8959d90bd92c4998a80992c416b85c2057'
2013-01-06 01:55:00 -08:00
0ef1d6d752
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing
2013-01-06 10:53:23 +01:00
532c694ec3
Merge pull request #122 from PX4/sbus_rcloss_fix
...
Fixed connection loss / failsafe detection, added decoding of two switches
2013-01-06 01:53:14 -08:00
7922f56f4b
Merge branch 'sbus_rcloss_fix' of github.com:PX4/Firmware into fixedwing_io_mixing
2013-01-06 10:52:17 +01:00
329ac2f4ba
Merged master
2013-01-06 10:50:41 +01:00
e2317edde8
Code style fix
2013-01-06 10:45:19 +01:00
1b2e886878
Removed unwanted cast
2013-01-06 10:24:00 +01:00
f89cd312ec
Used correct datatype, removed unwanted cast
2013-01-06 10:16:50 +01:00
a9e87c791d
Fixed header for sbus input
2013-01-06 10:13:53 +01:00
3c85f8267f
merged relay changes from master
2013-01-06 09:51:38 +01:00
94fa60fa04
Merge pull request #132 from PX4/#111-px4io-integrated-mixing
...
#111 px4io integrated mixing
2013-01-06 00:40:45 -08:00
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
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
76277ec622
Ignore more.
2013-01-05 22:37:26 -08:00
7842caf3b2
Moved the channel mappings and attributes to the config section
2013-01-06 04:21:04 +01:00
ad7637861d
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing
2013-01-06 01:32:55 +01:00
83039e76d3
Reverted unwanted S.Bus changes
2013-01-06 01:32:39 +01:00
ab85d201ee
Merge branch 'text_startscripts' into fixedwing_io_mixing
2013-01-06 01:01:44 +01:00
d593820bf5
Allow text files (rc.txt) in addition to rc files. We will get a very huge load of complaints and big trouble from the regular user base else.
2013-01-06 01:01:25 +01:00
aaa9af2293
Reverting EKF change, as it did not really help.
2013-01-06 00:58:35 +01:00
8eb8909a3c
Merge branch 'master' of github.com:PX4/Firmware into px4io-adc-integration-battery-msg
2013-01-06 00:50:51 +01:00
0a89ab7075
Send rc channel ordering and channel attributes from FMU to IO
2013-01-05 22:13:12 +01:00
375d3c14d7
increase the UART buffer sizes to 256
...
The most critical one is the GPS serial port receive buffer size,
which needs to be at least 128 to support the UBLOX protocol, but it
seems a good idea for people running a FMU without a IO board to
increase the UART buffer sizes generally
2013-01-06 06:33:44 +11:00
318609bf59
fixed PWM_SERVO_GET
...
this was using the wrong channel
2013-01-06 06:31:37 +11:00
0134186420
fixup rate
2013-01-06 06:31:00 +11:00
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
362d3bb5d2
Extend tools/configure.c for better compatibility with configure.sh
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5481 42af7a65-404d-4744-a932-0658087f49c3
2013-01-05 16:07:37 +00:00
3e91a8a290
Clean up a few tools/ build issues
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5480 42af7a65-404d-4744-a932-0658087f49c3
2013-01-05 14:57:43 +00:00
1b81724ef7
Manually remap the channel assignements for testing.
2013-01-05 15:46:26 +01:00
470c2e71df
Correct some errors in the LPC17xx SYSCON register bit definitions (from Rommel Marcello)
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5479 42af7a65-404d-4744-a932-0658087f49c3
2013-01-05 13:19:53 +00:00
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
91ca80e634
Fix the handling of FIONREAD/FIONWRITE; thanks Tridge.
2013-01-04 21:28:26 -08:00
5c572a3cb5
Add tools/configure.c and configure.bat
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5478 42af7a65-404d-4744-a932-0658087f49c3
2013-01-04 21:37:31 +00:00
920608bf36
added vdprintf() library function
2013-01-05 07:58:50 +11:00
sjwilks