Commit Graph

4392 Commits

Author SHA1 Message Date
Julian Oes ec9de4ad84 Critical voltage now leads to a proper arming state transition 2013-08-16 09:27:05 +02:00
Lorenz Meier 3f9f1d60e0 Added audio and text warning if arming is refused due to mode switch 2013-08-16 09:23:39 +02:00
Jean Cyr ab80b0e273 Doxygenate and style dsm.c
One file a day... this'll take a while!
2013-08-15 19:51:36 -04:00
unknown 5142a9ffda Merge remote-tracking branch 'upstream/master' 2013-08-15 16:35:15 -04:00
Julian Oes d75c3c4e73 Try to open RGBLEDs in commander (WIP) 2013-08-15 17:48:28 +02:00
Julian Oes 901cef922c Some cleanup for the RGB LED driver, added ioctl to set color 2013-08-15 17:43:01 +02:00
Julian Oes 0c4e3dce0e Added LED_TOGGLE for normal LEDs 2013-08-15 17:34:49 +02:00
Julian Oes 98f403002f Lov voltage warning should work again 2013-08-15 17:29:27 +02:00
Julian Oes f51320d1af Lov voltage warning should work again 2013-08-15 17:27:29 +02:00
Julian Oes 56575eb068 Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
	src/drivers/blinkm/blinkm.cpp
	src/drivers/px4io/px4io.cpp
	src/modules/commander/state_machine_helper.c
	src/modules/px4iofirmware/protocol.h
	src/modules/px4iofirmware/registers.c
	src/modules/systemlib/systemlib.h
	src/systemcmds/reboot/reboot.c
2013-08-15 14:04:46 +02:00
Lorenz Meier b83d07e94a Hotfix: Excluding codegen code 2013-08-15 13:47:36 +02:00
Lorenz Meier 74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +02:00
Lorenz Meier ca877e0bc4 Fixed file exclude 2013-08-15 13:00:42 +02:00
Lorenz Meier a1e0581fac Hotfix: More Doxygen fixes 2013-08-15 12:55:16 +02:00
Lorenz Meier 75e5628590 Fixed Doxygen 2013-08-15 12:52:54 +02:00
Lorenz Meier 0dc240688d Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup 2013-08-15 11:26:17 +02:00
Julian Oes 561ec495b7 Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton
Conflicts:
	Documentation/flight_mode_state_machine.odg
2013-08-15 10:43:11 +02:00
Anton Babushkin 7476b03543 Merge branch 'master' into new_state_machine_drton 2013-08-15 10:33:45 +02:00
Julian Oes 39ae01dd07 Fix the low priority loop, calibration routines work again 2013-08-15 10:31:35 +02:00
Julian Oes e5af29be17 Fixed param save and load 2013-08-15 10:21:58 +02:00
Lorenz Meier cc9f1e81ad Rejecting arming if safety switch is not in safe position, added reboot command 2013-08-15 09:52:22 +02:00
Lorenz Meier 0bbc4b7012 Build fixes 2013-08-15 08:42:08 +02:00
px4dev 50cf1c01b7 Compile fix. 2013-08-14 22:29:36 -07:00
px4dev 33863165b2 Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) into fmuv2_bringup 2013-08-14 21:23:00 -07:00
unknown 9f7648b5fd Merge remote-tracking branch 'upstream/master' 2013-08-14 17:46:17 -04:00
Lorenz Meier aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
Anton Babushkin 27d0885453 gyro_calibration: confusing typo in mavlink message fixed 2013-08-14 22:38:14 +02:00
Julian Oes 53def47216 Fixed gyro scale calibration (it was storing scale even though the scale calibration was skipped 2013-08-14 22:33:43 +02:00
Lorenz Meier d2f19c7d84 Merge pull request #354 from jean-m-cyr/master
Support initiating DSM bind via QGroundControl
2013-08-14 12:43:59 -07:00
Anton Babushkin 9505654f91 commander/px4_custom_mode.h added 2013-08-14 17:57:01 +02:00
Lorenz Meier 01d354effc Merge pull request #355 from PX4/kconfig-cleanup
Kconfig cleanup
2013-08-14 08:35:01 -07:00
Lorenz Meier 33e71c37a6 Merge pull request #356 from julianoes/hotfix_io_override_bug
Fix bug where IO was in override mode for copter
2013-08-14 07:10:12 -07:00
Julian Oes 3a21cacdbb Fix bug where IO was in override mode for copter (workaround was to disconnect and reconnect Rx 2013-08-14 16:00:35 +02:00
Julian Oes 29d7836784 RGBled fixes: options and off after rgb working now 2013-08-14 15:03:52 +02:00
Andrew Tridgell 3b10f8431d rgbled: try expansion bus first, unless specific bus given
this will allow "rgbled start" to detect which bus the LED is on,
supporting boards with either external or internal LEDs
2013-08-14 15:02:35 +02:00
Andrew Tridgell 21a919d973 rgbled: added LED_MODE_RGB to allow for constant RGB values
this allows apps to fully control the 3 LED elements
2013-08-14 15:02:15 +02:00
Lorenz Meier e14d034528 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-08-14 14:58:02 +02:00
Lorenz Meier d0a9d250f7 Enforced consistency between configs 2013-08-14 14:57:30 +02:00
Lorenz Meier 50e3bb28c9 Fixed power attribute on FMU, contributed by Tridge 2013-08-14 14:56:27 +02:00
Anton Babushkin d7730a3444 commander, mavlink: fixed base_mode and custom_mode in mavlink 2013-08-14 10:59:22 +02:00
unknown 04335f7b86 Merge remote-tracking branch 'upstream/master' 2013-08-14 00:32:27 -04:00
px4dev de749a3602 Stop expecting CONFIG_HRT_anything since we aren't baking it into the NuttX config anymore. 2013-08-13 00:34:41 -07:00
px4dev 56d355414c Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in the toolchain configuration. 2013-08-13 00:34:11 -07:00
Lorenz Meier cd928b64f3 Fixed log conversion scripts copy operation. Each log comes now with the required conversion tools. Eats up only 10 KB flash for the good cause. 2013-08-13 09:10:47 +02:00
px4dev b6676f6cb8 NuttX is confused when it doesn't know what board it's building for - since we don't tell it in the config anymore, we need to pass it a hint. 2013-08-12 23:54:35 -07:00
Lorenz Meier 8c1f7a3706 Hotfix: Updated log converter 2013-08-13 08:52:03 +02:00
Lorenz Meier 53b373dd82 Minor fixes to log conversion scripts 2013-08-13 08:50:40 +02:00
Lorenz Meier 0025e9ca90 Hotfix: Copy a current version of the log conversion tools to each log directory 2013-08-13 07:57:39 +02:00
Lorenz Meier da9d9781f9 Final version of log conversion script, runs with Python 2 or 3 on Windows, Linux and MacOS. Tested on Mac with 2 and 3 2013-08-13 07:33:32 +02:00
Lorenz Meier b3d2efc90a WIP 2013-08-13 07:26:05 +02:00