Commit Graph

990 Commits

Author SHA1 Message Date
Jason Short
95a70cf32e lowered to nav_lat and nav_lon int16
added a version that didn't have I term added to get a better indication of velocity estimation
2011-12-29 23:02:03 -08:00
Jason Short
6f42442e57 Added 5 sec Takeoff Timer to clear i terms when lifting
Moved loiter relocation function to update_nav
moved User hooks to correct place
Added tuning for D term
2011-12-29 23:02:03 -08:00
Randy Mackay
bbe6dea980 OptFlow - initial support for APM2 (there are still problems) including adding ability to set Chip Select pin.
Other unrelated changes are:
a) fixed typo in 'esitmate_velocity' to 'estimate_velocity'.
b) moved init_compass from system.pde to sensors.pde which seemed consistent with other sensors.
2011-12-30 12:06:31 +09:00
Andrew Tridgell
955dfe0226 ACM: check compass health before using it 2011-12-28 20:41:53 +11:00
Andrew Tridgell
03a16c6e45 ACM: use new I2C library 2011-12-28 20:41:53 +11:00
Jason Short
234121f3c3 Fix for 11 channels of motors. 2011-12-26 14:39:01 -08:00
Jason Short
0491d4feca added define for optflow 2011-12-23 18:45:01 -08:00
Jason Short
d9590a44d6 Fixed merge issues 2011-12-23 14:51:40 -08:00
Jason Short
62cb407558 Begin to better integrate OptFlow, added necessary globals for Loiter estimation 2011-12-23 14:42:50 -08:00
Jason Short
239eb53983 change Alpha name 2011-12-18 16:38:07 -08:00
Jason Short
47e4c875e1 Cleanup
removed Iterm experiment - no noticeable effect in actual flight
2011-12-16 20:47:23 -08:00
Andrew Tridgell
f6f808357c removed AperiodicProcess code
this code was never being used, and was more complex than it was
worth.
2011-12-17 07:29:09 +11:00
Jason Short
2fc25d963d renamed super simple, added framework for auto calc of throttle cruise 2011-12-15 20:51:41 -08:00
Jason Short
f48e394511 made the last step of landing stop navigating so we can drop straight down. 2011-12-14 22:08:41 -08:00
Jason Short
8691b10ee9 added failsafe check,
enable loiter repositioning
2011-12-14 22:08:41 -08:00
Andrew Tridgell
888d6226b2 fixed two more CONFIG_HARDWARE #ifdef bugs 2011-12-13 17:05:48 +11:00
Jason Short
e4559bbf5c Added param option for Simple mode reset 2011-12-12 17:47:45 -08:00
Andrew Tridgell
d076fb54b5 fixed barometer detection on APM2 2011-12-12 15:45:36 +11:00
Pat Hickey
a48c65b5b5 ArduCopter: update AP_Baro constructors & initializers 2011-12-11 15:21:10 -08:00
Pat Hickey
6dbd6b4181 ArduCopter: Get barometer data in terms of AP_Baro interface
* Major change: Log.pde Log_Write_Control_Tuning has changed significantly
* MS5611 has no concept of RawPres and _offset_press
* Log the get_pressure() instead. (If we don't trust the barometer, what's the point?)
2011-12-11 15:21:10 -08:00
Pat Hickey
b055aa6f81 ArduCopter: instantiate correct AP_Baro object based on CONFIG_BARO 2011-12-11 15:21:09 -08:00
Pat Hickey
de6507a47d ArduCopter: Rename APM_BMP085 classes to AP_Baro_BMP085 classes. 2011-12-11 15:21:09 -08:00
Randy Mackay
67855b207d Arducopter, RangeFinder - added SONAR_TYPE parameter and properly support the XL (default), LV and long distance XL (aka XLL) sonar types 2011-12-11 16:40:59 +09:00
Jason Short
4659a9ffce Adjust Simple mode on the fly. 2011-12-10 23:29:29 -08:00
Jason Short
84b72b627b Added SIMPLE mode reset outside of bounding box of 10M, will do more testing before enabling. 2011-12-10 10:19:20 -08:00
Jason Short
7cecca74bc Made Baro_alt int32_t
Added home to copter bearing, home to copter distance
Added Land mode
2011-12-10 10:19:20 -08:00
Jason Short
76d60a2111 Added Home Bearing 2011-12-10 10:19:20 -08:00
Jason Short
05409b8c1c made RateP range a little more sensible
removed unused var
2011-12-06 21:03:07 -08:00
Jason Short
a632c49b44 Alt_hold_patch, removed Z dampening from Manual override. Fixed integrator conversion to throttle_cruise 2011-12-04 21:32:33 -08:00
Jason Short
e8a14c8d93 simple patch to improve alt hold based on stability patch 2011-12-04 21:32:33 -08:00
Jason Short
c99da66506 Formatting, swicth Omega to raw IMU rates 2011-12-03 15:29:33 -08:00
Michael Oborne
edf3195384 add 1hz mavlink loop. 2011-12-04 06:32:08 +08:00
Jason Short
ce5ad442fc Git Test 2011-11-28 10:54:20 -08:00
Jason Short
82adf1df6b removed need to send increment flag to update commands
constrained climb_rate value
2011-11-28 10:33:06 -08:00
Pat Hickey
6ee477bd8d ArduCopter: rev version number from 2.0.51 to 2.1.0 Alpha 2011-11-25 20:00:19 -08:00
Andrew Tridgell
38c85c44ae ArduCopter: rename purple to APM2 2011-11-25 20:00:19 -08:00
Andrew Tridgell
3a542b3ef3 USB-MUX: enable USB MUX switching for ArduCopter 2011-11-25 20:00:19 -08:00
Andrew Tridgell
ffba37d599 desktop: first version of register level SITL support
this adds register level emulation of the ADS7844 and the RC
input/output hardware on the APM1, allowing for SITL testing without
enabling HIL in the code
2011-11-25 20:00:18 -08:00
Andrew Tridgell
41caa949ca fixed InertialSensor stub build 2011-11-25 20:00:18 -08:00
Pat Hickey
1d50bb80fd hil-sensors ArduCopter: fixes to make hil-sensors build work properly
* requires new stub libraries for InertialSensor and PeriodicProcess.
2011-11-25 20:00:18 -08:00
Andrew Tridgell
1c20efe4b8 re-organiser sensor declarations
this tries to make the #ifdef nesting easier to understand
2011-11-25 20:00:17 -08:00
Andrew Tridgell
c0898ab3b9 purple: timer_scheduler should be in all builds 2011-11-25 20:00:17 -08:00
Pat Hickey
660174e610 purple: switch ArduCopter to new sensor objects
this uses the new sensor abstractions for the purple/APM1 hardware
choice
2011-11-25 20:00:16 -08:00
Jason Short
abe4758c3b no longer using the raw pressure 2011-11-25 11:34:05 -08:00
Jason Short
c5c5884006 v number 2011-11-21 22:13:18 -08:00
Jason Short
89e014c06a Added alternate alt hold,
New ESC Calibration Routine
2011-11-21 22:12:19 -08:00
Jason Short
fbf09dbf2d Made save WP the default
Cosmetic updates
2011-11-20 12:50:12 -08:00
Randy Mackay
f397bae793 ArduCopter Alt Hold - Change to not run get_nav_throttle if manually adjusting altitude with manual_boost - removes possibility of I term running up
Tuning - added ability to modify altitude (position, not rate) controller
TradHeli - Fairly large change to how throttle is scaled and collective moves.
2011-11-20 22:30:42 +09:00
Jason Short
185c2a50ce added some params from Arduplane to make Mavlink upgrade easier
made loiter radius smaller in storage
2011-11-20 00:22:53 -08:00
Jason Short
b6adfdb62f missed == 2011-11-19 14:42:57 -08:00
Jason Short
579096cd2e return to prev climb rate calc 2011-11-19 13:58:41 -08:00
Jason Short
a168691eba Working implementation of Jump Command 2011-11-16 21:28:56 -08:00
Jason Short
5ed931c582 Mission Scripting re-write 2011-11-16 00:22:22 -08:00
Jason Short
3eaef4081c Added better navigation flag for more accurate dtnav timing
Added better support for climb rate in SIM
2011-11-16 00:22:22 -08:00
Jason Short
2ad1294514 scaling width of circle mode to make it more round. 2011-11-13 23:09:42 -08:00
Jason Short
be1007d032 Moved updated alt to GPS so the climb rate is sane 2011-11-13 22:54:57 -08:00
Jason Short
349ab7e0c6 slowed Circle flight 2011-11-13 13:41:23 -08:00
Jason Short
e1315b1ab8 Update and fix for Circle mode
HIL updates for altitude
2011-11-12 21:43:21 -08:00
Jason Short
8ad94b9993 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-11-09 22:56:52 -08:00
Jason Short
ae1684a37c crosstrack angle variable 2011-11-09 22:56:38 -08:00
Andrew Tridgell
c056c4f0cb HIL: allow for fast HIL attitude update in HIL_MODE_ATTITUDE
this runs it at the full loop rate
2011-11-10 13:17:06 +11:00
Jason Short
1ab1d8bab4 Fixes for Sim - Missing climb rate calculation 2011-11-08 10:46:52 -08:00
Andrew Tridgell
28634f51b7 ArduCopter: use specific sized data types in a lot of places
this will make the Desktop build more consistent with the real AVR
build, and also with a future ARM build
2011-11-08 11:05:36 +11:00
Andrew Tridgell
3176d4ffc5 HIL: enable CTUN log message in ATTITUDE HIL 2011-11-08 07:58:35 +11:00
Jason Short
3a37e7fe60 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-11-06 22:46:57 -08:00
Jason Short
a37fadbedb moved to 200hz update
Zccel Z updates from Aurelio in attitude.pde
lowered baro_alt sanity check
moved user hooks to the medium 10hz loop.
2011-11-06 22:46:39 -08:00
unknown
9c59fdfdd6 AltHold - another correction to the manual boost. Hopefully properly transferring building up I terms to g.throttle_cruise 2011-11-06 19:06:13 +08:00
unknown
32057fb3c9 AltHold - made TradHeli code also use manual_boost 2011-11-06 18:25:13 +08:00
unknown
755cb4b201 Altitude hold bug fix - changed g.throttle_cruise to be updated to steal I term from correct controller 2011-11-06 17:47:24 +08:00
Jason Short
c8304114a3 renamed some command variables to align with Arduplane
reworked the arming code and moved the DCM gains out.
updated climb_rate to include sonar data.
2011-11-04 21:41:51 -07:00
Jason Short
3f211121fe Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-11-01 21:18:56 -07:00
Jason Short
27fc6eea10 Z dampener
Integrated Aurelio R. Ramos' Z dampening code.
2011-11-01 21:18:47 -07:00
Andrew Tridgell
acc03753ab fixed HIL build 2011-11-02 08:14:07 +11:00
Jason Short
c32a707632 cleanup 2011-11-01 09:28:36 -07:00
Jason Short
ab1de277dc altered the interactive throttle to be more aggressive and proportional.
reworked baro reading strategy.
2011-11-01 09:24:51 -07:00
unknown
c253996ea9 TradHeli - added TUNE value 13 to allow adjusting of external gyro gain using channel 6 2011-10-29 20:34:21 +09:00
unknown
ea66c74ff0 TradHeli - added throttle scaling and heli specific angle_boost function that takes into account that heli's main blades can have -ve pitch. 2011-10-29 17:27:43 +09:00
Jason Short
07daf34ccc Added a slew rate to the alt change rate.
Added better reporting of throttle control
upped constraints for alt hold
Additional logging for CTUN lay hold
2011-10-28 21:29:10 -07:00
Jason Short
46590e5f28 Log updates
Added motor logging for different frame types. Switched the PM log to some new debugging values and speed up the writing of the value to the logs.
2011-10-27 22:36:25 -07:00
Jason Short
04b5776601 50 rev
Work in progress, revved the EEPROM
2011-10-27 12:42:28 -07:00
Jason Short
c8c26d8193 added boost scalar arguments
removed accel math from Trig function into Attitude.pde
2011-10-27 12:33:19 -07:00
Jason Short
4be2776b17 Added Andrew's user hooks. 2011-10-15 15:29:33 -07:00
Jason Short
142707711e Updates to guided mode from Michael O.
removed or commented unused static vars
2011-10-15 13:09:04 -07:00
Michael Oborne
e85e3b87a8 AC2 fix guide mode fly off 2011-10-13 18:34:32 +08:00
Jason Short
9500171a46 tweak to the Loiter N turns 2011-10-12 20:59:12 -07:00
Jason Short
43b3015963 lowered DCM RP gains
made Instant_PWM optional
upped PWM output to 400hz
2011-10-11 22:20:23 -07:00
Amilcar Lucas
04299122d8 Spell 2011-10-11 22:52:02 +02:00
Andrew Tridgell
97b3ced7aa fixed a signed/unsigned warning 2011-10-11 20:53:43 +11:00
Andrew Tridgell
d89ae696ef merged the GCS updates from ArduPlane to ArduCopter
this removes all the non-MAVLink GCS options, and simplifies the HIL
and GCS code a lot. It also adds async sending of low priority GCS
text messages.
2011-10-11 20:53:43 +11:00
Michael Oborne
a052c25899 Merge commit 'e7f5e4a623b79872a015dff5ca959e60f6f7fd64' 2011-10-08 20:43:13 +08:00
Jason Short
c25478448b Quick RTL Fix, logic was backward 2011-10-07 11:06:31 -07:00
Jason Short
167df79b49 Better Loiter PIDs
Fixed RTL overshoot bug
2011-10-06 17:42:09 -07:00
Jason Short
1ff372a41d Implementing a limiter for the ramp up of speed to WPs. 2011-10-03 10:37:56 -07:00
Jason Short
eb1117b136 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-10-02 11:36:31 -07:00
Jason Short
b0bd9d1c44 Added second PI loop for alt hold.
Upped gains for default JDrones Frame
added gains for second PI loop for alt
removed some tests for 1280 space constraints
2011-10-02 11:36:23 -07:00
Amilcar Lucas
ee4251baef Fix compilation 2011-10-02 14:52:02 +02:00
Amilcar Lucas
3d1902abac Use the new AP_Relay library 2011-10-02 14:22:27 +02:00
Jason Short
de61e87128 Added ADC gyro Filtering for quads - this fixes a noise issue introduced into the controller
added Position mode
removed
Added back in the accelerometer experiment
Added filter_result boolean to enable filter on the fly
2011-09-29 23:27:23 -07:00
Jason Short
758d0e1aec Attempting to mimic loiter values for 4.0.42
lowered Rate Error max in loiter
2011-09-28 23:11:19 -07:00
Jason Short
888e1119e8 Added Loiter P tuning as #12 2011-09-27 09:39:32 -07:00
Jason Short
c209d6e6dd 2.0.46 -Not flight tested!
restored 42 alt hold code
removed throttle timer, replaced with safer constant
increased alt control range
reformatted nav_rate calls
removed unused simple mode defines
set alt hold home to 10m
tuned down rateP to .13 from .14 for broader application.
2011-09-27 09:35:05 -07:00
Michael Oborne
108a89f617 heli hil 2011-09-27 07:30:28 +08:00
Jason Short
b2a2221474 Fixed issue with Simple mode changes.
Reverted to simpler, safer timer code for throttle hold
2011-09-25 14:16:35 -07:00
Jason Short
706211b757 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-25 12:22:07 -07:00
Jason Short
239164fa19 Fixed Flip code to compile. Flip still not flight tested! 2011-09-25 12:21:54 -07:00
rmackay9
b5ea05698e TradHeli - added servo averaging to allow support of analog servos
- moved heli parameters to 80 because they were causing flight modes to overlap with waypoints
2011-09-25 16:51:25 +09:00
Jason Short
236f665378 Added Loiter Turns - It orbits the Current location
Added WP to Loiter_time so you can spec a specific location in the planner
added new Navigation alg. Should perform better (doesn't rely on 45° flow fields like last one)
Added "Jump" counter so missions don't get overwritten in flight.
removed I term by default for Rate pitch and roll
2011-09-24 17:40:29 -07:00
Jason Short
2ae163ef75 Trying to make Alt hold more aggressively change altitudes. 2011-09-23 13:58:39 -07:00
Jason Short
25b0a3c43b Added a default, but low throttle cruise value
Added a clear integrator for Rate I to prevent tip ups at launch.
2011-09-22 23:10:55 -07:00
Jason Short
991279851a Refined Throttle Timer reset
Reduced Loiter I gain to decrease overshoot.
2011-09-22 17:38:39 -07:00
Jason Short
078f64e276 Fixed Throttle integrator bug. Time was not being reset causing a big drop in throttle control. 2011-09-22 12:28:46 -07:00
Jason Short
a012e7981a removed debug statements 2011-09-21 22:34:27 -07:00
Jason Short
c91ad14e18 Fixed Timer overflow for throttle PI loop.
Moved look at home to update_nav where it belongs
2011-09-21 22:31:12 -07:00
Jason Short
5ca50f1f01 Altered CIRCLE mode to allow Loiter_N_Turns to work in AP mode. 2011-09-21 13:19:36 -07:00
Jason Short
2a6d2dea5c upped to 2.0.44 - not flight tested 2011-09-20 23:23:42 -07:00
Jason Short
00fe8e0450 Fixed do_flip, 2011-09-20 23:20:33 -07:00
Jason Short
94313ea88f Fixed Yaw for Auto mode. 2011-09-20 22:59:23 -07:00
Jason Short
020062498b Edited CH7 options to include Do Nothing and RTL. 2011-09-20 10:37:50 -07:00
Jason Short
b2b28cc90c Converted Millis to Micros
added navigation check to return a failed navigation
2011-09-19 22:24:57 -07:00
Jason Short
bf94ba551e changed PI Library to take Float for DeltaTime
Changed timing to be more accurate in main loop. Still need to switch to micros(). Left that for Tridge. This gets rid of six floating point calcs *250. Nice!
2011-09-19 14:02:42 -07:00
Jason Short
b9b5c57662 added contributor 2011-09-18 17:12:59 -07:00
Amilcar Lucas
2755748d44 Added comment, spellcheck
This reduces the diff to the APM_Camera branch
2011-09-18 14:57:55 +02:00
Jason Short
2f961ad315 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-17 12:23:22 -07:00
Jason Short
99065d5035 Added a GPS watchdog to stop navigating if we loose signal. 2011-09-17 12:23:16 -07:00
Amilcar Lucas
227ce0a92d Merge some small misc improvements from APM_Camera branch 2011-09-17 20:25:31 +02:00
rmackay9
c825e76a88 ArduCopter - small changes to fix compile errors when optical flow enabled 2011-09-17 22:09:18 +09:00
Andrew Tridgell
3c69404d5b fixed build of OpticalFlow code 2011-09-17 14:58:02 +10:00
Andrew Tridgell
0425f4be54 updates for new DCM code
G_Dt is no longer needed by the DCM
2011-09-17 14:58:02 +10:00
Jason Short
f79b8de5e8 removed DCM reference from OPT FLOW 2011-09-16 19:17:50 -07:00
Jason Short
129c13e065 Fixed CIRCLE mode trig error
made loiter_radius * 100 in Params
updated gains
2011-09-16 16:54:45 -07:00
Jason Short
8d0a2fae9b cleanup
added more ifdef for optflow
2011-09-15 23:41:15 -07:00
Jason Short
d29cfbcee3 Integration of optical flow
bug fixes for new Simple mode
increased Baro filter by 2 fields
2011-09-15 23:33:00 -07:00
Jason Short
1ce2308d11 Removed Simple Mode
Added Simple option to mode switch positions
removed unused OptFlow code
added reset lat and lon error
removed unused init_auto
Fixed log formatting
Added simple mode bitmask
removed pitchmax
added CLI setup for enabling Simple mode to any switch position
2011-09-14 13:58:18 -07:00
Jason Short
ecd14f4425 Cleaned up guided mode
Reduced ADC filter to 3 from 6 to increase speed of filter.
2011-09-12 12:57:36 -07:00
Jason Short
885ec18182 Removed last of Xtrack 2011-09-11 20:40:05 -07:00
Jason Short
e6b7c57d26 Circle Mode now working
250Hz loop implemented
2011-09-11 11:22:01 -07:00
Jason Short
b4a51806bc Added Nav Rate tuning 2011-09-10 18:37:28 -07:00
Jason Short
02bfd43390 Fixes Alt hold mistake
Moves tuning into runtime definable param
Added more IMax to throttle

Signed-off-by: Jason Short <jasonshort@gmail.com>
2011-09-10 15:16:51 -07:00
jasonshort
8870e2f309 circle mode patch 2011-09-09 11:59:42 +10:00
Andrew Tridgell
d95e454609 rename main pde file for arduino requirements 2011-09-09 11:51:21 +10:00