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

1752 Commits

Author SHA1 Message Date
px4dev 2686344d58 Adjust the default deadzone for RC inputs per feedback. 2013-01-15 00:40:15 -08:00
px4dev 8da9a2c149 Merge branch 'master' into px4io-i2c 2013-01-14 21:20:17 -08:00
px4dev 854c6436b4 Pull NuttX up to the 6.24 release. 
Merge branch 'nuttx-merge-5447'
 2013-01-14 21:01:58 -08:00
James Goppert 5b0aa490d6 Added P0. Hid some printing. Corrected fault detection. 2013-01-14 18:38:32 -05:00
James Goppert 02a905df4c Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection 2013-01-14 18:13:07 -05:00
Lorenz Meier 35f0f570a6 Hotfix for current active waypoint ID 2013-01-14 23:48:07 +01:00
James Goppert 4613d1247d Added param comments for FWB controller. 2013-01-14 17:15:43 -05:00
Marco Bauer f0edb59d7e some major changes 2013-01-14 21:58:42 +01:00
patacongo cc3614dfe8 Finish dup logic for open files; fix bug in sigtimedwait(), would return wrong signo value if the signal was already pending 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5517 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 19:22:32 +00:00
James Goppert c49320a03e Working on fault detection tolerances. 2013-01-14 13:49:30 -05:00
James Goppert a13cf90e0a Increased KF process noise. 2013-01-14 13:12:01 -05:00
px4dev c38ad4ded5 Fix the 'time' test, now that rand() seems to be working. 2013-01-14 10:08:47 -08:00
Julian Oes 8bc2338466 Adapted upper and lower values for test jig voltages 2013-01-14 09:18:17 -08:00
jgoppert 940d43cb9c Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection 2013-01-14 11:58:21 -05:00
patacongo 930f9a1351 Add support for dup2'ing files. Infrastructure and ROMFS done. Still need FAT, BINFS, NXFFS, and NFS 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5516 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 15:42:03 +00:00
px4dev 5c60ed9a94 Fix up FMU input timeout handling. 
Fix the FMU auto OK LED status.
Strip out unused fields from the system state structure.
 2013-01-14 01:11:29 -08:00
px4dev 06b66ad065 Don't advertise things we don't have anymore. 2013-01-14 01:09:42 -08:00
px4dev 2dc47160f4 Factoring and comments. 2013-01-14 00:30:18 -08:00
px4dev 2311e03379 Start reworking the px4io driver to use the I2C interface instead. 2013-01-14 00:19:01 -08:00
px4dev 6e291ddedc Add a mechanism for sending multi-part messages to the I2C driver base class. 2013-01-14 00:18:05 -08:00
jgoppert f2d2aafb8d Fault detection working, but GPS velocity measurement causing fault. 
Possible error in HIL script or progpagation/ F matrix of EKF.
 2013-01-14 01:32:34 -05:00
jgoppert 3db216380b Changing measurement units for gps, not working well yet. 2013-01-14 01:09:02 -05:00
px4dev 4e38615595 Major workover of the PX4IO firmware for I2C operation. 2013-01-13 19:05:01 -08:00
px4dev 8ebe21b27b Checkpoint - I2C protocol register decode 2013-01-13 19:05:01 -08:00
px4dev b0fb86a693 Sketch out the protocol as it will be on top of I2C 2013-01-13 19:05:01 -08:00
px4dev 1cecba2a86 Turn off i2c slave debug output for real. 2013-01-13 19:05:01 -08:00
px4dev 5e35491a38 We can't have DMA on both I2C1 and USART2. Since we need it more for I2C, and since USART2 is going back to being ignored once I2C works, let's make the call. 
Turn off the debug output on I2C for now.
 2013-01-13 19:05:01 -08:00
px4dev 329f595bca Don't try to set up serial polling before the HRT has been started. 2013-01-13 19:05:00 -08:00
px4dev 469d13fdfe Implement serial receive DMA for the F1xx. This is not quite working right yet. Some clients work, others not so much. 2013-01-13 19:05:00 -08:00
px4dev 97136375e3 Turn off the I2C register dump at startup. 2013-01-13 19:05:00 -08:00
px4dev 4f285f7c80 Configure the DMA channels in circular mode so that we don't have to deal with the case where DMA stops but the master is still talking. 
Use AF as well as STOPF to decide when transfer has ended. We don't seem to get STOPF when we are transmitting.
 2013-01-13 19:05:00 -08:00
px4dev 3cea0959b7 Implement a simple byte loopback server on I2C for more testing. 2013-01-13 19:05:00 -08:00
px4dev 2fb820fabd I2C slave RX DMA works. 2013-01-13 19:05:00 -08:00
px4dev 0dab53ae26 Implement I2C slave DMA. Not working yet. 2013-01-13 19:05:00 -08:00
px4dev f12fa7ee06 Don't do retries, since it just complicates things. 2013-01-13 19:04:59 -08:00
px4dev 7c2445f74d Don't waste time printing when we have errors - that causes the master to time out 2013-01-13 19:04:59 -08:00
px4dev 811790a14f Checkpoint I2C slave work on IO 2013-01-13 19:04:59 -08:00
James Goppert 5745cfae38 Tracking down gps ekf bug, not enough precision for GPS in rad. 2013-01-13 21:12:24 -05:00
px4dev 9faf348cf5 Merge pull request #156 from jgoppert/sensor_hil_rebase 
Rebase of changes to sensor_hil_fixedwing branch.
 2013-01-13 17:55:15 -08:00
James Goppert 63e6ea1b95 Changed fault tolerances. 2013-01-13 19:51:40 -05:00
James Goppert 0ccdbd78f6 More formatting. 2013-01-13 19:23:59 -05:00
James Goppert e02791ee8e Added assertion, fixed formatting. 2013-01-13 19:21:40 -05:00
James Goppert 69f6fe51bc More fixes. 2013-01-13 19:08:27 -05:00
James Goppert e3d0e0216b Fixed comment. 2013-01-13 19:05:58 -05:00
Lorenz Meier 5ad8e645f4 Removed last bogus references to battery voltage from sensor combined topic 2013-01-14 00:42:20 +01:00
James Goppert f7c31e4d80 Reduced stack size for mavlink receiver. 2013-01-13 18:41:03 -05:00
James Goppert 56e15ab1f4 Working on comments. 2013-01-13 18:38:09 -05:00
James Goppert ea3ce8de85 Reboot fix. 2013-01-13 18:22:35 -05:00
James Goppert 6d8983e908 Fixed HIL state machine issue with reboot. 2013-01-13 17:43:30 -05:00
James Goppert a40f41d216 Change default vehicle type to fixedwing. 2013-01-13 17:35:56 -05:00
James Goppert 464c5245f2 Rebase of changes to sensor_hil_fixedwing branch. 2013-01-13 17:25:45 -05:00
Lorenz Meier 0fdf962356 Merge pull request #150 from PX4/app-auto-deps 
Use the compiler to generate app dependencies
 2013-01-13 13:54:47 -08:00
px4dev ff146cc5b1 Merge pull request #148 from PX4/adc_integration 
Selected adjustments / fixes to make old apps compatible with new-style ADC
 2013-01-13 13:43:45 -08:00
Lorenz Meier 9ac2684ca0 Printing error reason in warning 2013-01-13 22:42:12 +01:00
px4dev 58ea9fbf01 Merge pull request #154 from PX4/file_test_fix 
Fixed #153 - when no microSD card is present, test used to hang, now abo...
 2013-01-13 11:16:03 -08:00
patacongo b3f3dd123c Use SIGCHLD with waitpid(); implemented wait() and waitid() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5515 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 18:53:00 +00:00
Marco Bauer 825012b029 switched to initialiser list and member variables 2013-01-13 18:04:07 +01:00
Marco Bauer edc3ae7b6c some changes in structure 2013-01-13 13:50:07 +01:00
Lorenz Meier ca690f6027 Fixed #153 - when no microSD card is present, test used to hang, now aborts with error. 2013-01-13 09:35:56 +01:00
Lorenz Meier a6a6d9c457 Merge branch 'master' of github.com:PX4/Firmware into adc_integration 2013-01-13 09:25:12 +01:00
Lorenz Meier 054bb69cc7 Showing correct test count also in success case 2013-01-13 09:24:51 +01:00
patacongo ffda55b34a Cosmetic cleanup from SIGCHLD changes 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5514 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 00:35:47 +00:00
Lorenz Meier acbfd66e67 Cleaned up tests further, in anticipation of merges with other branches 2013-01-12 23:26:26 +01:00
Lorenz Meier 15b61d4c15 Improved battery voltage init, removed bogus printf() from debugging 2013-01-12 22:41:32 +01:00
Marco Bauer 8ec566d0cb fix number of satellites 2013-01-12 21:54:39 +01:00
px4dev dba244a8d4 Fix a build breaker, remove C*HDRS as they aren't used. 2013-01-12 12:46:46 -08:00
px4dev 1c63eda98b Objects depend on the makefile chain as well. 2013-01-12 12:39:29 -08:00
px4dev 5b07efdbeb Automatically generate depdencies for source files as they are compiled, rather than using the NuttX dependency generator tool. 2013-01-12 12:10:06 -08:00
px4dev 6d301710d9 Suppress warnings from ARM's DSP_Lib code that are spamming developers to no benefit. 
Addresses #149
 2013-01-12 12:08:03 -08:00
patacongo b58281cab8 Fix a *critical* bug in the task exit logic. Implements SIGCHILD 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5513 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-12 19:58:45 +00:00
Marco Bauer 41cef1d6c5 merged systemstate into blinkm driver 2013-01-12 10:26:37 +01:00
Lorenz Meier 6c1b00e22f Counting the number of tests correctly 2013-01-12 00:53:45 +01:00
Lorenz Meier dad7f9f436 Selected adjustments / fixes to make old apps compatible with new-style ADC driver 2013-01-12 00:38:49 +01:00
patacongo 43e22b2b98 Fix an error handling bug in the fread logic 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5511 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 19:08:51 +00:00
Lorenz Meier 419896f983 WP fix contributed by James Goppert 2013-01-11 18:02:47 +01:00
patacongo e7a5090e55 Various changes while debugging posix_spawn 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5510 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 16:53:44 +00:00
Simon Wilks 64925c33cd Merged 2013-01-11 16:52:42 +01:00
px4dev 2b37f33a22 The tests structure doesn't need to be writable. 2013-01-11 02:39:56 -08:00
px4dev 0267782782 Recover changes lost to bad merging. 2013-01-11 02:32:05 -08:00
px4dev ca305933a1 Merge commit 'eaf1d8063cc707b1041e8583663d9edd45f42c5d' into nuttx-merge-5447 
Build system updates to sync with NuttX upstream.
 2013-01-11 00:45:25 -08:00
px4dev ccf9882dc5 Merge branch 'master' into nuttx-merge-5447 2013-01-11 00:39:22 -08:00
Lorenz Meier 31ca806958 More print cleanups in commander app 2013-01-11 08:24:28 +01:00
Lorenz Meier 9608dfefa3 Stripped a lot of text from commander app 2013-01-11 08:18:12 +01:00
Lorenz Meier b52402dbe2 Fixed code style for mavlink app 2013-01-11 07:48:09 +01:00
Lorenz Meier fdf1c712b1 Fixed code style for conversions 2013-01-11 07:47:22 +01:00
Lorenz Meier 970ae0c13e Fixed code style for attitude estimator 2013-01-11 07:46:40 +01:00
Lorenz Meier cded2787f0 Fixed code style for multirotor_att_control app 2013-01-11 07:45:24 +01:00
Lorenz Meier cf563eda86 px4io code style 2013-01-11 07:44:17 +01:00
Lorenz Meier dc100f2020 Fixedwing controller code style 2013-01-11 07:44:03 +01:00
Lorenz Meier 9ab20b11b6 Code style 2013-01-11 07:42:09 +01:00
Lorenz Meier d6116d9564 Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-11 07:36:44 +01:00
Lorenz Meier 65c8028629 Working on override channel mapping, allowed trim cal only with RC on 2013-01-11 07:35:40 +01:00
Julian Oes b5eccef69e Started with px4io stop implementation 2013-01-10 15:49:53 -08:00
Julian Oes 5e20dd1736 Added support for IO bootloader revision 3 on FMU 2013-01-10 15:35:47 -08:00
patacongo 7609c9a192 Fix problem with initialization of file actions 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5508 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 23:06:23 +00:00
patacongo f011bd7ef6 Added a test of posix_spawn() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5507 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 21:39:57 +00:00
patacongo 6f241ed044 Add interfaces to dynamically change symbol tables used by posix_spawn, execv, and execl. This is needed for testing. 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5506 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 20:00:08 +00:00
Lorenz Meier 1d4feb6905 Merged sdlog_buffering branch 2013-01-10 14:43:59 +01:00
Lorenz Meier 1a107bd7bf Added warning, needs more work on the rotation matrix output 2013-01-09 16:56:23 +01:00
Lorenz Meier 447bcb990d Merge branch 'fixedwing' of github.com:PX4/Firmware into fixedwing 2013-01-09 16:52:45 +01:00
Lorenz Meier 4435befefd Added offset parameters for roll, pitch and yaw 2013-01-09 16:52:15 +01:00
Lorenz Meier 955ae0aa45 Merged 2013-01-09 16:40:09 +01:00
Lorenz Meier 16e49c447d Added support for battery voltage and differential pressure to logging and plot script 2013-01-09 16:37:45 +01:00
Lorenz Meier e1a6f1b910 Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-09 16:26:12 +01:00
Lorenz Meier d957f8e004 Hotfix: Copying from right actuator topic on IO if FMU and IO PWM outs are enabled 2013-01-09 13:11:06 +01:00
Lorenz Meier 6c93cbfa5e Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-09 09:41:52 +01:00
Lorenz Meier 6f8081b5ea Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-09 09:41:07 +01:00
Lorenz Meier 3bb145f584 Enabled and tested ring buffer, logging at full 250 Hz sensor rate 2013-01-09 09:39:51 +01:00
px4dev b5424a4d02 Fix the CMSIS DSP_Lib include path specification. This avoids some scary messages from 'make depend'. 2013-01-08 14:40:20 -08:00
Lorenz Meier b48f99b601 Updated state switching to most recent state machine rev 2013-01-08 22:22:22 +01:00
Lorenz Meier 780087acf0 Merged with master 2013-01-08 21:25:38 +01:00
unknown 1998ce1205 Battery-Warn-State added to struct Vehicle_Status 2013-01-08 20:37:47 +01:00
Lorenz Meier b78a430424 Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-08 17:41:33 +01:00
Lorenz Meier 8cc9fb9e2c Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-08 17:40:44 +01:00
px4dev 01ea8eb54f Test for CortexM4 and FPU rather than the ARM mathlib-internal define. 2013-01-08 08:26:04 -08:00
px4dev ee5cd2c95a Rather than assume that px4fmu means CMSIS DSPlib, test for cortex M4 and FPU. 2013-01-08 08:25:06 -08:00
Lorenz Meier 435bae6542 Added logging with worker thread for microSD writes, untested, but feature-complete 2013-01-08 14:57:12 +01:00
patacongo 3d160e45b6 Documentation update 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5491 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 00:04:12 +00:00
patacongo a9f2c6fa8a Fixed ARM vfork; re-enabled vfork OS test 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5490 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:50:25 +00:00
patacongo 5a9162f017 Disable the vfork() OS test... it fails 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5489 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:09:09 +00:00
Lorenz Meier 2169e1f808 Merge branch 'master' of github.com:PX4/Firmware into mathlib 2013-01-08 00:02:57 +01:00
patacongo 66cdd288ab Add ostest vfork test (does not work yet) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5488 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 21:41:20 +00:00
Lorenz Meier fe5f9d46d5 Merge branch 'master' into fixedwing 2013-01-07 22:23:41 +01:00
Lorenz Meier e24dd0f684 Fixed minor compile error 2013-01-07 22:23:24 +01:00
Lorenz Meier 41f657e3e5 Merged with master 2013-01-07 17:50:49 +01:00
Lorenz Meier 451b38b39f Removed commented-out lines (EXP support) 2013-01-07 17:39:18 +01:00
px4dev 91dba46524 Fix fallout from removing the spurious CMSIS 2013-01-06 19:20:22 -08:00
px4dev e88a981093 Merge commit '23e8d0b4675e1101a5dd38fa48f96ec3c13ca68b' into local/mathlib 
Fix the controllib test_params build.
 2013-01-06 15:23:12 -08:00
px4dev faced6bfe3 Merge James's controllib bits into a separate library module. 
Add a top-level mathlib header to avoid having to dig around for specific headers.
 2013-01-06 15:04:30 -08:00
px4dev 950d104c8d Merge commit '8888b73e160520e5b15e168998013f4a5f6e64c0' into local/mathlib 2013-01-06 13:58:52 -08:00
px4dev 43ccb257a8 Move the math library pieces out of systemlib into mathlib 2013-01-06 13:56:49 -08:00
jgoppert 23e8d0b467 Added kalman_demo. This is an attitude/position EKF example. 2013-01-06 16:05:06 -05:00
px4dev 98a53e85d6 Merge commit 'd9491b20cc5fc8b683eb0f60a50da6b322b55e57' into local/mathlib 2013-01-06 12:57:33 -08:00
px4dev 95aa959571 Merge commit '4f3b17f53b120cd54112097f4217a90863013c1f' into local/mathlib 2013-01-06 12:57:28 -08:00
px4dev e0cf9f943a Merge commit 'db3fabc3baccdeef3108544b4e9da9c8f0895a58' into local/mathlib 2013-01-06 12:57:22 -08:00
px4dev 4447282260 Integrate the interesting parts of the CMSIS 3.01 (r3p1) DSP library 2013-01-06 12:52:05 -08:00
jgoppert 84d7f19d7d Added control library to build. 2013-01-06 15:47:07 -05:00
jgoppert 8888b73e16 Added control library. 2013-01-06 15:41:23 -05:00
jgoppert d9491b20cc Reformat of math library with astyle. 2013-01-06 15:33:55 -05:00
jgoppert 4f3b17f53b Added math library to build. 2013-01-06 14:20:24 -05:00
jgoppert db3fabc3ba Added math library. 2013-01-06 14:08:50 -05:00
patacongo 0d86268de6 Remove CONFIG_BUILTIN_APPS_START 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5482 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-06 17:00:08 +00:00
Lorenz Meier 0945a2cc2f Fixed RC mapping transmission, tested. Fixed RC scaling in manual mode 2013-01-06 14:43:37 +01:00
Lorenz Meier ef2efabbd4 Removed unlimited printing status message 2013-01-06 14:43:10 +01:00
Lorenz Meier ac784dc638 Merge branch 'master' into fixedwing 2013-01-06 12:41:19 +01:00
Lorenz Meier ec3d298720 Fixed minor compile error 2013-01-06 12:40:29 +01:00
Lorenz Meier 2bd4301849 Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-06 12:37:13 +01:00
Lorenz Meier c94076f673 Added missing ADC start command, fixed return value / error behavior of ADC init 2013-01-06 12:36:46 +01:00
Lorenz Meier f788d452ea Merged 2013-01-06 11:47:30 +01:00
Lorenz Meier 34d078b556 Merged latest master 2013-01-06 11:32:08 +01:00
Lorenz Meier 359989a2eb Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc 2013-01-06 11:25:24 +01:00
Lorenz Meier d3fd3d8219 Merged, compiling 2013-01-06 11:25:17 +01:00
px4dev 58309fd6a8 Merge branch 'master' of https://github.com/PX4/Firmware 2013-01-06 02:02:14 -08:00
px4dev 6ae9f03544 Merge commit '375d3c14d742248b434c080527886a95ea1d563f' 2013-01-06 02:01:53 -08:00
px4dev 5cc76018ff Merge commit '920608bf3671662f94b4939ffdaf6fde2b08edff' 2013-01-06 02:01:41 -08:00
px4dev a03396e3f3 Merge commit '0fff8aa23b477bebda9c1a79f5cd0b5eceeb95d1' 2013-01-06 01:55:21 -08:00
px4dev 18385c2d97 Merge commit '63464a8959d90bd92c4998a80992c416b85c2057' 2013-01-06 01:55:00 -08:00
Lorenz Meier 329ac2f4ba Merged master 2013-01-06 10:50:41 +01:00
Lorenz Meier e2317edde8 Code style fix 2013-01-06 10:45:19 +01:00
Lorenz Meier 1b2e886878 Removed unwanted cast 2013-01-06 10:24:00 +01:00
Lorenz Meier f89cd312ec Used correct datatype, removed unwanted cast 2013-01-06 10:16:50 +01:00
Lorenz Meier a9e87c791d Fixed header for sbus input 2013-01-06 10:13:53 +01:00
Lorenz Meier 3c85f8267f merged relay changes from master 2013-01-06 09:51:38 +01:00
px4dev 9df2aaf312 Merge branch 'master' into #111-px4io-integrated-mixing 
Fix a botched merge for #106 at the same time.
 2013-01-06 00:40:17 -08:00
px4dev b3e16b4861 Merge pull request #123 from PX4/#106-px4io-relays 
Initial implementation of application access to the PX4IO relays.
 2013-01-06 00:32:04 -08:00
Simon Wilks 7842caf3b2 Moved the channel mappings and attributes to the config section 2013-01-06 04:21:04 +01:00
Lorenz Meier ad7637861d Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing 2013-01-06 01:32:55 +01:00
Lorenz Meier 83039e76d3 Reverted unwanted S.Bus changes 2013-01-06 01:32:39 +01:00
Lorenz Meier aaa9af2293 Reverting EKF change, as it did not really help. 2013-01-06 00:58:35 +01:00
Lorenz Meier 8eb8909a3c Merge branch 'master' of github.com:PX4/Firmware into px4io-adc-integration-battery-msg 2013-01-06 00:50:51 +01:00
Simon Wilks 0a89ab7075 Send rc channel ordering and channel attributes from FMU to IO 2013-01-05 22:13:12 +01:00
Andrew Tridgell 318609bf59 fixed PWM_SERVO_GET 
this was using the wrong channel
 2013-01-06 06:31:37 +11:00
Andrew Tridgell 0134186420 fixup rate 2013-01-06 06:31:00 +11:00
Andrew Tridgell 219ab05a70 added PWM_SERVO_SET_UPDATE_RATE ioctl 
this allows apps to set the PWM update rate. APM needs this to honor
the user configurable PWM rate setting for copters.
 2013-01-06 06:29:28 +11:00
Simon Wilks 1b81724ef7 Manually remap the channel assignements for testing. 2013-01-05 15:46:26 +01:00
px4dev 69cdab9afc Fix a typo that caused PWM_SERVO_GET ioctls to fail on the FMU PWM outputs. 2013-01-04 23:41:21 -08:00
Julian Oes e4bfd78847 Attention: flipped the yaw direction of multirotors in order to be compatible to APM 2013-01-02 13:29:33 -08:00
Andrew Tridgell 8ffba22771 build: allow for external apps via EXTERNAL_APPS 
this is used by the APM build
 2013-01-02 17:39:12 +11:00
Andrew Tridgell 0fff8aa23b GPS: added comment on units for variance 2013-01-02 17:38:28 +11:00
Andrew Tridgell 63464a8959 mavlink: fixed build warning 2013-01-02 17:37:55 +11:00
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