Commit Graph

341 Commits

Author SHA1 Message Date
tridge60@gmail.com 5385e19f35 make it possible to enable RC override on non-HIL setups
this makes it possible to allow a GCS to override RC input values for
non-HIL setups. This gives a way for a GCS to set an arbitrary switch
value, or set a precise PWM value for any control.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1789 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-19 10:18:21 +00:00
tridge60@gmail.com c34a86be89 added send_text_P()
this merges the send_text_P() updates from APM

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1788 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-19 10:14:15 +00:00
tridge60@gmail.com 0374781c56 mavlink: merged in changes from APM
this fixes waypoint upload

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1787 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-19 08:05:06 +00:00
tridge60@gmail.com 9baf649923 added update_events() prototype
this fixes a build error on Linux. See the equivalent commit in APM

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1786 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-18 01:50:46 +00:00
tridge60@gmail.com 48539f7b49 HIL: fixed a build error with HIL
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1785 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-18 01:50:39 +00:00
tridge60@gmail.com bc662fa134 mavlink: reduce the number of message buffers to 2
this is all we need, and it saves us some SRAM

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1784 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-18 01:50:33 +00:00
tridge60@gmail.com 0370eeba8c added sonar test
useful to check calibration of the sonar

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1783 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-18 01:50:27 +00:00
jasonshort 119194d443 removed startup_IMU_ground
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1780 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-17 17:47:04 +00:00
jasonshort 01a4f764bf Fix for reversed pitch in SIMPLE mode.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1779 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-17 05:05:16 +00:00
jasonshort 2bee76b0b8 fix for Loop timing issue.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1776 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-16 05:43:48 +00:00
jasonshort 984e6c7928 removed debug code
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1775 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-15 05:55:51 +00:00
jasonshort 323f2bfa59 Update to get SIMPLE mode running.
Seems to work!

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1774 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-15 05:54:48 +00:00
jasonshort 602a4fb423 Added new Simple mode - Better version of FBW that is offset by initial yaw angle and not north.
Added new navigation control based on bearing_error so we can leverage Crosstrack correction.
I've done limited testing on this.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1773 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-14 06:04:07 +00:00
jasonshort cee3e2d57e alignment with APM 2.0
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1772 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-13 06:25:38 +00:00
dhcorley@msn.com 64b5eb90fe cleaned up unneeded integer in xbee test
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1771 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-11 23:03:56 +00:00
dhcorley@msn.com 66c9ded2d8 Update rawgps cli test with indicator LED.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1770 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-11 23:00:40 +00:00
jasonshort 732446eb3a fix for Logging, motors_out buffer overrun, formatting.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1769 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-11 21:37:37 +00:00
jasonshort 20fdbda315 enable logs default
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1768 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-11 02:49:12 +00:00
jasonshort 667aa34fbd Fixed new Xbee Test bug
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1767 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-10 21:27:22 +00:00
jasonshort 3fc86e7048 New Xbee Test Implemented
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1766 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-10 19:25:54 +00:00
DrZiplok a07e3aa7fc Remove a stale reference to APM_BinComm.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1765 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-10 06:25:02 +00:00
mich146@hotmail.com 2389bf58a9 ACM fix old mavlink reference. (use new GCS_mavlink library)
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1764 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-10 01:06:27 +00:00
dhcorley@msn.com 69f6dd6265 Applied changes for rawgps cli test mode.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1763 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-09 14:48:49 +00:00
jasonshort 61b96075cf lots of minor changes, Logs should be working better now.
Pos hold is now called "Loiter" - I don't want to have a flight mode called HOLD POS...



git-svn-id: https://arducopter.googlecode.com/svn/trunk@1761 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-09 07:00:48 +00:00
jasonshort 8114b717f2 lots of minor changes, Logs should be working better now.
Pos hold is now called "Loiter" - I don't want to have a flight mode called HOLD POS...



git-svn-id: https://arducopter.googlecode.com/svn/trunk@1759 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-09 06:37:09 +00:00
tridge60@gmail.com 7f330fbb6c added C coding style headers to a few more files
this helps for people running editors like emacs that can read these
and set the right tab levels

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1758 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-08 12:20:48 +00:00
jasonshort be709de318 fixed PID setting bug.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1755 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 21:22:55 +00:00
jasonshort d94ce4bb92 moved Mag offsets to "test","stabilize"
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1754 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 19:06:29 +00:00
jasonshort af71b3a764 Added break feature on yaw control. Please verify it works properly before flying.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1753 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 17:19:38 +00:00
jasonshort 02029ab20c Added break feature on yaw control. Please verify it works properly before flying.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1752 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 16:59:58 +00:00
jasonshort 1fe9a84e2c bug fixes and updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1751 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 06:00:27 +00:00
jasonshort 97107d89d2 bug fixes and updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1750 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-07 00:57:06 +00:00
tridge60@gmail.com 756a5b0052 HIL: we need very fast update of motor controls for HIL
When doing HIL with a copter you need to update the controls very
rapidly, much more so than with a plane. This puts the update in the
fast loop

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1749 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-06 09:36:03 +00:00
tridge60@gmail.com f7f48ebb20 mavlink: fixed store of parameter values to eeprom
setting parameters via mavlink only saves them in memory. We need to
use AP_Var::save_all() to save them permanently

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1748 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-06 09:35:57 +00:00
tridge60@gmail.com a05c374de1 HIL: fill motor_out[] when disarmed, so HIL sees zero values
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1747 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-06 09:35:50 +00:00
jasonshort 4fbf2e4fac upped WP to 15 bytes
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1746 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-05 20:50:49 +00:00
jasonshort 9e8e4e6af6 Just aligning tabs
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1744 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-05 05:15:12 +00:00
jasonshort cac0a18760 Added support for WP options
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1743 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-05 05:12:16 +00:00
jasonshort 8fbe11fca5 Added support for WP options
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1742 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-05 04:56:58 +00:00
tridge60@gmail.com c9f6e12d60 mavlink: fixed parameter string handling
this prevents running past the end of a non-terminated string.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1740 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-03 11:40:19 +00:00
tridge60@gmail.com b7be7bc41a fixed the flight mode channel parameter to match current APM trunk
APM trunk now calls this parameter FLT_MODE_CH. This makes the ACM
code compatible.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1739 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-03 11:40:13 +00:00
tridge60@gmail.com b2bec2ccdc added radio override via MAVLink
This allows MAVLink commands to override the RC input values. See the
discussion on the mavlink list.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1738 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-03 11:40:06 +00:00
tridge60@gmail.com b1e54558e4 mavlink: fixed build with MAVLink and HIL
this fixes the build with HIL_MODE_ATTITUDE and MAVLink enabled. Basic
MAVLink operation works.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1737 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-03 11:39:52 +00:00
jasonshort b59474fc1a Big changes in the way commands are parsed and mission tasks are done. Not tested at all.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1736 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-03 02:32:50 +00:00
jasonshort e51be3328b Should be flyable now. Please Use Reset in setup before flying.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1726 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 05:33:39 +00:00
jasonshort 5fbd9dbc22 removing unused file
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1725 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 02:51:58 +00:00
jasonshort 4af236cabc removing old EEPROM.pde file
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1724 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 02:51:31 +00:00
jasonshort 85c1fd0bf9 removing old EEPROM.pde file
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1723 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 02:50:51 +00:00
jasonshort b7c1d54fbf removing old EEPROM.pde file
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1722 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 02:50:38 +00:00
jasonshort 2555abcf1d git-svn-id: https://arducopter.googlecode.com/svn/trunk@1719 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-24 05:56:59 +00:00
jasonshort cb62a3f262 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1715 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-23 05:12:41 +00:00
jasonshort 6a34bef020 in progress updates, don't fly
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1710 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-21 20:58:10 +00:00
jasonshort 417df6aaaa added mavlink
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1708 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-21 06:36:05 +00:00
jasonshort da74d32c94 fixed printf_P bug
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1705 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-21 04:46:26 +00:00
jasonshort 5282c72d1f continued APvar int
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1703 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-21 04:30:56 +00:00
jasonshort 73f3fc6193 continued APvar int
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1701 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-20 23:09:28 +00:00
jasonshort 8655c01612 AP_Var integration continued....
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1699 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-20 19:07:35 +00:00
jasonshort 7acf9a15fc AP_Var integration continued
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1697 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-20 02:03:01 +00:00
jasonshort 3bf6257783 AP_Var integration continued
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1693 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 22:44:52 +00:00
jasonshort 3869766269 cleanup
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1692 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 22:44:03 +00:00
DrZiplok 21976f01b4 Cast AP_Var types for safe printf calls.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1690 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 21:04:05 +00:00
jasonshort 0dff3b47e0 added fake_mav command
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1689 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 21:02:27 +00:00
jasonshort 40954e0980 updated to AP_Var
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1682 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 07:44:44 +00:00
jasonshort 765e3d2935 updated to AP_Var
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1681 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 07:21:42 +00:00
jasonshort acb7d78a79 updated to AP_Var
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1680 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-19 03:59:58 +00:00
jasonshort da4cff5440 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1675 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-18 23:59:01 +00:00
DrZiplok b02baa5672 Fix type of g.throttle_min/g.throttle_max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1672 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 09:44:39 +00:00
DrZiplok facda81c5a Compilation fixes per request
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1671 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 09:36:33 +00:00
jasonshort b51e4dbd06 updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1670 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:28:49 +00:00
jasonshort dedb1e29ce updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1669 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:27:57 +00:00
jasonshort 149de91eb7 updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1668 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:25:31 +00:00
jasonshort 49bef1a2bf updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1667 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:22:30 +00:00
jasonshort d481503937 updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1666 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:09:13 +00:00
jasonshort e137500fe4 version number for tag
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1638 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-13 22:45:08 +00:00
jasonshort 9fc23e6c70 alt hold updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1637 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-13 22:32:34 +00:00
jasonshort 1f46609eca alt hold updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1633 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-13 05:21:32 +00:00
jasonshort 30ba313829 Fixed alt hold
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1631 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-11 22:14:06 +00:00
jasonshort 69204d00dc Fixed AP_GPS_None bug
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1629 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-11 04:49:08 +00:00
jasonshort a5a9b84e55 updated dual kp alt hold
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1627 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:25:56 +00:00
jasonshort 8558f9125c float update
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1626 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:14:27 +00:00
jasonshort fe9bd03d20 debug code updated
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1625 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:13:16 +00:00
jasonshort 27fc11183c debug code updated
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1624 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:11:55 +00:00
jasonshort c15f2b7101 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1623 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-10 07:11:17 +00:00
jasonshort fdefe84bde updated angle boost.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1622 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:11:00 +00:00
jasonshort c9df790df5 gyro test now includes sin cos out
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1621 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:10:24 +00:00
jasonshort 9b089e98c5 simplified protocol
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1620 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:09:51 +00:00
jasonshort fc4e32fa1f improved FBW control
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1619 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:09:32 +00:00
jasonshort 66e3c99bfa improved rotation vectors
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1618 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-10 07:08:03 +00:00
jasonshort e5fde180fd switch compass orientation back to default
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1610 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 06:20:08 +00:00
jasonshort f60a95ebff beefing up nav
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1609 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 06:19:19 +00:00
jasonshort 8c1867b1a6 trying to improve alt hold.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1608 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 06:19:01 +00:00
jasonshort 71cbbd15dd git-svn-id: https://arducopter.googlecode.com/svn/trunk@1607 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-07 06:18:18 +00:00
jasonshort 48bbb0d00c setup 0 default for d term where there was a conflict with external dampeners
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1606 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 05:59:10 +00:00
jasonshort cc61eafd8b adjusted filter for faster response
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1605 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 05:58:29 +00:00
jasonshort 21df2c1fac upped buffer
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1604 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 05:56:54 +00:00
jasonshort 7a131889d9 updated gains
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1603 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 05:56:28 +00:00
jasonshort 080e7cb338 removed debugging code
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1602 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 05:55:29 +00:00
jasonshort 6d6eb8d7bb updated airpressure test
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1601 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-06 18:50:16 +00:00
jasonshort 30102d28e4 removed D for nav, added extra timer for FBW and Nav.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1600 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-06 07:06:36 +00:00
jasonshort fb95a6f132 added error limit to alt hold
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1599 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-06 07:04:26 +00:00
jasonshort 47d4b7a59d git-svn-id: https://arducopter.googlecode.com/svn/trunk@1598 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-06 07:03:28 +00:00
jasonshort 03d3231c48 fixed inverted cos error
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1597 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-06 07:02:51 +00:00
jasonshort 7fa41e462a git-svn-id: https://arducopter.googlecode.com/svn/trunk@1596 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-06 07:02:25 +00:00
jasonshort 288ce0f4b1 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1595 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-06 07:01:30 +00:00
jasonshort 672fd5a24b git-svn-id: https://arducopter.googlecode.com/svn/trunk@1594 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-02-06 07:00:55 +00:00
jasonshort 749ac8c69d radio flaps set to 1000
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1593 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-05 19:00:36 +00:00
jasonshort e9375defb0 clean-up only
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1592 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-05 06:31:03 +00:00
jasonshort a61b64a36f new Hexa code
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1591 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-05 06:14:44 +00:00
jasonshort 2edaf389e7 incremented version
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1585 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-01 05:01:43 +00:00
jasonshort aecc9db68e added ch7,8 to init for hexa quads
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1584 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-01 05:01:19 +00:00
jasonshort 87782a44af updates for CGS
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1583 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-31 17:10:07 +00:00
jasonshort 4f6411c37f Changes from flight testing
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1582 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-31 01:54:07 +00:00
jasonshort b250df996e FBW bug fixes
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1576 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-30 02:36:03 +00:00
jasonshort 9d74a599b0 New feature prevents startup of motors.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1574 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-29 22:03:50 +00:00
jasonshort e1b4ec3132 fixed Current logging output.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1572 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-29 05:55:23 +00:00
jasonshort 1af6a3b4e8 fixed PM logging rate.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1571 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-29 04:58:31 +00:00
levinemax@gmail.com 43620dd50b small fix
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1570 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-28 18:26:17 +00:00
jasonshort 40ec5d906d upped the camera behavior for Max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1569 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-28 05:39:17 +00:00
jasonshort aa6b1d0cd2 upped the threshold PWM for Max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1568 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-28 05:38:26 +00:00
jasonshort cfc0e8f03a adjust tri frame output to not output 4th motor
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1567 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-28 05:36:33 +00:00
jasonshort 4cc0992e65 removed debugging
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1561 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-26 17:22:39 +00:00
jasonshort b4abbacbd8 fixed FBW bugs
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1560 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-26 07:14:54 +00:00
jasonshort 2f9bce7656 added instructions for Acro setting
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1557 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-25 06:28:34 +00:00
jasonshort 8b301765ad new rate control, FBW fixes, new safety.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1556 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-25 05:53:36 +00:00
jasonshort 240aee3a65 removed counteri - is moved to a static var in motors.pde
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1552 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 02:05:27 +00:00
jasonshort 22d0e922d3 Moved output to motors.pde
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1551 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 02:04:44 +00:00
jasonshort 4478a0647f fixed imax scaling bug
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1550 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 01:58:04 +00:00
jasonshort e185d02785 better default config
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1549 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 01:57:31 +00:00
jasonshort 78e19fbe26 improved throttle PIDs
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1548 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 01:55:19 +00:00
jphelirc 021746fd0a hexa frame setp
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1536 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 16:40:03 +00:00
jasonshort 1468ec497d Added Arming light. LED A solid = safe, blinking = armed.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1529 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 02:36:22 +00:00
jasonshort eb67a7eee0 altitude was set to sonar pid rather than baro pid
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1528 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 02:09:54 +00:00
jasonshort 28ee251978 was adding throttle cruise twice.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1527 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 02:08:46 +00:00
jasonshort f7f0fdf945 Added ability to exit the GPS test loop.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1526 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 02:07:21 +00:00
jasonshort 6d9c271126 updated and tested the auto-trim mode of the accell offsets. Works great, although it's slow, only .6° a second.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1525 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 00:35:51 +00:00
jasonshort 8e6c8a49ef Added failsafe radio test!
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1524 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-22 20:25:14 +00:00
jasonshort 64d061a79f cleaning up the instructions for use
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1519 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-21 06:10:26 +00:00
jasonshort 02fae1d48d minor navigation updates, added new copter friendly altitude control for navigating waypoints.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1518 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-21 05:28:01 +00:00
jasonshort e26b2dab67 made I term 0 by default
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1517 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-21 04:16:11 +00:00
jasonshort b074312487 New updated CLI for setup. Cleaner and better defaults and reporting of values.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1516 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-20 07:11:21 +00:00
jasonshort 96262f3bcd changed casting
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1515 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-19 01:48:23 +00:00
jasonshort e0298b6e58 removed access to kD = use the dampener instead
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1513 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-18 19:02:54 +00:00
jasonshort cf55b0f93f updated the stabilize_dampener variable
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1512 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-18 19:00:07 +00:00
jasonshort 4c34b46e14 Added current total to the log. Logging at a lower rate. decreased size to ints.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1511 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-18 06:12:11 +00:00
jasonshort d542c75d6e Added current total to the log. Logging at a lower rate. decreased size to ints.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1510 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-18 06:11:48 +00:00
jasonshort f60602d7a9 Renamed the loop timers to gain a new medium loop delta. Fixed an issue with the navigation timer. Updated the current sensing. Need to add a low voltage or current trigger.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1508 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-18 02:48:44 +00:00
jasonshort feb3f1a811 Added support for the AttoPilot Current sensor, Logging current is enabled at 10hz,
Trim is now called again on pitch and roll, now that trimming can be done with adc_offsets. Fixed setup::motors for x frame.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1505 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-17 03:44:12 +00:00
jasonshort d7418d4fc4 removed unused EEPROMB include
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1501 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-16 03:53:30 +00:00
jasonshort 53b2560412 Flipped the signs. Should be right.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1500 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-16 02:44:30 +00:00
jasonshort 3558567aad Added new leveling command. Hold the trainer swicth - ch7- in and the copter will adjust the ADC_OFFSET based on the roll and pitch command needed to straighten the copter.
no roll and pitch input means no change. Flicking will still update the throttle cruise value. Please check I have the signs correct!!!

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1499 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-16 02:37:35 +00:00
jasonshort 78095b1dd7 Implemented new DCM based yaw independent heading controller.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1495 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-13 01:31:05 +00:00
jasonshort d1052612ac added better default value for longitude scaling
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1490 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:22:54 +00:00
jasonshort 76efe23cd7 added new FBW test to develop new nav functions
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1489 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:16:00 +00:00
jasonshort 41bdcfee48 added new PID nav functions to split lat and long based on Randy's work.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1488 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:15:08 +00:00
jasonshort fb5609d3eb added new PID nav functions to split lat and long based on Randy's work.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1487 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:15:02 +00:00
jasonshort 40b4c0d8ac added new PID nav functions to split lat and long based on Randy's work.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1486 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:14:57 +00:00
jasonshort 754c7bc710 added new PID nav functions to split lat and long based on Randy's work.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1485 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:13:30 +00:00
jasonshort 5d1df69f13 added reset I functions for new pids
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1484 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:12:57 +00:00
jasonshort 5d728c0530 deprecated older method of finding pitch and roll
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1483 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:12:29 +00:00
jasonshort 085af4f8a2 increased PitchMax to 22 to match NG
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1482 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-11 21:11:51 +00:00
jasonshort 0a07b25e39 renamed err to altitude_error
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1478 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:49:45 +00:00
jasonshort 81c44ffec7 not used
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1477 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:29:16 +00:00
jasonshort de796598bf Changed "rate" var to float from long.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1476 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:28:59 +00:00
jasonshort 1ec8861641 Moved implementation of alt hold from NG to ACM.
Tweaked the nav pitch and roll commands to no longer use bearing error.
Angle boost is now a lot less thrust. I was getting too much added thrust when pitched at 45°

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1475 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:24:26 +00:00
jasonshort 4191adec7d Added Sonar to setup, removed Level, compass is now done with text based on and off, compass renamed to mag_offset
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1474 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:21:09 +00:00
jasonshort e69075ffb7 Added Sonar throttle gains,
new default dampening gain - STABILIZE_DAMPENER - which should be equivalent to NG.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1473 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:18:49 +00:00
jasonshort 5b3830694d Added Sonar throttle PID, renamed old throttle PID
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1472 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:15:24 +00:00
jasonshort e902e8cd19 Added Sonar throttle PID
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1471 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:13:57 +00:00
jasonshort cfcc88d405 Added Sonar and Baro enumerations
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1470 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-10 02:13:23 +00:00
jasonshort 5c7b99fe33 Added Tri-copter support for Max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1421 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-04 17:55:03 +00:00
jasonshort ada5e7a75b Added Tri-copter support for Max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1414 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-04 06:54:40 +00:00
jasonshort e8cc8e08fb Added Tri-copter support for Max
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1412 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-04 06:06:26 +00:00
jasonshort 95baa14ecd Big update - motors re-assigned to new positions.
New, fabulous Yaw control.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1398 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-02 20:34:42 +00:00
jasonshort c45057a747 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1374 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-30 07:41:43 +00:00
jasonshort d95e8539d9 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1373 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-30 07:40:57 +00:00
jasonshort a412d5dda6 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1351 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-29 01:36:30 +00:00
jasonshort 250920edba fixed a bug on Yaw.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1309 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-28 01:45:43 +00:00
jasonshort 8847a8c698 fixed a bug on Yaw.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1308 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-28 01:26:05 +00:00
jasonshort 9e89ad7311 some bug fixes, added basic camera leveling example for pitch only. Added DCM test. Added better Yaw gain defaults. Split radio and RC inits into two calls. Removed inappropriate auto_trim function.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1307 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-27 23:11:01 +00:00
jasonshort 4bd32750a4 some bug fixes, added basic camera leveling example for pitch only. Added DCM test. Added better Yaw gain defaults. Split radio and RC inits into two calls. Removed inappropriate auto_trim function.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1306 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-27 23:09:08 +00:00
jasonshort 8a5d7c3fb5 added basic camera output example
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1305 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-27 23:03:53 +00:00
jasonshort c1d0d2e297 fun stuff
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1281 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-27 00:35:08 +00:00
jasonshort 383b0d623a bad throttle boost code fixed.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1280 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-26 22:30:45 +00:00
jasonshort e5bb2b419b throttle Cruise error fixed
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1279 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-26 20:04:57 +00:00
jasonshort 01ee447555 Added FlyByWire mode. Simulates Position hold using the control sticks. Untested. Reset your "modes" in setup CLI before flying this code.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1278 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-26 19:49:11 +00:00
jasonshort 4b5f5aed2e git-svn-id: https://arducopter.googlecode.com/svn/trunk@1268 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-26 05:33:19 +00:00
jasonshort 9e0ad4301a latest updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1267 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-26 05:25:52 +00:00
jasonshort 1fc9aa189e git-svn-id: https://arducopter.googlecode.com/svn/trunk@1266 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-26 05:18:25 +00:00
jphelirc 81ba0d36c2 extras file (work on progress)
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1236 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-23 14:07:03 +00:00
jphelirc 77822acbbf preparing for addon features
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1235 f9c3cf11-9bcb-44bc-f272-b75c42450872
2010-12-23 14:05:59 +00:00
analoguedevices 95d683d043 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1191 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-19 16:40:33 +00:00