Commit Graph

1974 Commits

Author SHA1 Message Date
Lorenz Meier 42ffb4161d Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-15 21:24:47 +01:00
Lorenz Meier f40e4d13aa Merge pull request #101 from julianoes/hotfix_matlab_import_script
Greatly sped up Matlab import script
2012-12-15 01:38:51 -08:00
Julian Oes 4bc3f80043 Greatly sped up Matlab import script, a 17min flight now takes 2secs to import instead of more than the actual flight time 2012-12-15 00:01:59 -08: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
px4dev 154035279f Merge pull request #98 from sjwilks/px4io_safety_switch
Added more LED state logic and improve code.
2012-12-08 14:35:32 -08: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
px4dev 566012d5aa Merge pull request #97 from sjwilks/px4io_safety_switch
Add new safety switch LED blink sequence when both FMU and IO are armed
2012-12-07 18:53:16 -08: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
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 5609604af5 Merge pull request #85 from julianoes/hotfix_gps_heading
Fixed missing heading for mtkcustom and nmea
2012-12-01 22:52:59 -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
px4dev 404332aefe Break out the task stack usage sniffer so we can use it on systems where the task layout has been shrunk (e.g. PX4IO) 2012-12-01 14:55:48 -08: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 fd14084768 Merged with master 2012-12-01 12:04:43 +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
Lorenz Meier 008a354391 Merge branch 'master' of github.com:PX4/Firmware 2012-12-01 09:58:11 +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 3e036e26c9 Disable the flow control signals for USART2/3, since we use them for other things. 2012-11-30 22:31:07 -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 7f22811afb Fix <termios.h> for c++ use (cannot mark speed const) 2012-11-30 21:50:55 -08:00
px4dev 2ac0cac11f Build fix - need <termios.h> 2012-11-30 21:50:19 -08:00
Lorenz Meier 996e363122 Hotfix: general MAVLink update, including file transfer 2012-12-01 02:13:49 +01:00
Lorenz Meier c7616f89a3 Hotfix: Made uploader more verbose on errors 2012-12-01 02:03:30 +01: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