rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity
4,517 Commits 5 Branches 8 Tags 266 MiB
6350ec575e
Commit Graph

367 Commits

Author SHA1 Message Date
James Cotton
10e55c25bc OP-475: More changes to get the FlightStatus object to work for Armed and 
FlightMode
 2011-05-07 15:06:04 -05:00
James Cotton
80c839d5bb OP-475: Starting to use the new FlightStatus object 2011-05-07 13:17:21 -05:00
James Cotton
e2819c6815 Restructure the ManualControlCommand code to be much more readable. Also 
facilitates the new FlightMode object.
 2011-05-07 12:43:27 -05:00
James Cotton
d1fb254a41 Merge branch 'master' into bugfix-flight 2011-05-07 06:56:54 -05:00
James Cotton
fef1e2dc2e Merge remote-tracking branch 'origin/OP-174_Sambas_BaroAlt_to_ETOSD' 2011-05-07 04:41:13 -05:00
Corvus Corax
5f749dda7e Modules/ManualControl: bugfix GCS Control was broken due to connection state and arming being checked outside of the "object_writable()? {}" if clause 2011-05-06 01:26:34 +02:00
James Cotton
7e418866be Update the AttitudeSetting object to make the board rotation more human 
readable and update the GCS fields appropriately.
 2011-05-05 13:04:56 -05:00
James Cotton
dd36192e37 Merge branch 'bugfix-flight' 2011-05-05 00:36:55 -05:00
James Cotton
93d8449814 OP-474: When throttle < 0 and "spin while armed" mode enabled don't take into 
account stabilization or stick - stay at neutral
 2011-05-05 00:32:15 -05:00
James Cotton
05684e966b OP-470: Make arm/disarm threshold 50% instead of 90% 2011-05-04 22:53:00 -05:00
James Cotton
401a989c63 OP-474: Add option to ActuatorSettings to allow people to request their propellers always spin an neutral when armed (I don't recommend this). 2011-05-03 00:08:39 -05:00
James Cotton
9daca1ac41 OP-469: Wasn't paying attention and missed a line 2011-05-02 22:22:57 -05:00
Corvus Corax
8d8144f233 OP-441 Prevent double alarm set ( setFailsafe() already sets alarm to CRITICAL ) 2011-05-02 18:00:12 +02:00
James Cotton
9afedc0139 OP-469: Fix a bug I wrote where MaximumRate instead of ManualRate was used to 
scale sticks in rate mode.
 2011-05-02 04:33:32 -05:00
James Cotton
d9221fac06 Merge remote-tracking branch 'origin/OP-452_InputConfiguration' 2011-05-02 03:40:59 -05:00
David Carlson
341dbd7ad9 Change blink rate to Hz rather than 1/2 Hz. As per comments in review OPReview-18. 2011-05-02 00:50:42 -07:00
David Buzz Carlson
edd5ad8a78 Update Stat LED blink rate when armed to 5 Hz from its current 1 Hz. This allows a more drastic change in LED behavior to highlight that the aircraft WILL NOW CUT YOUR FINGER OFF IF YOU DON'T RESPECT IT!! 2011-05-02 00:50:42 -07:00
James Cotton
62e3d35a97 OP-452 Read the channel times even if a bad mixer is configured 2011-04-29 17:57:04 -05:00
Sambas
2413fd451f OP-174 ET OSD: barometric altitude works now, units must be set metric with E-Logger 2011-04-29 19:08:28 +03:00
Corvus Corax
8c7f3e2720 OP-435 #ifdef covered one command too many - bugfix 2011-04-25 18:37:28 +02:00
Corvus Corax
eb9ccc2f9b OP-383 Review 11 : Removed commented out unused variables as directed by review 2011-04-25 16:36:23 +02:00
Corvus Corax
cdb6b65e64 Merge branch 'master' into OP-383_Edouard_CPUSerial_in_FirmwareIAP 2011-04-25 02:36:44 +02:00
Corvus Corax
5d952f81e3 PIOS: BL_HELPER: refactored function names 2011-04-23 21:11:17 +02:00
Corvus Corax
150464344d BL_HELPER: call CRC_Ini() from within CRC check function 2011-04-23 20:55:21 +02:00
Corvus Corax
357bc369db PIOS: Bootloader Helper functions should sit in HAL, not duplicated in every single architecture. 2011-04-23 19:40:41 +02:00
Corvus Corax
192e31986d PIOS, Modules/FirmwareIAP: Use correct HAL for CPU serial 2011-04-23 18:30:32 +02:00
Corvus Corax
2bf7ea2271 Modules/GPS: Make code to deal with home location optional to allow a sleeker GPS module for RAM challenged systems 2011-04-23 16:49:07 +02:00
elafargue
e4112e210f Reduce size of FirmwareIAPObj to 40 bytes: only takes the 40 first bytes of the firmware description, ignores the rest. Makes the FWIAP UAVObject more decent size-wise, and does not break USB TX anymore. 2011-04-19 20:45:49 +02:00
elafargue
45e92d654e Implemented support for the Unique STM32 CPU serial number in the firmwareIAP object. 2011-04-19 00:31:20 +02:00
peabody124
3afdc7e41c CC-24: Rotate the CC board at any angle relative to "flat and level" with GCS 
config plugin updates.  Has not been tested in flight yet although seems
sensible so please be careful when using this code.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3166 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-04-15 06:37:16 +00:00
pip
33d9d31082 Modified manual control input value checking to determine RC connection state - was previously checking only the throttle channel for semi-valid input range, it now checks the Throttle, Roll, Yaw and Pitch channels for full-valid values (manual value is within min and max values). 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3146 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-04-10 14:00:46 +00:00
corvus
da76192e47 Modules/Guidance: Bugfix in Position-Hold code 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3112 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-31 20:08:14 +00:00
peabody124
a57c289b3a CC-24: Support mounting CC at any angle by applying a rotation. Now need to 
rotate sensors to make sure stabilization behaves well so don't use till then.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3100 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-29 02:15:57 +00:00
peabody124
48c20d37a9 OP-349 CC-32: Added a Completed operation that is returned after successful 
save or load

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3093 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-28 19:16:50 +00:00
peabody124
bd5925d526 CC-35: Separate term for CC yaw bias rate and others 
Note: AttitudeSettings changed so you'll need to re-zero it

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3090 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-28 18:42:48 +00:00
peabody124
4120937391 OP-364 OP-191: Convert the OPMap setting of HomeLocation to mGau to match the 
changes in flight code

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3083 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-28 10:40:26 +00:00
peabody124
3fc88f69e2 Covering a case that should not occur 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3081 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-26 21:02:43 +00:00
edouard
bce3d21a0f Fix FirmwareIAP module, as it failed to reset the board if the object was queried before for other purposes. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3080 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-26 12:00:08 +00:00
peabody124
e262e3c220 Convert outer position controller to PI 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3077 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-26 11:40:33 +00:00
fredericg
662a3e5cc8 OP-361 Also parse ZDA message in order to get GPS time info with new GTOP FW 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3074 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-26 11:13:11 +00:00
peabody124
eafcf35fa6 Reenable position hold 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3072 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-25 20:17:31 +00:00
edouard
f19b0efc6f CC-40 Implemented support for FirmwareIAP on Coptercontrol: you can now use the "Halt" command on the uploader gadget. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3070 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-25 13:50:13 +00:00
chebuzz
2e5863281c CC/Stabilization - Fix attitude bias not being applied over all sampled quantities 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3065 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-24 17:12:04 +00:00
fredericg
b37dd770d2 Use attitudeActualData.Yaw for course 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3064 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-24 10:56:20 +00:00
jonathan
160695e546 OP-191: Merge from full-calibration branch. Add the local gravitational field strength to the home location. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3055 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-21 00:48:32 +00:00
fredericg
d270f7e987 Changes to FlightBatterySettings as discussed in forums 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3047 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-19 18:45:40 +00:00
FredericG
ea512a3da7 OP-322 Implement Audible alarm via PWM - Different tune for GPS and Battery Alarm 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3035 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-13 17:02:19 +00:00
peabody124
b76a235940 OP-317: Fixed the FirmwareIAP resetting the AHRS board. Sorry this took me so 
long to do.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3029 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-12 09:08:12 +00:00
FredericG
c3732bad93 OP-322 Implement Audible alarm via PWM - handle new "PWM Alarm Buzzer" channel type 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3028 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-12 09:02:02 +00:00
FredericG
5bdf836027 OP-324 No code change; commented debug-code 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3026 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-12 08:55:45 +00:00
FredericG
baf0850690 OP-336 CPU usage calculation incorrect when armed - no measure the time between calculations 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2987 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-06 11:50:54 +00:00
FredericG
5554973cea OP-174 ET OSD support - fix for writing configurations - temp workaround for what seems to be an issue with I2C driver OP-305 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2986 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-06 11:19:29 +00:00
osnwt
8d085552fb CC: Modules/Attitude/attitude.c: unused headers removed (do we have another?) 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2967 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-04 21:12:37 +00:00
osnwt
e9d507dd3e CC: Fixed compilation error after uavobject rename 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2966 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-04 20:56:58 +00:00
FredericG
32c7596636 OP-324 Make NMEA parser more resilient to corrupted messages - For the new GTOP GPS FW, parsing of the VTG message is needed to get Heading and GroundSpeed 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2960 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-04 07:57:18 +00:00
FredericG
c890f596e4 NMEA: minor change to debug-messages 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2953 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-03 19:53:10 +00:00
scott
f1ee47dcff Added #include "pios_config.h" to make sim_posix build again. Some alarm constants were missing. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2945 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-03 05:09:11 +00:00
vassilis
b084ea7ea1 FlightPlan/Python: Updated object generator to create a Python file for each UAVObject. It is now possible to access all UAVObjects from the FlightPlan Python scripts. 
Warning: The memory utilization when importing objects is unacceptably high making it unusable in the flight code at this point. It can be however used with the SITL simulator. Some more investigation is needed to understand why several kb of memory are used each time a module is imported (even before any functions are called or objects from the module are created). 


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2938 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-03 02:22:50 +00:00
peabody124
3b13ad6859 OP-329: Enumerate more possible flight modes now like multiple stabilization 
modes so that the FlightMode field is complete in terms of being informative
enough

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2935 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:44 +00:00
peabody124
915ae1ae3c OP-313 Account for which axis are in rate and none to get the desired 
quaternion

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2933 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:38 +00:00
peabody124
8930ec01de OP-313 Quaternion based stabilization, gets rid of lots of checking angle 
signs, should be stable for all orientations

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2932 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:34 +00:00
peabody124
3488d28a5b Whitespace fixes 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2931 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:30 +00:00
peabody124
3e17c2ff55 OP-312: Create a StabilizationDesired object that is the generic input to 
Stabilization, carries the desired rate or attitude as well as a flag on how to
intepret it.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2930 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:27 +00:00
peabody124
672b9ce961 Convert failure to mount SD card to an error so you can't arm with an 
unconfigured quad

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2929 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-02 01:25:23 +00:00
pip
beedb7fdad Added center stick deadband code - currently deadband is set to '0' so not used) 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2927 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-03-01 21:43:20 +00:00
FredericG
7d679e01f0 ET-174 Adapted ET OSD Drv to current GPS coordinate format 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2910 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-27 19:58:34 +00:00
FredericG
0124c42b8c OP-324 Make NMEA parser more resilient to corrupted messages - WANRING: NMEA parser refactored - VTG and ZDA messages no longer interpreted 
Sometimes corrupted NMEA messages can get passed the NMEA "CRC" check and this caused the NEMA parser to crash because it assumed that the correct amount of parameters are present.
Now the NMEA message is split into its different parameters before it is passed to the message-specific parser. Hence the function-signature of the parser functions has changed and the implementations of these functions has changed. 
I also decided to no longer interpret the VTG and ZDA because they do not contain more data than the other messages that are being parsed.
Not tested in flight, and could not test the TOP message.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2904 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-27 13:45:19 +00:00
peabody124
ea390d0b90 CC-26: Add accel bias term. Note it's units are LSB, not m/s^s 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2895 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-26 22:21:44 +00:00
osnwt
899c1fe0bf Moved CPU and heap alarm thresholds into pios_config.h. 
Fixed heap thresholds for the CC (prevented arming).

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2886 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-26 11:46:39 +00:00
pip
4b4d9043fb Set PDOP and VDOP to 99.99 in binary mode (theose values are not available in binary mode). A couple of cleanups too. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2874 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-24 10:55:45 +00:00
andrew
84c26f8905 OP-84 
Battery module for Power Sensor version 2
made a few variable declarations static so things work again after changes to make this module not run in it's own thread.

Fixed the energy consumed calcs to scale correctly.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2870 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-24 05:05:17 +00:00
pip
bee704176b Fixed a bug when scanning for start of packet. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2861 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-23 10:11:26 +00:00
pip
e9d7ab09be Improved efficiency (a lot) when scanning for and locking onto the start of a GPS binary packet. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2858 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-23 09:24:17 +00:00
pip
e7850ab25e Corrected scale for lat/lon - was out by a factor of 10 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2846 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 14:16:16 +00:00
pip
f6370a035d 'Slightly' more efficient binary packet handling. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2845 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 12:45:51 +00:00
pip
9da0fb47e2 Reduced GPS command resend to 2 second time-out, a few more white space corrections. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2844 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 12:32:08 +00:00
pip
3881c652c1 Simplified the binary code a little, added a 300ms delay after sending a FULL COLD RESTART to the GPS (IF we do that is), fixed some spelling mistakes. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2843 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 12:15:25 +00:00
pip
9d14723dcc Commenting tidy upping 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2842 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 11:32:24 +00:00
pip
d1d165adff More white space/tab corrections. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2841 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 11:19:12 +00:00
pip
0fd6170979 added another "#ifdef ENABLE_GPS_NMEA" 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2840 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 11:02:17 +00:00
pip
a2259201e5 removed tabs after spaces. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2839 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 10:55:01 +00:00
pip
414836a4c9 Added another parsing_errors++ line. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2838 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 10:36:27 +00:00
pip
4547013901 Added GTOP BINARY mode to the GPS module. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2837 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-22 10:16:50 +00:00
FredericG
42cf204dcd correctly detect 100% load 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2836 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-21 21:50:10 +00:00
peabody124
5f2c502172 Arm checks: Simply don't check GPS because the dependence on AHRS Settings 
breaks CC.  This should be done by the GPS alarm being set only when
appropriate (i.e. by AHRS on OP when needed) and not by the GPS module.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2824 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-21 05:58:24 +00:00
pip
0c48fe258a Changed alarm level checking from WARNING level to ERROR level before allowing arming. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2822 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-20 19:34:27 +00:00
pip
88cf1e276a Ignore Telemetry alarm when arming (telemetry alarm no longer prevents arming). 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2821 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-20 17:53:03 +00:00
pip
df26016c64 Added alarm check when trying to change state to ARMED mode (from DISAMRED mode), if any warnings are set then it will not go into ARMED mode - unless the GPS is not required, in which case the GPS alarm will be ignored (if using Simple or Indoor AHRS modes). These checks are done in the okToArm() function. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2820 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-20 16:42:31 +00:00
sambas
8d6f320fca Handle I2C defines better, needed in CC for now 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2815 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-20 07:14:02 +00:00
FredericG
c9060393e5 OP-302 Remove threads from modules that do not need them - Battery Module 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2812 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-19 18:56:52 +00:00
FredericG
374e822f79 OP-302 Remove threads from modules that do not need them - ET OSD module 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2811 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-19 13:25:27 +00:00
FredericG
c5f814a931 ET OSD, WIP, measure timing 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2810 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-19 10:18:00 +00:00
pip
9a2bdac49c Reduced CC CPU usage from 57% to 46% by moving the floating point multiplies outside of the accelerometer downsample/averaging loop in the updateSensors() function. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2809 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-19 09:33:03 +00:00
corvus
435072cf4e Modules/Stabilization, Modules/ManualControl: 
Move channel StabilizationSettings from ManualControlCommand to
AttitudeDesired, unify channel normalization and put them all into ManualControl

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2797 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-15 14:55:00 +00:00
stac
3fda65c5d3 hwinit: Convert SPI drivers to dynamic init 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2772 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-12 22:19:50 +00:00
stac
841b0d3d6d hwinit: Convert COM and USART to dynamic init 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2771 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-12 22:19:43 +00:00
peabody124
8498512855 CC-20 Attitude initialization: Make sure no divide by 0 condition possible 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2761 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-08 16:34:55 +00:00
peabody124
9f71f4121c CC-18 Attitude: Change units to proper engineering ones. An accelKp=1 means 
that it will completely follow the accel attitude each cycle and is way too
high.  Ki=1 means the gyro bias wil be correct by accels each cycle (way too
high).

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2755 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-08 16:34:35 +00:00
peabody124
cfe295377c CC-18: Normalize the gravity vector to unity gain 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2754 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-08 16:34:31 +00:00
peabody124
74cc7dbfc9 CC-20 Attitude: Jack up Kp and Ki values for first 5 seconds to force faster 
convergence of gyro bias, then the normal values can be lower.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2753 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-08 16:34:28 +00:00
peabody124
03fb82ad0a CC Attitude: Change when AttitudeRaw is set to end of attitude estimation, 
because this is what is determines when the Stabilization code executes.
Because we aren't oversampling gyros relative to the PID in CC we should set
the attitude first (computational time to do so is negligible).

Also change update rate to 500 Hz.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2750 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-08 16:34:18 +00:00
FredericG
d7fc7646b0 OP-246 UAVOBJ CHANGE - Setting to disable arming/disarming 
options="Always Disarmed,Always Armed,Roll Left,Roll Right,Pitch Forward,Pitch Aft,Yaw Left,Yaw Right" defaultvalue="Always Disarmed"

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2744 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-06 16:16:20 +00:00
peabody124
f97d853c80 Make the PriTx queue optional which saves 700 bytes 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2729 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-05 10:52:52 +00:00
peabody124
efca295ea0 Modules/Guidance: Fix a bug Corvus caught 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2727 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-05 01:14:55 +00:00
peabody124
04f54928d6 Modules/Guidance: Fix a bug Dale caught about not grabbing settings and also 
correct a typo when NedAccel.Down wasn't used.  Finally increase stack size of
guidance task.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2718 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-03 20:00:00 +00:00
peabody124
e5b26bc67d More memory tweaks to keep CC flowing 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2709 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-03 02:42:49 +00:00
peabody124
fedadb1275 CC-8: Move the queue registration into the ADC PIOS driver to allow other 
functions to use it easily

Conflicts:

	flight/Modules/Attitude/attitude.c

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2707 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-03 02:42:43 +00:00
peabody124
810fa70856 UAVObjects: Remove the raw versus filtered fields in the sensor data. Save 
some memory.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2706 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-03 02:42:39 +00:00
peabody124
c95a6447bf CC-8 Whenever the gyro data is updated the callback now pushes the data onto a 
queue, which update sensors waits for.  This confirms one update per gyro
update.  All available accel data will be pulled off each time.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2705 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-03 02:42:33 +00:00
peabody124
986e124202 CC-7 Reverse order of two lines so that yaw bias converges instead of diverges 
:-)

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2693 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-02 09:16:28 +00:00
peabody124
265737427b CC-7: Make the gyro scale adjustable (for now at least, this was largely for 
debugging, let's compare values).

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2692 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-02 08:57:42 +00:00
peabody124
1663a838ff CC-7 Full complimentary filter ala Mahoney paper using quaternion 
representation.  Also improved gyro bias initialization.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2691 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-02 08:57:38 +00:00
peabody124
cf2e9fb349 Memory: Also allow overriding Stabilization stack size 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2690 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-02 08:57:34 +00:00
peabody124
77ce0d6391 Actuator: Fix bug I made a while ago that stops servos going negative values 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2677 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 21:05:00 +00:00
peabody124
f93ed5f01f CC Module memory: Make it clean for CC to override the stack sizes of modules 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2668 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:18:35 +00:00
peabody124
b1e4b65f3d CC-1 Bigger oversampling window for CC sensor data 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2667 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:18:31 +00:00
peabody124
1c6b51b704 UAVObjects/AttitudeSettinsg: Object for CC to tune the attitude estimation 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2666 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:18:26 +00:00
peabody124
15f3ada700 Get rid of ms * 10 units since the time resolution of FreeRTOS is in ms 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2665 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:18:22 +00:00
peabody124
3f088bed8d CC-9 1. Improve the timings of the attitude estimation 
2. Disable FirmareIAP module in CC (somehow causes lockups when also using vTaskDelayUntil in Attitude WTF)
3. Make the SPI bus run a little faster so we can handle the 3200 Hz from accel
while running the filter at 333 Hz

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2664 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:18:19 +00:00
peabody124
1d2ad6e9cb Telemetry: Move the telem stack size to the board definition file since CC 
needs less

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2659 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:59 +00:00
peabody124
c9207b3754 CC-14 PIOS/Servo: Set more than two bank speeds 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2658 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:55 +00:00
peabody124
200f9a7247 FirmwareIAP: Whitespace fix, spaces to tabs 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2657 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:51 +00:00
peabody124
1cf7555b7d CC-10 Rename CCAttitude to Attitude. If there are alternative ones we will 
just have nested subdirectories of Attitude

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2655 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:40 +00:00
peabody124
85d42868d6 CC-10 Rename the TaskInfo and Alarm field for CCAttitude to Attitude 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2654 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:36 +00:00
peabody124
063c58e7c0 CC-12 Enable Watchdog on CC 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2653 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:32 +00:00
peabody124
037a63ee1d CC-1 CC-8 Cache the oversampled gyro value and use that to get rid of glitches. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2652 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 02:17:27 +00:00
peabody124
29ad7b3017 CC-13 Get FirmwareIAP reset working on CC 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2649 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 01:55:54 +00:00
peabody124
42b21a2697 OP-300 FirmwareIAP: Change to use event dispatcher callback to determine when 
to reset OP (sends reset command to INS)

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2648 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-02-01 01:55:43 +00:00
FredericG
a8bd4d28ad OP-174 ET OSD, do not return from task, the system seems to crash when you do that; anyway the thread will be removed 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2625 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-29 17:47:40 +00:00
sambas
ba5ebb6b13 OP-303 PIOS/Sonar: preliminary support for HCSR04 ultrasound altimeter module, tested and working :) 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2610 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-28 19:21:22 +00:00
peabody124
3b0be12b67 OP-291 PIOS/Servo: Fix a few interrupt mappins for OP 
Also keep the priority of actuator at idle+4, dropping it down slipped through

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2580 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:52:20 +00:00
peabody124
d2f3e0d379 CC-6 Initial code for the flash chip on CC 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2578 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:52:14 +00:00
peabody124
d4b4a6ca37 CC-3 Modules/CCAttitude: Add oversamplign to the accel data 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2576 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:52:08 +00:00
peabody124
cef46edafd Manual Control: Drop the AHRSSettings dependency to bring task memory down 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2574 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:52:03 +00:00
peabody124
e16b1bffa9 CC-3 Remove unused code from CCAltitude 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2572 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:56 +00:00
peabody124
d5ccb59b5a CC-3 CC Complimentary filter: Strip out some unused code and get the sampling 
rate up

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2570 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:51 +00:00
peabody124
99fcd089d4 OP-291 PIOS/Servo: Make the remapping of timers a part of the driver structure 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2569 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:48 +00:00
peabody124
da96ce15b9 OP-256 PIOS/PWM: Converting PWM input to use standard driver structure. 
Beginning of unifying the input types into PIOS_RECEIVER.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2568 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:45 +00:00
peabody124
108ea8c959 OP-295 Get CC pin mappings consistent for using the temperature sensor 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2565 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:34 +00:00
peabody124
edced9177c OP-291 PiOS/Servo: Converting output to use driver system 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2564 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:32 +00:00
peabody124
80c97ddfd0 CC-2 CC-3 Modules/CCAttitude: Flip the up-down convention of the board 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2563 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:29 +00:00
peabody124
c55d40bdbc CC-3 Setting up monolithic task template to keep code size down. Importantly 
switch to heap_1.c which saves a lot of money.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2561 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-24 07:51:22 +00:00
FredericG
f7e6f998ca OP-288 Slight simplification of the ManualControl module 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2548 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-23 18:38:00 +00:00
vassilis
b297ef0ae5 Flight/FlightPlanner: First release of openpilot.py library giving access to RTOS and debug fields. Implemented STOP command, this should be the normal way for stopping scripts. The KILL command should be only used as a last resort for misbehaving scripts. The KILL command will delete the VM thread. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2535 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-22 21:32:23 +00:00
peabody124
bcdd87689a OP-295 Modules/SystemMod: Get the internal CPU temperature sensor and store in 
system stats when available

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2511 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-21 17:18:24 +00:00
peabody124
2d9f7f32d1 OP-291 PiOS/Servo: Converting output to use driver system 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2499 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-21 03:40:21 +00:00
cwabbott
e73da04cc6 PiOS.win32: changes according to rev 2480, fix compile error in manualcontrol.c, add vTaskDelete() to win32 FreeRTOS. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2484 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-19 23:52:11 +00:00
vassilis
d7fd8a3bcd Flight/FlightPlan: Enable Python VM and test flightplan execution. From now on a Python executable needs to be in the system path as it is used in the Makefile. 
A test script is statically linked (will eventually be uploaded by the GCS and stored in the VM), it can be found under: Modules/FlightPlan/flightplans/test.py

To start the script send the FlightPlanControl object with the Start command, to stop send the Stop or Kill commands.

Next release will be the OpenPilot python libraries and access to UAVObjects from the script.



git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2480 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-19 03:34:01 +00:00
osnwt
780f441ae9 OP-289/Flight: do not use RC input if disconnected. Quick fix until better arming system is designed. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2479 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-19 00:01:33 +00:00
FredericG
76420d7972 OP-288 Simplification of ManualControl code 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2478 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-18 19:30:50 +00:00
peabody124
56dd0569b8 CC-2 Complimentary filter working on copter contol, nice attitude 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2475 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 08:45:43 +00:00
peabody124
cf17569de7 CC-1 Modules/CCAtttitude: Calling the ADXL345 library and getting the accel and 
gyro data into attitude raw.  Hardcoded calibration for now.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2474 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 08:45:40 +00:00
peabody124
211585c7d7 CC-1 Modules/CCAttitude: Initial reads from accelerometer 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2472 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 08:45:34 +00:00
andrew
ce87b8f05a OP-274 
Fixed Changing of Debug port baud rate only to occur when debug is enabled
Fixed brief in header file

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2470 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 04:02:37 +00:00
peabody124
8959007a38 Flight/Actuator: Log the longest update of motors in ms, not ms * 10 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2467 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 02:11:05 +00:00
cwabbott
7f8ea5e55a PiOS.win32: updates to get it compiling again. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2462 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-17 00:00:41 +00:00
edouard
b3ca037308 OP-277 Update all files to use a BOARD_TYPE and BOARD_REVISION scheme through the whole codebase. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2458 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-16 20:41:55 +00:00
FredericG
c2613ffa88 Spaces->tab no code change 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2456 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-16 18:49:27 +00:00
FredericG
3f1ad074df OP-246 Configuring arming/disarming; using field to ManualControlSetting to define which channel is used for arming or to disable arming 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2455 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-16 18:17:30 +00:00
peabody124
33f3500e64 CC-3: New module for copter control 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2441 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-16 02:45:27 +00:00
peabody124
9cf3ee9fb3 OP-267 Flight/UAVObjectManager: Make all references to DFS function depend on 
PIOS_USD_SDCARD.  However, this needs to be cleaned up and abstracted out of
the UAVObjectManager who shouldn't care about the storage layer.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2417 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-14 01:38:27 +00:00
peabody124
940792db5c OP-265 CopterControl: Fork main OpenPilot directory 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2416 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-14 01:38:24 +00:00
peabody124
fc54159369 OP-265 Flight reorganization of UAVObjects and Modules up a directory 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2415 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2011-01-14 01:38:19 +00:00
gussy
ac1a73800b Moving Modules into OpenPilot directory. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@236 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2010-03-04 05:58:03 +00:00
vassilis
94d3c1a3f1 Added support for event callbacks (as an alternative to task event queues) 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@234 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2010-03-04 03:04:39 +00:00
vassilis
93901e8754 Refactored UAVObjects and UAVTalk for reduced memory footprint, added support for multiple instances within objects (useful for array objects, e.g. waypoints). Still not fully tested. 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@199 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2010-02-27 19:57:45 +00:00
vassilis
b1b8fe4b37 Creation of UAVObject ,UAVTalk and Telemetry modules (compiles but untested!) 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@196 ebee16cc-31ac-478f-84a7-5cbb03baadba
 2010-02-22 02:18:23 +00:00