sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
839 Commits 1 Branch 0 Tags 24 MiB
1b37cdf95a
Commit Graph

424 Commits

Author SHA1 Message Date
Gregory Nutt
d7c9fda519 Sourceforge bug #19. Fix typo from CCTSAO 2013-09-04 11:39:01 -06:00
Gregory Nutt
870606c810 CC3000 driver updates from Alan Carvalho de Assis 2013-09-04 09:45:59 -06:00
Gregory Nutt
16868bf39d Initial cut of a driver for the TI CC3000 network module with support on the Freescale KL25Z board from Alan Carvalho de Assis 2013-09-03 14:59:48 -06:00
Gregory Nutt
9cf8ce936c Add example configurations that enable USB trace options must have Kconfig options to select the trace output 2013-09-02 12:25:17 -06:00
Gregory Nutt
f4bbddf789 Clean up some LP17xx and STM32 USB host configuration compilation errors due to the massive changes to the USB host interfaces needed to support the SAMA5 2013-08-13 17:43:19 -06:00
Gregory Nutt
3a2eb439f7 Change in apps/examples/composite to eliminate some false alarm debug assertions 2013-07-09 15:27:17 -06:00
Gregory Nutt
4f13725f35 Fix UG-2832HSWEG04 landscape. Add reverse landscape support to UG_2864AMBAG01 and UG-9964HSWAG01. Fixe NXHELLO default colors for 1-bit mono modes 2013-06-24 12:37:02 -06:00
Gregory Nutt
56b87e424b Add support for the UG-2843HHSWEG04 OLED and for the SAM4L Xplained Pro OLED module that uses that OLED. 2013-06-23 14:39:56 -06:00
Gregory Nutt
da19214ca7 Straighten out issues about who calls C++ initializers with CXXTEST or HELLOXX are built as NSH applications; Add an ofstream test to CXXTEST suggested by Michael; Update many defconfig fiels to that they set configurations to handle C++ constructors just as before these configuration changes 2013-06-21 09:32:57 -06:00
Gregory Nutt
459d89d9db Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup 2013-06-12 17:32:00 -06:00
Gregory Nutt
296044f63e Move SAM3U header files to arch/arm/src/sam3u/chip. Some renaming of SAM3U to SAM to ssupport SAM4. Convert all configs/sam3u-ek configurations to use the kconfig-frontends tool 2013-06-02 10:33:57 -06:00
Gregory Nutt
b673cbebb9 Updates to README files 2013-06-01 17:25:16 -06:00
Gregory Nutt
8ecaf62d3b Add NRF24L01 terminal example. From Laurent Latil. 2013-06-01 08:23:06 -06:00
Gregory Nutt
c8faf08af6 Fix that way that NxWight UnitTests are reigistered as NSH builtin apps 2013-05-30 16:49:20 -06:00
Gregory Nutt
4bc1b39c1c The Makefile in every directory that can generate a .dSYM should also clean .dSYM files 2013-05-30 15:24:22 -06:00
Gregory Nutt
424fbe6583 .dSYM only needs to be in the same .gitignore files as .exe 2013-05-30 15:02:04 -06:00
Gregory Nutt
f9ab52bb5a Upate .gitignore files. Add .dSYM. Make sure / is present where needed. Add some missing .gitignore files 2013-05-30 14:45:31 -06:00
Gregory Nutt
2dae842445 The SLCD driver is now fully functional for Sure PIC32MX board 2013-05-27 11:39:13 -06:00
Gregory Nutt
819e151ef5 Rename SLCD geometry tructure to attributes; Move MAX contrast to attributes. Add attribute and ioctl commands to get and set SLCD brightness 2013-05-27 07:26:59 -06:00
Gregory Nutt
a423026ef7 More SLCD-related fixes 2013-05-26 11:26:34 -06:00
Gregory Nutt
892774bbff Extentions SCLD test; SCLD CODEC and LCD1602 driver bug fixes 2013-05-26 09:28:57 -06:00
Gregory Nutt
98908461f6 PCB-Logic PIC32MX LCD1602 driver now supports SLCD CODED; Added an SLCD ioctl command to get cursor position 2013-05-25 13:46:43 -06:00
Gregory Nutt
ccd82fcfad Converted configs/pcblogic-pic32mx configurations to use kconfig-frontends. Re-organization of files in configs/pcblogic-pic32mx/src 2013-05-25 11:53:49 -06:00
Gregory Nutt
f310ebe9b1 Additional bug fixes and minor extensions to the STM32L-Disovery segment LCD support and to the apps/examples/slcd segment LCD test. 2013-05-24 12:00:15 -06:00
Gregory Nutt
25317177bd Fix bugs in SLCD test and in SLCD CODEC 2013-05-24 11:11:48 -06:00
Gregory Nutt
679bf0268a Add apps/examples/slcd, Remove USB from STM32L-Discovery, LSE support for the STM32 L family, some STM32L-Discovery LCD debug changes 2013-05-24 10:00:54 -06:00
Gregory Nutt
b9c287ceff Don't allocate dhcp_state structure when DHCP is not configured 2013-05-23 06:54:20 -06:00
Gregory Nutt
b674f5cd33 Add TCP echo server from Max Holtzberg 2013-05-22 07:35:54 -06:00
Gregory Nutt
ec32c5e636 Add runtime configuration for UDP discovery utility. From Max Holtzberg 2013-05-21 12:47:07 -06:00
Gregory Nutt
8445a4cdcd apps/examples/helloxx entry point name was mangled when built as an NSH builtin; plus some README updates 2013-05-16 09:36:55 -06:00
Gregory Nutt
f70d3958e4 Fix typo is STM32 ADC driver for F2 and F4: ADC not ACD 2013-05-08 21:45:46 -06:00
Gregory Nutt
3e2c3bcb99 Fixes for the examples/nxtext test 2013-05-07 08:55:51 -06:00
Gregory Nutt
8f7cd60c63 Rearchitecting of some MTD, partition, SMART interfaces, and FLASH drivers to: Better use the byte write capbility when available and to use smaller erase sectors for the erase sector size when available). 2013-05-03 12:52:33 -06:00
Gregory Nutt
1190bd7d50 Add support for the byte write method to MTD partition logic; Beef up the MTD partition test -- and fix resulting bugs detected 2013-05-02 08:07:42 -06:00
Gregory Nutt
80fc728d66 Add tests for the SMART block driver and file system. From Ken Pettit 2013-05-01 08:09:20 -06:00
Gregory Nutt
11d87d9e4f Changes to get the MTD test working 2013-04-30 16:48:43 -06:00
Gregory Nutt
469c5e6230 Add configuration and example to test MTD partitions 2013-04-30 15:54:02 -06:00
Gregory Nutt
acd37d95e4 Various Kconfig files still have references to CONFIG_ variables. Some in harmless comments, some in config definionts which is not harmless. All removed 2013-04-25 15:52:00 -06:00
Gregory Nutt
86052985d9 Cancel test needs to wait for the thread to set non-cancelable mode at one point 2013-04-18 11:37:38 -06:00
Gregory Nutt
541d625482 Move LPC17xx IOCON register definitions from lpc17_gpio.h to lpc17_iocon.h; fix a few more .gitignore files 2013-04-04 18:12:44 -06:00
Gregory Nutt
470a04b8f9 Clone svn:ignore directory atributed to .gitignore files 2013-04-04 14:27:29 -06:00
patacongo
1e9db17ec3 SSP driver fixes for the LPC178x; Fixes for Open1788 touchscreen driver 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5812 42af7a65-404d-4744-a932-0658087f49c3
 2013-04-02 16:36:19 +00:00
patacongo
627c408f85 More naming changes associated with earlier renaming of LP17xx up_spiinitialize; LPC178x SSP support; Open1788 SSP and touchscreen support 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5811 42af7a65-404d-4744-a932-0658087f49c3
 2013-04-01 22:00:37 +00:00
patacongo
80ffd26450 itoa() from Ryan Sundberg 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5741 42af7a65-404d-4744-a932-0658087f49c3
 2013-03-14 18:30:06 +00:00
patacongo
52441236b8 Two fixes from Mike Smith: (1) use -m install of --mode in install commands, (2) fix typo in stm32_exti.h introduced with the STM32 F3 port 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5701 42af7a65-404d-4744-a932-0658087f49c3
 2013-03-03 21:41:21 +00:00
patacongo
888c3d1618 Add a THTTPD configuratin for zkit-arm-1769 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5675 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-26 16:28:30 +00:00
patacongo
11b87dd5d9 Add port to Zilogic Systems ZKIT-ARM-1769 board (more coming) 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5673 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-26 14:09:43 +00:00
patacongo
5ff8bb8c4f Minor changes to make OS test more robust in the presence of many memory allocation failures 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5672 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-26 00:56:59 +00:00
patacongo
142c478747 Fix a readline bug. If a NUL is received, it would return end-of-file 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5633 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-10 00:46:27 +00:00
patacongo
b8c07cfa53 STM32F3Discovery passes all OS tests; Delay loop has been calibrated 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5629 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-09 00:26:52 +00:00
patacongo
2ad5349d4c Fix some problems with the vfork() test on the STM32F3Discovery 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5628 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-08 22:53:14 +00:00
patacongo
2cac96c9c9 STM32F3Discovery port is complete, builds, and is ready for testing 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5622 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-07 22:11:40 +00:00
patacongo
cfba101599 More updates for the STM32F3Discovery 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5617 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-06 23:09:09 +00:00
patacongo
a3b2882a10 Changed needed to fix issues with task_restart() 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5615 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-06 15:43:28 +00:00
patacongo
4dd288e570 Misc clean-up and bugfixes related to multi-thread group signalling 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5614 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-06 00:06:35 +00:00
patacongo
9acfb81b34 Moving pending signals to task group; Logic to recover some MQ resources on pthread_cacancel or task_delete; Now obeys rules for delivering signals to a process with threads 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5613 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-05 19:50:37 +00:00
patacongo
a6e6cb3daa Rename _TCB to struct tcb_s 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5610 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-04 18:46:28 +00:00
patacongo
1529b30bd1 Move pthread join and key creation data into the task group 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5602 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-03 16:43:58 +00:00
patacongo
cca7618daa All argv types should be char * const * not const char ** 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5599 42af7a65-404d-4744-a932-0658087f49c3
 2013-02-02 19:32:46 +00:00
patacongo
404bb36bbd Add syslog.h; rename lib_rawprintf() to syslog() 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5578 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-28 21:55:16 +00:00
patacongo
02d4cca67c Add a start hook that can be setup to call a function in the context of a new thread before the new threads main() has been called. 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5571 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-27 15:52:58 +00:00
patacongo
d36101683c Fix some compilation errors when child status disabled; new waitpid logic not encoding/decoding status properly 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5561 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-25 00:01:08 +00:00
patacongo
00cde57256 Fix some missing logic and inconsistencies in child status logic; Fix a bug introduced into sigaction() 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5560 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 23:18:32 +00:00
patacongo
7dda31ce55 apps/examples/nettest and poll: Complete Kconfig files 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5556 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-24 16:28:15 +00:00
patacongo
b2007c8e5b Add option to used keyboard CODEC in apps/examples/keypadtest 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5554 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-23 23:11:13 +00:00
patacongo
98e3699cc6 Add split package logic to improve TCP send performance with delayed ACKs 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5538 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-19 16:40:43 +00:00
patacongo
140d3e4374 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: svn://svn.code.sf.net/p/nuttx/code/trunk@5529 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 18:32:13 +00:00
patacongo
b9012ee3ec 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: svn://svn.code.sf.net/p/nuttx/code/trunk@5527 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-17 00:30:12 +00:00
patacongo
ff7dd3e17f convert configs/sim/nsh to use kconfig-frontends 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5526 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-16 21:38:00 +00:00
patacongo
9fdccfccfa Add support for dup2'ing files. Infrastructure and ROMFS done. Still need FAT, BINFS, NXFFS, and NFS 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5516 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-14 15:42:03 +00:00
patacongo
65c2f3e7ff Use SIGCHLD with waitpid(); implemented wait() and waitid() 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5515 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 18:53:00 +00:00
patacongo
77960c8ca8 Cosmetic cleanup from SIGCHLD changes 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5514 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-13 00:35:47 +00:00
patacongo
e3b0979fcf Fix a *critical* bug in the task exit logic. Implements SIGCHILD 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5513 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-12 19:58:45 +00:00
patacongo
fc822d98e5 Fix an error handling bug in the fread logic 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5511 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 19:08:51 +00:00
patacongo
b236e229c9 Various changes while debugging posix_spawn 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5510 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-11 16:53:44 +00:00
patacongo
90c4f1abc1 Fix problem with initialization of file actions 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5508 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 23:06:23 +00:00
patacongo
87eac55c6b Added a test of posix_spawn() 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5507 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 21:39:57 +00:00
patacongo
4db4c1fd62 Add interfaces to dynamically change symbol tables used by posix_spawn, execv, and execl. This is needed for testing. 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5506 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-10 20:00:08 +00:00
patacongo
c363996ee4 Fixed ARM vfork; re-enabled vfork OS test 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5490 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:50:25 +00:00
patacongo
12817ab49f Disable the vfork() OS test... it fails 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5489 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 23:09:09 +00:00
patacongo
ecaf2037fd Add ostest vfork test (does not work yet) 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5488 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-07 21:41:20 +00:00
patacongo
008e29f599 All lm3s6965-ek configurations converted to use kconfig-frontends 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5471 42af7a65-404d-4744-a932-0658087f49c3
 2013-01-01 16:34:12 +00:00
patacongo
d7bcd7c639 Remove non-functional WLAN examples, configurations 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5468 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-31 13:44:36 +00:00
patacongo
151c363227 Fix the nxlines configuration for the zp214xpa board 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5467 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-30 21:12:43 +00:00
patacongo
746798e748 Add board support at configs/zp214xpa for the The0.net ZP213X/4XPA board with the LPC2148; Add configurations sim/nxlines. convert mcu123-lpc214x/nsh to use the kconfig-frontends. 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5465 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-28 23:40:54 +00:00
patacongo
42149b6373 Add support for key release events 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5464 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-27 14:01:59 +00:00
patacongo
f18028f1bc Verified USB HID KBD driver encoding of special characters; apps/examples/hidkbd now decodes encoded keyboar characters. 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5463 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-26 21:37:50 +00:00
patacongo
f890e1c504 Add UG_2965SWEG01 driver from Darcy Gong; fix logic error in how waiters are reawakened in the USB HID keyboard driver 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5462 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-26 20:04:57 +00:00
patacongo
c8fc3b9c48 Implement encoding the usbhost HID keyboard driver; configre olimex-lpc1766stk HID keyboard configuration to use the kconfig-frontends tool 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5461 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-26 18:54:59 +00:00
patacongo
e1dad951f1 Fix several build issues noted by Mike Smith 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5459 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-24 20:22:14 +00:00
patacongo
3e98f528a4 Some fixes to apps/builtin/registry need to handle some additional cases 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5456 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-24 13:15:57 +00:00
patacongo
b104cce86b Remove .context kludge from apps/ directory 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5455 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-23 22:17:09 +00:00
patacongo
ee7d4f64c1 Remove some dependencies of distclean on clean. This should not be necessary in higher level makefiles and should speed up make distclean 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5453 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-23 17:35:06 +00:00
patacongo
1f42490e3c Some minor fixes for CONFIG_ADDRENV=y 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5444 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-19 21:16:03 +00:00
patacongo
edabd898e4 Incorporate address environment interfaces in binfmt/ logic 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5443 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-19 17:54:26 +00:00
patacongo
bf079976cb standard keypad inteface and apps/examples/keypadtest from Denis Carikli 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5403 42af7a65-404d-4744-a932-0658087f49c3
 2012-12-01 15:43:51 +00:00
patacongo
cb890fd484 All ZNEO configurations converted to use the mconf/Kconfig tool 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-29 18:44:02 +00:00
patacongo
9948193f7a configs/z8f64200100kit/ostest at same level as ez80 configurations; nuttx/arch/arm/src/lpc17xx/lpc17_i2c.cuninitialization fix 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5392 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-27 15:09:12 +00:00
patacongo
08f0823241 Missing comma in EVERY DELFILE/DELDIR macro call in every Makefile 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5373 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-20 15:47:41 +00:00
patacongo
0ae06479d8 0001-some-fixes-for-FreeMODBUS-and-MODBUS-example.patch from Freddi Chopin 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5372 42af7a65-404d-4744-a932-0658087f49c3
 2012-11-20 13:36:07 +00:00