Commit Graph

6377 Commits

Author SHA1 Message Date
Don Gagne b9a56fbeb9 Fixed bug with transition from in air restore to armed
Also added better debug output for invalid transitions
2014-03-27 13:05:51 -07:00
Don Gagne d5a7e7c52b Rewrote to provide better feedback
Also allows variables as well as static text for assert text in
ut_assert
2014-03-27 13:05:03 -07:00
Don Gagne 521539897e Simpler state transition code
Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR
transition.
2014-03-26 14:51:57 -07:00
Don Gagne 783a240396 Function naming and remove unneeded sprintf 2014-03-17 11:01:15 -07:00
Don Gagne 4b980b508c arming_state_transition now outputs error messages
If mavlink fd is passed in method will output reason for arming failure
to mavlink.
2014-03-16 21:39:06 -07:00
Don Gagne dec13e7f21 Use single set of arm/disarm code
Set mode and arm/disarm commands now call a single method to arm
disarm, thus removing code duplication. Also calls updated
arming_state_transition method such that the arming state logic does
not need to be duplicated outside of arming_state_transition.
2014-03-16 21:38:23 -07:00
Lorenz Meier ae35733381 Merge pull request #745 from thomasgubler/caipirinha
introduce TBS caipirinha autostart script
2014-03-16 21:52:27 +01:00
Lorenz Meier ab7f07da75 Merge pull request #742 from thomasgubler/phantom
set phantom autoconfig parameters as provided by Andreas Antener
2014-03-16 19:15:10 +01:00
Thomas Gubler c1ee1abf27 introduce TBS caipirinha autostart script 2014-03-16 15:18:50 +01:00
kroimon 39274f4bf3 Merge pull request #743 from PX4/rcS_hotfix
add missing $ in rcS script
2014-03-15 15:33:25 +01:00
Thomas Gubler 75c168f13f add missing $ in rcS script 2014-03-15 15:29:50 +01:00
Thomas Gubler f4c91b19e4 set phantom autoconfig parameters as provided by Andreas Antener 2014-03-15 13:46:09 +01:00
Lorenz Meier e590d96c0a Merge pull request #734 from thomasgubler/rcs_defaultappsflag
rcS: introduce flag that allows disabling startup of the default apps
2014-03-14 18:11:46 +01:00
Lorenz Meier 5d1eef17fa Merge pull request #733 from dominiho/master
added i2c px4flow driver
2014-03-14 18:11:13 +01:00
Lorenz Meier 15a2b35868 Merge pull request #735 from thomasgubler/ardrone_mavtype
set correct MAV_TYPE in ardrone startup script
2014-03-13 18:52:37 +01:00
Thomas Gubler 7d48941c02 set correct MAV_TYPE in ardrone startup script 2014-03-13 18:47:31 +01:00
dominiho 11f12b4dfe added i2c px4flow driver 2014-03-13 15:43:52 +01:00
Thomas Gubler bfe8d73560 rcS: introduce flag that allows disabling startup of the default apps in order to start a different set of apps in a autostart script 2014-03-13 15:43:19 +01:00
Lorenz Meier 05f07f68c7 Merge pull request #732 from thomasgubler/ardrone_autoconfig_batteryvoltage
ardrone startup: set battery V scale parameter
2014-03-13 15:30:06 +01:00
Thomas Gubler 7a97eb83f6 ardrone startup: set battery V scale parameter in autoconfig to the value given in sensors_params.c 2014-03-13 15:27:12 +01:00
Thomas Gubler 04ce3261ca Merge pull request #731 from PX4/ardrone_autoconfig_fix
Remove non-existent parameter from 4008_ardrone startup script.
2014-03-13 14:41:42 +01:00
Stefan Rado 5745233f80 Remove non-existent parameter from 4008_ardrone startup script. 2014-03-13 14:36:02 +01:00
Lorenz Meier b9e8690c61 Merge pull request #703 from PX4/act_group_hotfix
Actuator group hotfix
2014-03-12 21:56:07 +01:00
Lorenz Meier 82e2619f1f Merge pull request #721 from PX4/laser_rangefinder
Laser rangefinder
2014-03-12 21:54:34 +01:00
Lorenz Meier 9153eee235 Merge pull request #729 from PX4/gpio_led_fmuv2
gpio_led: some more fixes
2014-03-12 21:53:43 +01:00
Anton Babushkin bbe9873f97 Merge branch 'master' into gpio_led_fmuv2 2014-03-13 00:29:14 +04:00
Anton Babushkin bc36b540a5 gpio_led: code style fixed 2014-03-13 00:25:00 +04:00
Anton Babushkin 6f55077541 gpio_led: bugs fixed 2014-03-13 00:24:28 +04:00
Lorenz Meier 072be2c730 Merge pull request #717 from PX4/iris_hotfix
Iris parameter hotfix: Dropped default gains
2014-03-12 20:44:04 +01:00
Lorenz Meier 4840d5fbcb merged master 2014-03-12 20:42:34 +01:00
Lorenz Meier 89e6b3f606 Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder 2014-03-12 20:38:39 +01:00
Lorenz Meier f5b21fbcde Merge pull request #728 from PX4/gpio_led_fmuv2
Gpio led fmuv2
2014-03-12 20:37:19 +01:00
Lorenz Meier caef8d115c Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2 2014-03-12 20:35:20 +01:00
Lorenz Meier db04e00060 Merge pull request #712 from PX4/fetch_log
Log fetcher utility
2014-03-12 20:32:58 +01:00
Lorenz Meier 0cce688010 Merge pull request #711 from PX4/sdlog2_opt
sdlog2 optimization
2014-03-12 20:30:00 +01:00
Anton Babushkin 5d34e124fe Merge branch 'master' into gpio_led_fmuv2 2014-03-12 22:42:36 +04:00
Lorenz Meier b7662537df Fix code style of laser rangefinder 2014-03-11 10:54:48 +01:00
Lorenz Meier 7851472ae9 Laser range finder ready to roll, logging tested 2014-03-11 10:52:53 +01:00
Lorenz Meier 290b07920c Fixed missing reset of poll rate after test exit in ultrasound driver 2014-03-11 10:52:26 +01:00
julianoes b6a087e921 Merge pull request #718 from thomasgubler/fw_posctrl_warning
fw posctrl: change 2 functions that return nothing from int to void
2014-03-10 22:50:14 +01:00
Thomas Gubler e0cf0e3f41 fw posctrl: change 2 functions that return nothing from int to void 2014-03-10 22:47:22 +01:00
Anton Babushkin ddb94ceba8 attitude_estimator_ekf: hotfix, do mag declination rotation matrix initialization 2014-03-10 23:39:31 +04:00
Lorenz Meier 368c2390cf Merge pull request #673 from PX4/romfs_prune
ROMFS: ignore comments and newlines in startup files, text in mixer files
2014-03-10 19:01:23 +01:00
Lorenz Meier b4cec8593e Merge pull request #707 from thomasgubler/fwtrim
Add simple control offset parameter for fw attitude (master)
2014-03-10 19:00:14 +01:00
Lorenz Meier 36843b55c4 Merge pull request #715 from thomasgubler/geofence
Geofence: make better use of Block class for updating parameters
2014-03-10 18:59:57 +01:00
Lorenz Meier 100ad89079 Merge pull request #714 from thomasgubler/launchdetection_cleanup
launchdetection: better integration of Block class
2014-03-10 18:59:34 +01:00
Lorenz Meier 30a57421f8 Dropped default gains 2014-03-10 18:48:07 +01:00
Lorenz Meier 3f3abebf68 Add range finder to logging 2014-03-10 18:47:31 +01:00
Lorenz Meier 1c488a95da Added laser range finder logging, needs testing 2014-03-10 18:46:22 +01:00
Thomas Gubler 8719c12e9a Merge pull request #708 from PX4/stack_reduce
Reduce excessive stack sizes on main OS stacks.
2014-03-10 12:52:34 +01:00