Commit Graph

674 Commits

Author SHA1 Message Date
px4dev ae29617543 No joy with getopt_long 2012-10-14 23:09:48 -07:00
px4dev cf6e763c58 Beat up on the mavlink app startup a bit. 2012-10-14 22:40:18 -07:00
px4dev 7c20e66681 Refactor and start tidying up the MAVLink app. 2012-10-14 17:59:15 -07:00
px4dev db0ec8eb02 Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-13 22:09:16 -07:00
Doug Weibel 0a0215338a Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-13 16:38:18 -06:00
Lorenz Meier 4dbf7befe3 Disable rate control, disable offset estimation 2012-10-13 12:25:30 +02:00
px4dev 0ccaa1330b Merge branch 'master' of file:///Users/Shared/NuttX
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
2012-10-13 00:08:02 -07:00
patacongo e4ccbe7508 You can now configure a login for Telnet NSH session -- from Darcy Gong
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
2012-10-12 16:59:17 +00:00
px4dev d62ec78ab8 Remove obsolete warning. 2012-10-11 00:23:13 -07:00
Lorenz Meier 7ccc4f6096 Merge branch 'master' of https://github.com/tnaegeli/Firmware into tobi 2012-10-10 17:47:44 +02:00
Lorenz Meier 87ce36eef3 Fixed logging, merged 2012-10-10 17:47:28 +02:00
tnaegeli ec018e7b64 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/commander/state_machine_helper.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
solved
2012-10-10 09:52:37 +02:00
px4dev 1e59a592a6 Split the parameter load/save commands out of the 'eeprom' command, since that's not really the obvious place for them. Add parameter printing functionality (though, it's a mess due to %f being busted)
Update the script examples to use the new command.
2012-10-09 22:45:36 -07:00
tnaegeli 613e12fcac working offboard 2012-10-09 16:31:04 +02:00
Lorenz Meier bd3f3b1031 Sensor rate and throttle inversion fixes 2012-10-09 16:26:29 +02:00
px4dev a2ab5e8691 Don't treat end-of-document-structure as an error. 2012-10-08 22:37:18 -07:00
Doug Weibel 77e6375920 Change parameter names in FW control to fit within MAVLink parameter name size limit 2012-10-08 14:14:43 -06:00
Lorenz Meier 0edd4063af Merge branch 'master' of github.com:PX4/Firmware into tobi 2012-10-08 18:00:00 +02:00
Lorenz Meier dd50c88f07 Fixed GPS lost issue, fixed accel scale initialization, fixed code style in rate controller 2012-10-08 17:59:43 +02:00
Doug Weibel 4fea0a3fc1 This commit changes the inner loop control structures for fixed wing attitude control. Nested rate and angle loops are used with limits on both the rate setpoint
A simple outer navigation loop is retained for navigation control.  This will be replaced later.  The pitch set point is hard coded to zero.  Pitch stabilization should work.

This commit compiles, but needs further testing.
2012-10-07 14:50:07 -06:00
Doug Weibel 2bb1d17c7e Changes to the PID controller. Adds "limit" to the parameter set. Implements an output limit where the output magnitude is limited by the parameter value "limit". Also changes the integrator saturation such that the integrator is not updated (added to) if either updating it will cause the integrator values magnitude to exceed "intmax" or if the output magnitude would exceed "limit" with an updated integrator value.
Arbitrary large limit values were hard coded into multirotor_attitude_control.c.  These should be changed to parametric values or something sensible.

This commit will temporarily break fixedwing_control.c.  A following commit will repair it along with significant changes to the inner loop control.

This commit has been tested to compile with fixedwing_control.c temporarily removed.  No other testing has been completed.
2012-10-07 14:46:26 -06:00
px4dev 4c14e4f5f1 Add a 'secret' subcommand to bl_update that manipulates the option bits to change the brown-out detector configuration.
This is an experiment to see if we can improve the boot-time behavior when powered off noisy supplies.
2012-10-06 16:08:07 -07:00
patacongo 4d23437df0 Several bugfixes, mostly from Darcy Gong
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5217 42af7a65-404d-4744-a932-0658087f49c3
2012-10-06 14:50:37 +00:00
patacongo eb041b927a Fix some W25 driver errors
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5212 42af7a65-404d-4744-a932-0658087f49c3
2012-10-04 18:42:28 +00:00
patacongo 44a18f5361 Change all occurrences of CONFIG_EXAMPLE_ to CONFIG_EXAMPLES_ for consistency; fleshed out a few more Kconfig files
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5211 42af7a65-404d-4744-a932-0658087f49c3
2012-10-04 17:36:07 +00:00
patacongo b0eb4f3cce Change order of includes in apps/Makefile; add clock frequencies to shenzhou, fire, and olimex-stm32 board.h files
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5210 42af7a65-404d-4744-a932-0658087f49c3
2012-10-04 15:07:06 +00:00
Lorenz Meier 1318a0b954 Merge branch 'master' of https://github.com/tnaegeli/Firmware into tobi 2012-10-04 16:38:35 +02:00
Lorenz Meier 2fa0dec369 Back out testing changes that are a bit too much ahead of time for master 2012-10-04 16:38:11 +02:00
tnaegeli f292b03772 Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-04 16:04:49 +02:00
tnaegeli 8dfa66cb97 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/commander/commander.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
2012-10-04 16:01:42 +02:00
Lorenz Meier 67a2c8a173 Added controller parameters, added vicon position reading 2012-10-04 15:33:39 +02:00
Lorenz Meier 607e902b88 Cleaned up / simplified position control, attacking pos control implementation next 2012-10-04 14:50:34 +02:00
Lorenz Meier 2a06b66845 Fixed inner yaw rate loop 2012-10-04 10:56:55 +02:00
tnaegeli b9de72a8c9 Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-04 09:29:46 +02:00
tnaegeli 733975ed2d fixed Rate controller 2012-10-04 09:28:04 +02:00
px4dev dfae108e6a Go back to the FIFO scheduler for now, as we don't have time to shake out the RR scheduler changeover just yet.
Make the "default" scheduler a centralized definition so that changes are easier in future.
2012-10-03 23:13:20 -07:00
patacongo e6656c077c Delete the apps/vsn directory (moved commands to apps/system)
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5209 42af7a65-404d-4744-a932-0658087f49c3
2012-10-04 00:11:05 +00:00
patacongo 14b3f41aa6 Delete the apps/vsn directory (moved commands to apps/system)
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5208 42af7a65-404d-4744-a932-0658087f49c3
2012-10-03 23:36:54 +00:00
Doug Weibel 067361e2d4 Just a test commit. No content other than a test comment. 2012-10-03 08:47:56 -06:00
tnaegeli 147c5bb664 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c
2012-10-03 15:15:05 +02:00
tnaegeli f3cb2cf8a3 rate controller update 2012-10-03 15:05:50 +02:00
Lorenz Meier beca2b072e Moved from raw gyro to estimated angular rate from EKF for rate control 2012-10-03 15:02:47 +02:00
Lorenz Meier 053ce0e2f8 Exposed measurement noise covariance and process noise covariance as MAVLink parameters for attitude EKF 2012-10-03 14:45:55 +02:00
Lorenz Meier 921c391db4 Commit finished attitude estim cleanup 2012-10-03 14:00:04 +02:00
Lorenz Meier affa3af4e6 Clean 250 Hz updates in filter, partial updates enabled 2012-10-03 13:39:26 +02:00
Lorenz Meier 992a415ffc Merge branch 'master' of github.com:PX4/Firmware 2012-10-03 10:27:45 +02:00
Lorenz Meier b5d2ec3d92 Merge branch 'master' of github.com:PX4/Firmware 2012-10-02 22:28:22 +02:00
Lorenz Meier 7ef4655b0e Fixed HIL joystick support 2012-10-02 22:28:14 +02:00
Lorenz Meier a95aa1bbba Simplified pos estimator, ready for tests 2012-10-02 13:50:59 +02:00
Lorenz Meier 178462edcd Minor cleanups in debug output and offboard control arming 2012-10-02 13:02:57 +02:00
Lorenz Meier 5895a2e966 Updated update / telemetry rates, updated covariance 2012-10-02 10:41:46 +02:00
Lorenz Meier 9de6a81543 Updated EKF filter, fixed uploader (reverted to master) 2012-10-02 09:23:47 +02:00
Lorenz Meier d3e7b5e0bf Merge branch 'master' of https://github.com/tnaegeli/Firmware into task_spawn 2012-10-01 17:29:36 +02:00
tnaegeli e42655e7c6 EKF 2012-10-01 17:21:59 +02:00
px4dev 93c200d281 Add new 'task_spawn' interface for starting new tasks in the PX4 world 2012-10-01 00:02:38 -07:00
Lorenz Meier 6005077d54 Fixed typo 2012-09-29 22:06:30 +02:00
Lorenz Meier 6c4bddd996 Fixed a bug in HIL input 2012-09-29 22:04:00 +02:00
patacongo 253d3ab523 Prep for 6.22 Release
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5206 42af7a65-404d-4744-a932-0658087f49c3
2012-09-29 19:10:52 +00:00
Lorenz Meier 7949ac1ad8 Fixed heading calculation, fixed heading controller 2012-09-29 18:00:01 +02:00
patacongo de53b28fd3 Prep for NxWidgets 1.3 release
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5205 42af7a65-404d-4744-a932-0658087f49c3
2012-09-29 15:58:41 +00:00
Lorenz Meier 1725069c18 Merge branch 'update_rate' of https://github.com/sjwilks/Firmware into ardrone 2012-09-29 12:46:20 +02:00
patacongo 343817a6fd Turn off LCD reading on Shenzhou board (needs some TLC before it will be usable)
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5202 42af7a65-404d-4744-a932-0658087f49c3
2012-09-28 19:24:46 +00:00
Lorenz Meier fb691c9ff1 Fix a bug where under really adverse conditions the system id is not read before the first heartbeat is send out, resulting in an immediately timing out system in the GCS 2012-09-28 16:28:51 +02:00
Simon Wilks 4933d1dbbd Only provide update rate mod support to modes supporting 4 PWM channels 2012-09-28 08:37:24 +02:00
px4dev 78c2f99f85 Merge branch 'master' of https://github.com/PX4/Firmware 2012-09-27 19:50:20 -07:00
Simon Wilks 7a5ac6892e Support custom PWM update rates
Rates of 50 to 400 can be specified using the -u <rate in hz> parameter
with the fmu command in the startup script.
2012-09-27 23:36:56 +02:00
Julian Oes d206327541 Magnetometer calibration fixed 2012-09-27 18:43:04 +02:00
patacongo c3bc22f07c Definitions for ARMv7-M AIRCR register, Fixes for ADS7843 and SSD1289 driver, Missing build logic for examples/watchdog
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5198 42af7a65-404d-4744-a932-0658087f49c3
2012-09-27 15:29:53 +00:00
Julian Oes 2c5c314105 Cleanup of lots of debugging printfs 2012-09-27 17:08:29 +02:00
Julian Oes 7f15309892 Calibration should not freeze anymore, ardrone flying but estimator is not able to use calibrated magnetometer data 2012-09-27 16:50:20 +02:00
Julian Oes a05c4d0504 Merge branch 'ardrone' of https://github.com/PX4/Firmware into ardrone
Conflicts:
	apps/ardrone_interface/ardrone_motor_control.c
2012-09-27 13:44:47 +02:00
px4dev 62a4aa96b6 Merge branch 'master' of file:///Users/Shared/NuttX
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5197 42af7a65-404d-4744-a932-0658087f49c3
2012-09-27 00:18:03 -07:00
Lorenz Meier ec3949bf82 Fix a bug where the rate controller is always active 2012-09-26 22:25:39 +02:00
Lorenz Meier f93464e64f Fixed RC scaling in sensors app 2012-09-26 22:17:13 +02:00
Lorenz Meier d7456e61ff Fixed a max value in the AR.Drone interface 2012-09-26 22:16:57 +02:00
Lorenz Meier cbb1f1c9ed Fixed RC and offboard control state machine 2012-09-26 21:30:33 +02:00
Lorenz Meier 66aa281c07 Merge branch 'master' of github.com:PX4/Firmware into ardrone 2012-09-26 19:45:10 +02:00
Julian Oes ac43a67a0f ardrone max motor output was slightly to high 2012-09-26 14:29:47 +02:00
Julian Oes 201fdbc42c ardrone flying now (still workaround of disabled rates controller) 2012-09-26 10:11:57 +02:00
patacongo 731b466aca If server fails to create a thread because of lack-of-resources (EAGAIN), don't terminate. Keep serving... Memory may become available again later. From Kate.
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5191 42af7a65-404d-4744-a932-0658087f49c3
2012-09-25 22:47:11 +00:00
patacongo 2be7847efe Hook in NxWidgets configuration logic; Add a untested ADS7843E touchscreen support for the Shenzhou board; Complete the Shenzhou NxWM configuration (also untested).
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5190 42af7a65-404d-4744-a932-0658087f49c3
2012-09-25 22:04:51 +00:00
Julian Oes abbe998506 ardrone in the air again (workaround: rate controller disabled) 2012-09-25 21:35:02 +02:00
Julian Oes 0eae48d480 Merge remote-tracking branch 'upstream/ardrone' 2012-09-25 18:19:12 +02:00
Julian Oes 5c00ca343f forgot to remove printfs of magnetometer calibration 2012-09-25 16:39:15 +02:00
Julian Oes 6b0ed71ae0 Simplified magnetometer calibration routine 2012-09-25 16:36:33 +02:00
Julian Oes e217540e01 write all params to EEPROM for now (workaround to prevent standard values being written) 2012-09-25 10:51:13 +02:00
Julian Oes 268874fdb7 auto save after calibration (however the rest is reset to stock) 2012-09-25 10:31:19 +02:00
Julian Oes b5ec9c50f2 fix to set device for ardrone interface 2012-09-24 17:47:06 +02:00
Lorenz Meier 705172d302 Untested, but fully implemented attitude and/or inner rate control 2012-09-23 12:11:46 +02:00
Lorenz Meier de530d6ba1 General robustness improvements in PID struct, numerically close to bullet-proof, error reporting needs improvements still. 2012-09-23 01:20:41 +02:00
patacongo b58026b8f0 Add missing STM32 F1 pin remapping definitions
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5180 42af7a65-404d-4744-a932-0658087f49c3
2012-09-22 22:25:21 +00:00
patacongo 5b51b5e3a4 hpttd.h needs to include stdbool.h
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5179 42af7a65-404d-4744-a932-0658087f49c3
2012-09-22 20:38:43 +00:00
patacongo c9bb9dd995 Adds support for keep-alive connections to webserver
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5178 42af7a65-404d-4744-a932-0658087f49c3
2012-09-22 20:36:36 +00:00
Lorenz Meier 8b951ec417 WIP on HIL 2012-09-22 20:55:44 +02:00
Lorenz Meier a9b21886f3 Halfway-working fixed wing waypoint control, needs more effort 2012-09-22 18:46:04 +02:00
patacongo 1b7786e0e2 More webserver updates from Kate
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5173 42af7a65-404d-4744-a932-0658087f49c3
2012-09-22 12:23:35 +00:00
patacongo 4edf18b009 Add support for Fire STM32v3; sscanf fixes from Kate
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5168 42af7a65-404d-4744-a932-0658087f49c3
2012-09-21 17:32:30 +00:00
Lorenz Meier a56b4ffe26 Enabled mag updates again 2012-09-21 19:17:22 +02:00
Lorenz Meier 6c7e21bd1c Debugging output still enabled, fixed a number of additional issues 2012-09-21 19:14:50 +02:00
Lorenz Meier 1d96f0b853 Fixed stupid interface bugs, working 2012-09-21 17:19:28 +02:00