dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
2,819 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

1533 Commits

Author SHA1 Message Date
Simon Wilks b9009390d7 Merged and tested against the single wire implementation added to Nuttx r5554. 2013-01-24 23:26:12 +01:00
patacongo 25e9b8d084 Fix poll/select issue reported by Qiang 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5559 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 19:19:38 +00:00
patacongo 91504abf89 Add psock_poll(); Fix some warnings reported by Lorenz Meier; lm4f logic from JP 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5558 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 18:41:46 +00:00
patacongo 888306f728 Add psock_poll(); Fix some warnings reported by Lorenz Meier; lm4f logic from JP 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5557 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 18:39:53 +00:00
patacongo f914a90556 apps/examples/nettest and poll: Complete Kconfig files 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5556 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 16:28:15 +00:00
Lorenz Meier f21d406cbe Added additional example 2013-01-24 16:53:31 +01:00
patacongo ad65a04617 Convert configs/olimex-lpc1766stk/nettest to use kconfig-frontends 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5555 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 14:14:44 +00:00
px4dev 379ed0a092 Trivial compile fix. 2013-01-24 00:22:01 -08:00
px4dev 35febbe844 Merge Nuttx r5554 2013-01-23 23:56:24 -08:00
px4dev b60a744b77 Merge pull request #175 from tridge/apps_bindir 
px4: enable APPS_BINDIR support
 2013-01-23 23:18:16 -08:00
px4dev 2a44ea30c2 Merge pull request #174 from tridge/vdprintf 
stdio: added vdprintf() for printf to a file descriptor
 2013-01-23 20:31:33 -08:00
px4dev 1ce1d4460b Merge pull request #183 from PX4/nuttx-merge-5527 
Nuttx merge 5527
 2013-01-23 18:46:12 -08:00
patacongo 63f8c0a954 Add option to used keyboard CODEC in apps/examples/keypadtest 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5554 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-23 23:11:13 +00:00
patacongo 340a72b7cd Add logic to retain child task exit status if so configured 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5553 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-23 22:23:46 +00:00
patacongo f86f863834 Add single-wire UART support to STM32 serial driver 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5552 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-23 14:38:13 +00:00
patacongo b10238efee Missed changed from last lpc1788 check-in 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5551 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-23 00:19:46 +00:00
patacongo 3cb33101a9 Add lpc178x_iocon.h from Rommel Marcelo 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5550 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-22 23:54:31 +00:00
patacongo 336f91b4e6 lpc1788 update from Rommel Marcelo; Beginning of logic to retain child exit status 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5549 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-22 23:42:51 +00:00
Simon Wilks 8ba3fbd0a3 Merged 2013-01-22 22:16:41 +01:00
patacongo 7dad51762d Use of BASEPRI to control ARM interrupts is now functional 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5548 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-22 16:09:10 +00:00
patacongo 9375b285f2 More logic to use BASEPRI to control interrupts -- still doesn't work 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5547 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-22 14:37:17 +00:00
patacongo 4742f55507 Add option to use BASEPRI instead of PRIMASK to disable interrupts in all ARMv7-M architectures 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5546 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-22 01:25:40 +00:00
patacongo e504d643fc Beginning of support for LCD1602 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5545 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-21 22:46:37 +00:00
Simon Wilks ecd01dc2e8 We aren't using RS485 but single wire. 2013-01-21 23:31:12 +01:00
patacongo 41b7f883e5 LM3S OpenOCD configuration from Jose Pablo Carballo 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5544 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-21 16:56:29 +00:00
patacongo aa88fc315e poll was not checking if the socket was still connected 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5543 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-21 14:17:11 +00:00
Andrew Tridgell 96fa586589 px4: enable APPS_BINDIR support 
useful for APM startup script
 2013-01-21 07:43:47 +11:00
Andrew Tridgell 724252768c stdio: added vdprintf() for printf to a file descriptor 2013-01-21 07:41:56 +11:00
patacongo 70cab4d797 Centralize TCP loss-of-connection bit twiddling 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5542 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-20 17:21:42 +00:00
patacongo 28a0cf4aa0 Yet another repair for the previouis botched recvfrom() fix; Fix telnet driver: It needs to break out of the read loop if 0 (meaning not conneced) of a value < 0 (an error) is encountered. 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5541 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-20 00:41:33 +00:00
patacongo 598b4b2879 Minor tweak to last bugfix 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5540 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-19 19:45:08 +00:00
patacongo 1094575ce5 Fix a bug where recv[from]() would hang when remote host gracefully closed connection 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5539 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-19 19:18:44 +00:00
patacongo 070651221f Add split package logic to improve TCP send performance with delayed ACKs 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5538 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-19 16:40:43 +00:00
Lorenz Meier a10ff0fe1c First round of testing successful - back to I2C code from Dec / Nov 2012 2013-01-19 14:52:33 +01:00
Lorenz Meier c15093bb55 Bringing back old I2C code, just temporary workaround 2013-01-19 12:52:25 +01:00
patacongo 53e8b454bf Add configuration for Wave Share Open1788 (fragmentary) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5537 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 22:42:37 +00:00
patacongo eb1e5b46af Add vectors for the LPC1788 - from Rommel Marcelo 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5536 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 21:05:17 +00:00
patacongo a79a2bfbd6 More LPC1788 register definitions from Rommel Marcelo 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5535 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 20:25:32 +00:00
patacongo 40041c8792 Refactor all lpc17xx header files (more like STM32 header file structure now) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5534 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 19:16:44 +00:00
patacongo 3ff155d048 Beginnings of definitions for the LPC1788; convert olimex-lpc1766stk to use kconfig-frontends 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5533 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 16:37:37 +00:00
patacongo 55b9700d59 STM32 I2C changes from Mike Smith 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5532 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 13:34:09 +00:00
px4dev bc35bb23dd HOTFIX: disable interrupt-driven I2C mode, configure pessimistic I2C timeout, correct handling of the NAK generation for I2C master reads. 
This looks like it addresses the recent I2C lockup issue, unfortunately it also increases CPU consumption by ~5% for the I2C sensor bus.
 2013-01-18 00:43:57 -08:00
patacongo 76753ad9cb Add internal API task_reparent(), used in posix_spawn(). Move libc/spawn/lib_ps.c to sched/task_posixspawn.c; Move libc/spawn/spawn.h to include/nuttx/spawn.h 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5531 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-18 01:52:42 +00:00
patacongo 2f653578c6 Misc bug fixes related to NSH file execution 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5530 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 20:25:32 +00:00
patacongo 19e43efe23 NSH will now run files from the file system; Add logic to unload and clean-up after running a task from a file system; Extensions to builtin apps from Mike Smith 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5529 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 18:32:13 +00:00
patacongo e9d0885500 Add logic to automatically unload module on exit; Several patches from Mike Smith 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5528 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 14:43:55 +00:00
px4dev 8685f63c72 Some gentle massaging to get things building again. 2013-01-17 01:18:18 -08:00
px4dev 1a532d16dd Merge NuttX r5527 2013-01-17 01:00:46 -08:00
px4dev 7d7c352fb4 Merge pull request #162 from PX4/windows_build_fix 
Windows build fix attempt
 2013-01-17 00:07:51 -08:00
patacongo caeef71797 Change the way thread priority is handled in binfmt/ to better match the way that priority is set up for the builtin tasks 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5527 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 00:30:12 +00:00
patacongo e7e1c6aee0 convert configs/sim/nsh to use kconfig-frontends 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5526 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 21:38:00 +00:00
patacongo a568e1e63a Add a binary 'loader' so that builtin applications can be executed from the BINFS file system 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5525 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 19:08:23 +00:00
patacongo 38efdf0ce3 Rename apps/include/apps.h to builtin.h. Move parts of apps/builtins/exec_builtin.c to binfmt/libbuiltin/libbuiltin_utils.c 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5524 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 17:05:00 +00:00
patacongo 4f7967b4c6 apps/builtin/binfs.c moved to nuttx/fs/binfs/fs_binfs.c 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5523 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 15:41:27 +00:00
patacongo 77efc9f9cd BINFS now supports open, close, and FIOC_FILENAME ioctl 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5522 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 14:14:14 +00:00
px4dev ab0459c1f4 Pass the absolute path to the compiler/assembler so that error messages include enough information for an IDE to find the file. 2013-01-15 23:03:47 -08:00
Lorenz Meier 07114f0a32 Windows build fix attempt 2013-01-15 23:17:12 +01:00
patacongo fcb316906d Implement redirection of output from NSH builtin commands to a file in a mounted volume 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5521 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-15 21:01:37 +00:00
patacongo 90a72e97d3 Implement vfork() for the MIPS32 architecture 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5520 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-15 15:40:18 +00:00
patacongo f55cabeb59 Don't build drivers/mtd unless CONFIG_MTD is defined (Denis Carikli) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5519 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-15 00:03:58 +00:00
patacongo 87b33d3546 Configre configs/ubw32/ostest to use kconfig-frontends 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5518 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 22:06:19 +00:00
patacongo cc3614dfe8 Finish dup logic for open files; fix bug in sigtimedwait(), would return wrong signo value if the signal was already pending 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5517 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 19:22:32 +00:00
patacongo 930f9a1351 Add support for dup2'ing files. Infrastructure and ROMFS done. Still need FAT, BINFS, NXFFS, and NFS 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5516 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 15:42:03 +00:00
patacongo b3f3dd123c Use SIGCHLD with waitpid(); implemented wait() and waitid() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5515 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 18:53:00 +00:00
patacongo ffda55b34a Cosmetic cleanup from SIGCHLD changes 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5514 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 00:35:47 +00:00
patacongo b58281cab8 Fix a *critical* bug in the task exit logic. Implements SIGCHILD 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5513 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-12 19:58:45 +00:00
patacongo db161f73bc Documentation update 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5512 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 21:51:54 +00:00
patacongo 43e22b2b98 Fix an error handling bug in the fread logic 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5511 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 19:08:51 +00:00
patacongo e7a5090e55 Various changes while debugging posix_spawn 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5510 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 16:53:44 +00:00
Simon Wilks 64925c33cd Merged 2013-01-11 16:52:42 +01:00
patacongo b26d1e1453 Update STM32 F1 DMA to parity with F2/F4 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5509 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 13:30:23 +00:00
px4dev 41987c7848 Recover fix for and enabling of interrupt-driven I2C. 2013-01-11 02:33:02 -08:00
px4dev fbf4c44230 Fix a compile error in the i2c reset code. 2013-01-11 02:32:29 -08:00
px4dev f127495caa Manually fixup merge botches via direct comparison with NuttX r5447. 2013-01-11 02:14:43 -08:00
px4dev d796a3b43b Merge commit 'b3f037e876055ff4f5169fb5df1639d50d7d5976' into nuttx-merge-5447 2013-01-11 00:45:53 -08:00
px4dev ca305933a1 Merge commit 'eaf1d8063cc707b1041e8583663d9edd45f42c5d' into nuttx-merge-5447 
Build system updates to sync with NuttX upstream.
 2013-01-11 00:45:25 -08:00
px4dev ccf9882dc5 Merge branch 'master' into nuttx-merge-5447 2013-01-11 00:39:22 -08:00
px4dev 6de688676d Suppress annoying C++ ABI portability warnings 
This suppresses an otherwise not useful warning when mixing C++ and va_list
 2013-01-10 18:53:26 -08:00
patacongo 7609c9a192 Fix problem with initialization of file actions 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5508 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 23:06:23 +00:00
patacongo f011bd7ef6 Added a test of posix_spawn() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5507 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 21:39:57 +00:00
patacongo 6f241ed044 Add interfaces to dynamically change symbol tables used by posix_spawn, execv, and execl. This is needed for testing. 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5506 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 20:00:08 +00:00
patacongo 9f8f8fc6dc Add missing support for signal masks to posix_spawn. 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5505 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 18:31:08 +00:00
patacongo 322e9d18c7 Completes implementation of posix_spawn. Still untested and undocumented 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5504 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 17:37:29 +00:00
patacongo 91cfebc978 Removed posix_spawn signal masks - they cannot be supported in NuttX; Add skeleton for posix_spawn proposer - still incomplete 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5503 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 15:26:09 +00:00
patacongo 35c5bb8e0f Fix rounding in clock_time2ticks(). From Mike Smith. 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5502 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 14:07:30 +00:00
patacongo 5ac907eb39 Add spawn attribute logic which will eventually be needed to support posix_spawn() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5501 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 00:45:11 +00:00
patacongo 44fdf6fc7a Add file action logic which will eventually be needed to support posix_spawn() 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5500 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-09 21:31:36 +00:00
patacongo d844f61f8a Re-partition Stellaris vector logic 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5499 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-09 19:49:16 +00:00
patacongo 35cc14be43 Change naming of all Stellaris pre-processor symbols from LM3S_ to LM_ to make room in the namespace for LM4F 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5498 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-09 18:15:02 +00:00
patacongo 51fc8af31f Rename LM3S files, variables, and types from lm3s_ to lm_; Rename configuration variables from CONFIG_LM3S_ to CONFIG_LM_ 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5497 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-09 14:48:55 +00:00
patacongo 8156a2bed1 Use kconfig- prefix to avoid tool name conflicts (from Jose Pablo Carballo) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5496 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-09 12:55:13 +00:00
patacongo 3f4d206288 Rename arch/arm/src/lm3s to arch/arm/src/lm to allow a namespace that will include the lm4f 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5495 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 20:56:40 +00:00
patacongo 23cc9f459c Eliminate arch/arc/src/lm3s/lm3s_internal.h; replace with several header files 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5494 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 19:27:38 +00:00
patacongo fd45b36c04 Documentation update 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5493 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 16:51:22 +00:00
patacongo 14f72f7a21 Add execv() and execl(); Move lm3s header files for compatibility 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5492 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 16:25:30 +00:00
px4dev c137ceba7d Remove more redundant CMSIS pieces from here. 2013-01-07 23:03:57 -08:00
patacongo 3d160e45b6 Documentation update 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5491 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-08 00:04:12 +00:00
patacongo a9f2c6fa8a Fixed ARM vfork; re-enabled vfork OS test 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5490 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:50:25 +00:00
patacongo 5a9162f017 Disable the vfork() OS test... it fails 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5489 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:09:09 +00:00
patacongo 66cdd288ab Add ostest vfork test (does not work yet) 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5488 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 21:41:20 +00:00