Daniel Campora
640d00ea9d
cc3200: Change MP_OBJ_NULL for mp_const_none in params default value.
2015-06-10 23:35:32 +02:00
Daniel Campora
071d47fa3b
cc3200: Only kick the WDT if it's actually running.
2015-06-10 23:35:30 +02:00
Daniel Campora
6148f8b7d2
cc3200: Add contructor to the HeartBeat class.
2015-06-10 23:35:28 +02:00
Daniel Campora
371f4ba6b3
cc3200: Wrap antenna_init0() with #if MICROPY_HW_ANTENNA_DIVERSITY.
2015-06-08 10:38:19 +02:00
Daniel Campora
491c321720
cc3200: Re-config antenna selection when waking from suspended mode.
2015-06-07 13:28:47 +02:00
Daniel Campora
a3acaa000c
cc3200: Add antenna selection feature to WLAN.
2015-06-07 00:06:27 +02:00
Daniel Campora
a3cf4ea2f6
cc3200: Do not kick the watchdog inside the idle task.
2015-06-04 10:13:55 +02:00
Daniel Campora
cc20482aa9
cc3200: Add method to configure the servers timeout.
...
With network.server_timeout(secs) the timeout can be changed.
The default value is 300 secs. Minimmum accpeted is 5 secs.
Without params the function returns the current configured timeout.
2015-06-03 17:31:21 +02:00
Daniel Campora
2ffb6e1b15
cc3200: Fix 'MP_QSTR_sd' undeclared error when building for the LAUNCHXL.
2015-06-02 13:11:01 +02:00
Daniel Campora
84d11b5e53
cc3200: Add period set method to the Timer class.
2015-05-29 15:54:46 +02:00
Daniel Campora
417205623a
cc3200: Fix incorrect type for the wake cause variable.
2015-05-29 15:54:16 +02:00
Daniel Campora
2f2c0a13fb
cc3200: Clean up WLAN API. Make WLAN.info() an attrtuple.
2015-05-29 15:48:41 +02:00
Daniel Campora
622f241317
cc3200: Rename pyb.reset() to pyb.hard_reset() and add pyb.unique_id().
2015-05-29 10:22:20 +02:00
Daniel Campora
2abb58d758
cc3200: Rename Pin.get_config() to Pin.info().
2015-05-28 13:10:46 +02:00
Daniel Campora
1580e331ef
cc3200: Make small changes in WLAN to improve the API.
2015-05-28 13:10:44 +02:00
Daniel Campora
c754d8011d
cc3200: Simplify SPI polarity and phase checks in constructor.
2015-05-27 09:45:32 +02:00
Daniel Campora
9414f92fa9
cc3200: Fix I2C and SPI module references.
2015-05-27 09:45:27 +02:00
Daniel Campora
8096be089e
cc3200: Add make_new method to the WDT.
2015-05-27 09:45:25 +02:00
Daniel Campora
fca3493442
cc3200: Add make_new method to the RTC, like in stmhal.
2015-05-27 09:45:24 +02:00
Daniel Campora
5a0c5f8fea
cc3200: Use the WDT stall feature in debug mode only.
2015-05-27 09:45:22 +02:00
Daniel Campora
ec1f0e7551
cc3200: Use MCU reset instead of SOC reset.
...
I have seen the CC3200 hanging a couple of times, and according to TI
itself the SOC reset is not reliable, which explains my observations.
2015-05-27 09:45:21 +02:00
Daniel Campora
fabe79f7af
cc3200: Clean up exception handling.
2015-05-26 12:29:20 +02:00
Daniel Campora
124aa000af
cc3200: Use polarity and phase instead of submode in the SPI construct.
2015-05-26 11:30:48 +02:00
Daniel Campora
2dd47239de
cc3200: Make API more similar to stmhal.
...
In general the changes are:
1. Peripheral (UART, SPI, ADC, I2C, Timer) IDs start from 1, not zero.
2. Make I2C and SPI require the ID even when there's only one bus.
3. Make I2C and SPI accept 'mode' parameter even though only MASTER
is supported.
2015-05-25 21:47:19 +02:00
Daniel Campora
6545336206
cc3200: Make the WDT aware of the servers sleep/wake state.
2015-05-25 21:14:54 +02:00
Daniel Campora
5cd34aca27
cc3200: Use the correct ADC channel index when creating the object.
2015-05-25 21:14:46 +02:00
Daniel Campora
3cb804de26
cc3200: Remove NIC abstraction layer.
...
That layer is nice, but the CC3200 doesn't need it and getting rid of
it saves ~200 bytes, which are more than welcome.
2015-05-24 11:44:08 +02:00
Daniel Campora
9f8c5456be
cc3200: Reset the servers and close user sockets on WLAN disconection.
...
This is needed to avoid half-open connections.
2015-05-24 11:44:06 +02:00
Daniel Campora
ed56b0baba
cc3200: Finally unlock the full wake on WLAN feature set.
2015-05-22 19:53:33 +02:00
Daniel Campora
18030bd85d
cc3200: Add own ubinascii module.
...
The reason to have our owm ubinascii module is so that later we
can add crc32 support using the hardware engine.
2015-05-22 09:56:11 +02:00
Daniel Campora
7506db4ccb
cc3200: Remove uhashlib.hexdigest().
2015-05-21 18:51:57 +02:00
Daniel Campora
e800db562f
cc3200: Add uhashlib. Supports SHA1 and SHA256.
2015-05-20 11:44:24 +02:00
Daniel Campora
5e38b48dd6
cc3200: Fix time.localtime() so that it returns the correct fields.
2015-05-20 11:44:22 +02:00
Daniel Campora
56053c37cf
cc3200: Rewrite WLAN.ifconfig(). Add WLAN.info() and WLAN.connections().
2015-05-20 11:44:21 +02:00
Daniel Campora
6f848b6dba
cc3200: Set the timer edge count interrupt value in the calbback const.
2015-05-17 16:11:12 +02:00
Daniel Campora
95a4f61499
cc3200: Make sure RTC wake value is >= 1ms.
2015-05-17 16:09:27 +02:00
Daniel Campora
c27dc38e85
cc3200: Re-name 'intmode' to 'mode' in the callback API.
2015-05-17 14:49:17 +02:00
Daniel Campora
cd3f2523f1
cc3200: Disable WLAN.urn() by default.
...
Can be enabled by defining MICROPY_PORT_WLAN_URN=1 in mpconfigport.h.
2015-05-17 14:20:24 +02:00
Daniel Campora
a379b6ed11
cc3200: Add optional timeout param to WLAN.connect().
2015-05-17 14:05:44 +02:00
Daniel Campora
fb9e4cf463
cc3200: Make sure to handle all pending pin interrupts.
...
When entering the interrupt handler of a given GPIO port, more than
one pin could have pending interrupts, therefore care must be taken
to service each interrupt one by one before leaving.
2015-05-17 13:42:15 +02:00
Daniel Campora
8e611e8414
cc3200: Add Timer module. Supports free running, PWM and capture modes.
2015-05-17 12:34:49 +02:00
Daniel Campora
9466e154b4
cc3200: Fix power mode param check in the UART callback constructor.
2015-05-17 12:26:40 +02:00
Daniel Campora
2b62707051
cc3200: Add os.rename()
2015-05-17 12:22:17 +02:00
Josef Gajdusek
1db4253886
lib: Move time utility functions to common library.
2015-05-13 00:12:54 +01:00
Damien George
c50772d19f
py: Add mp_obj_get_int_truncated and use it where appropriate.
...
mp_obj_get_int_truncated will raise a TypeError if the argument is not
an integral type. Use mp_obj_int_get_truncated only when you know the
argument is a small or big int.
2015-05-12 23:05:53 +01:00
Josef Gajdusek
04ee5983fe
lib: Move some common mod_network_* functions to lib/netutils.
2015-05-04 11:48:40 +01:00
Daniel Campora
8c8d7f3c60
cc3200: Clean up pyb.Pin
...
Remove unused and unneeded functions, also create Pin.get_config() that
returns the whole configuration of the pin.
This reduces code size by ~500 bytes.
2015-05-03 11:26:56 +02:00
Daniel Campora
e4c899a08c
cc3200: WLAN.ifconfig returns an attrtuple instead of a dictionary.
2015-05-03 11:26:25 +02:00
Daniel Campora
f54bdecff2
cc3200: Implement Sleep.wake_reason()
2015-05-03 11:21:14 +02:00
Daniel Campora
71d482df47
cc3200: Clear the pending interrupt flag when disabling RTC callbacks.
2015-05-03 11:21:12 +02:00
Daniel Campora
6f218d7472
cc3200: Move wlan_init0() to the boot section.
...
This one creates a semaphore, therefore it must be executed only
after a hard reset (or when coming out of hibernation).
2015-04-29 16:10:40 +02:00
Daniel Campora
d8713d78f5
cc3200: Correct Sleep module name. Must be 'Sleep', not 'sleep'.
2015-04-29 15:27:28 +02:00
Daniel Campora
dbb4aef5e3
cc3200: Make WLAN.isconnected() also work in AP mode.
...
While in STA mode isconnected() returns True when connected to an AP
and the IP has been acquired. In AP mode, WLAN.isconnected() returns
True if at least one connected station is present.
2015-04-29 15:26:21 +02:00
Damien George
95f53461c2
py: Replace py-version.sh with makeversionhdr.py, written in Python.
...
Also rename py-version.h to mpversion.h for consistency with mpconfig.h.
2015-04-28 23:52:36 +01:00
Daniel Campora
d11317bcab
cc3200: Make WLAN scan results a list of attrtupple.
...
Each result is displayed like this:
ssid='MySSID', bssid=b'\xc0J\x00z.\xcc', security=2, channel=None, rssi=-74
The CC3200 doesn't provide channel info, that why is 'None'.
2015-04-29 00:04:01 +02:00
Daniel Campora
f81684141e
cc3200: Implement os.uname() to get details of the OS and hardware.
2015-04-29 00:03:56 +02:00
Daniel Campora
d34c4784a5
cc3200: Select NIC when the socket is created.
...
This makes sense since only WLAN is supported here.
2015-04-28 15:14:36 +02:00
Daniel Campora
7c8b4c1a8b
cc3200: Correct MAKE_SOCKADDR and UNPACK_SOCKADDR byte order.
2015-04-25 23:36:45 +02:00
Damien George
259eaab9a9
cc3200: Clean up and reduce use/include of std.h.
2015-04-18 14:29:28 +01:00
Daniel Campora
c1a77a0c9f
cc3200: Use new %q format to print qstr's where appropiate.
2015-04-17 10:15:55 +02:00
Damien George
7f9d1d6ab9
py: Overhaul and simplify printf/pfenv mechanism.
...
Previous to this patch the printing mechanism was a bit of a tangled
mess. This patch attempts to consolidate printing into one interface.
All (non-debug) printing now uses the mp_print* family of functions,
mainly mp_printf. All these functions take an mp_print_t structure as
their first argument, and this structure defines the printing backend
through the "print_strn" function of said structure.
Printing from the uPy core can reach the platform-defined print code via
two paths: either through mp_sys_stdout_obj (defined pert port) in
conjunction with mp_stream_write; or through the mp_plat_print structure
which uses the MP_PLAT_PRINT_STRN macro to define how string are printed
on the platform. The former is only used when MICROPY_PY_IO is defined.
With this new scheme printing is generally more efficient (less layers
to go through, less arguments to pass), and, given an mp_print_t*
structure, one can call mp_print_str for efficiency instead of
mp_printf("%s", ...). Code size is also reduced by around 200 bytes on
Thumb2 archs.
2015-04-16 14:30:16 +00:00
Daniel Campora
f7a26472af
cc3200: Add IPPROTO_SEC to be able to create secure sockets.
2015-04-14 01:57:27 +02:00
Daniel Campora
c69b4310c8
cc3200: Add WLAN.config_ip().
...
This new method allows to assign an static IP to the device.
2015-04-13 00:02:56 +02:00
Daniel Campora
6e25d955f4
cc3200: Enable long filename support in FatFS.
...
This has implications all over the place. I have to admit that
you can instantly see that usability improves, but it costs 3K.
At the same time I took the oportunity to rename the '/SFLASH'
drive to '/flash' which improves compatibility with the pyboard.
2015-04-11 13:35:05 +02:00
Daniel Campora
d460a30711
cc3200: Add specific version file for the CC3200 port.
...
Current version has been numbered as 0.9.0 since Timers/PWM support
is still missing.
2015-03-31 14:34:09 +02:00
Daniel Campora
3f42f32648
cc3200: Remove duplicated code from moduos.
...
Error reporting is also changed from detailed to terse, as with the
rest of the CC3200's modules. All this combined saves ~200 bytes.
2015-03-31 14:34:07 +02:00
Daniel Campora
760a6eca9b
cc3200: Minor refactorings on modwlan and pybsleep.
2015-03-26 14:27:21 +01:00
Daniel Campora
4be44014ab
cc3200: Reenable active interrupts when waking from suspended mode.
2015-03-26 13:58:58 +01:00
Daniel Campora
2d717ad97a
cc3200: Add callback support to the UART for RX interrupts.
2015-03-26 10:28:43 +01:00
Daniel Campora
e909e38871
cc3200: Remove superflous parameters from the SPI API.
2015-03-26 10:28:41 +01:00
Daniel Campora
7f41f650de
cc3200: Remove superflous params from the I2C API.
2015-03-25 16:56:14 +01:00
Daniel Campora
26d230419c
cc3200: Add GPIO25 to the pins list of the WiPy and the WiPy-SD.
...
This allows to properly initialize the system led and add it
to the sleep module so that it can be restored when resuming
from suspended mode.
2015-03-25 15:22:32 +01:00
Daniel Campora
684dba40f0
cc3200: Roll back to the previous telnet and ftp timeouts.
...
Unfortunately, these timeouts are the only realiable way (for now), to
be able to detect broken connections due to half-open sockets. Such a
thing occurs when getting out of the WiFi coverage area or when
disconnecting from the AP (sometimes the client doesn't send the
disconnect packet).
2015-03-25 15:22:21 +01:00
Daniel Campora
e15f8198bc
cc3200: Keep WLAN enabled during the soft reset.
2015-03-25 15:22:16 +01:00
danicampora
104a867447
cc3200: Fix bug in telnet that caused the rx buffer to overflow.
2015-03-22 11:32:12 +01:00
danicampora
59f6831336
cc3200: Reduce soft reset time. WLAN is not reinit, just reenabled.
2015-03-21 11:31:29 +01:00
danicampora
77791b5633
cc3200: Improve usability and robustness of the servers.
2015-03-21 11:31:17 +01:00
danicampora
c1c23e2f6a
cc3200: Remove superfluous code in pybsleep.
2015-03-21 11:27:26 +01:00
danicampora
cd9bc14c8f
cc3200: Add SPI module.
...
Only MASTER mode is supported. Transfer width is configurable to
8, 16 or 32 bits.
2015-03-21 11:26:47 +01:00
danicampora
c45e641c1d
cc3200: Re-name pybsystick to mpsystick.
2015-03-21 11:21:45 +01:00
danicampora
f8ee88bbe0
cc3200: Move server methods from WLAN to the network module.
2015-03-19 17:08:25 +01:00
danicampora
0e96d1b3f1
cc3200: Add parameter to wlan_stop() for custom timeout values.
2015-03-18 21:55:08 +01:00
danicampora
f382f4442e
cc3200: Fixes and improvements to the SD card driver.
2015-03-18 21:55:02 +01:00
danicampora
963d7c7ee6
cc3200: Refactor I2C. Remove all references to SLAVE mode.
2015-03-18 21:54:41 +01:00
danicampora
d3912549a3
cc3200: Improve I2C timeout handling.
2015-03-18 21:54:30 +01:00
danicampora
005a7f4190
cc3200: Fix extint_enable behaviour when the callback is updated.
2015-03-17 13:26:09 +01:00
danicampora
181fe5016c
cc3200: Add RTC callback with wake-up from sleep capability.
2015-03-17 13:26:08 +01:00
danicampora
6de1b39368
cc3200: Make peripheral objects static.
...
This prevents duplication of objects in the sleep list. Also helps
with reducing the code size by ~100 bytes.
2015-03-17 13:26:07 +01:00
danicampora
fcf6db0695
cc3200: Register pybsd with the sleep module and use pin_config().
2015-03-17 13:26:06 +01:00
danicampora
98b8568362
cc3200: Assign GPIO10 and GPIO11 to the GPIO peripheral on start-up.
2015-03-17 13:26:05 +01:00
danicampora
ea43fa104e
cc3200: Remove unneeded functions and add pybsleep_remove() calls.
2015-03-17 13:26:03 +01:00
danicampora
78d7c45b69
cc3200: Disable all wake sources on start-up.
2015-03-16 00:42:16 +01:00
danicampora
ed20ac56f7
cc3200: Fix bug in RTC msec register access functions.
2015-03-16 00:42:15 +01:00
danicampora
0962358026
cc3200: Align SD card driver with new SDK release(1.1.0).
2015-03-16 00:42:13 +01:00
danicampora
1080802e8f
cc3200: Update socket event handler to align with new SDK(1.1.0) API.
2015-03-16 00:42:11 +01:00
danicampora
b2cb75efb7
cc3200: Remove double administration of callback objects.
2015-03-16 00:42:09 +01:00
danicampora
0d0646d915
cc3200: Update HAL to SDK release version 1.1.0.
2015-03-16 00:42:05 +01:00
danicampora
2c103d5200
cc3200: Rewrite the PRCM RTC functionality methods.
...
This allows to use the On-Chip retention registers for both the
RTC and to share notification flags between the bootloader and the
application. The two flags being shared right now are the "safe boot"
request and the WDT reset cause. we still have 2 more bits free for
future use.
2015-03-14 10:08:47 +01:00
danicampora
c7fabe1f3e
cc3200: Remove unneeded code from modwlan and optimize startup time.
...
These changes also help reduce the hibernate wake-up time to 1s.
2015-03-14 10:08:43 +01:00
danicampora
04749e677f
cc3200: Allow separate selection of the power mode in Pin callbacks.
2015-03-12 16:22:17 +01:00
danicampora
10f7ef0832
cc3200: Keep WLAN enabled during suspend mode.
2015-03-12 16:22:16 +01:00
danicampora
6ae9383f63
cc3200: Remove WLAN.getmode since it's superseded by WLAN.ifconfig.
2015-03-12 16:22:13 +01:00
danicampora
37337427c3
cc3200: Trigger a new network scan when WLAN.scan() is called.
2015-03-12 16:22:12 +01:00
danicampora
b761ed2103
cc3200: Register ADC and I2C with the sleep module.
2015-03-11 22:09:52 +01:00
danicampora
e9786f40f5
cc3200: Disable WLAN in suspended mode if NW wake is not enabled.
2015-03-11 17:11:10 +01:00
danicampora
9e44383e3f
cc3200: Add power management framework. Add mpcallback class.
...
Supports suspend and hibernate modes. Waking is possible throug GPIO
and WLAN.
The mpcallback class is generic and can be reused by other classes.
2015-03-11 17:00:33 +01:00
danicampora
73aee8da54
cc3200: Merge ExtInt class into Pin class.
...
Also add another method to change the pin's interrupt mode
on the fly.
2015-03-11 17:00:28 +01:00
danicampora
26cbc91373
cc3200: Place functions only used while booting in a special section.
...
Such functions are never used after MicroPython has started, and they
remain in RAM wasting space. Now they are placed in a special section
named "boot" which sits just before the heap, allowing us to extend
the effective heap area up to the new boot section. Right now, this
gives us back ~1K, but in the future, more functions might end up in
there as well.
2015-03-11 16:59:29 +01:00
danicampora
d226dd2f59
cc3200: Add preliminary low power deep sleep support.
2015-03-11 16:54:09 +01:00
danicampora
0475de1350
cc3200: Make WDT and HeartBeat constant objects on their own right.
2015-03-11 16:54:05 +01:00
danicampora
d01060241a
cc3200: Add heartbeat signal on system led.
2015-02-28 19:03:21 +01:00
danicampora
74589cbeeb
cc3200: Move code that disables/enables servers to wlan_sl_enable().
2015-02-26 11:19:15 +01:00
danicampora
7a074a14ce
cc3200: Implement safe boot pin and system led behaviour.
...
The safe boot pin, when pulled high during reset rolls back the
firmware to the "factory" image and skips execution of 'boot.py'
and 'main.py'. This is useful to recover from a crash condition.
The system led is used mostly to signal errors.
2015-02-25 23:17:17 +01:00
danicampora
11aa6ba456
cc3200: Add WDT functionality as part of the pyb module.
...
Also improve pybsd, and make it save it's pin configuration.
This is a necessary step towards supporting the CC3200 low
power deep sleep (LPDS) mode.
2015-02-25 11:37:29 +01:00
danicampora
70b3160871
cc3200: Introduce MICROPY_PORT_HAS_TELNET and MICROPY_PORT_HAS_FTP.
...
These definitions help on making modwlan.c usable by other ports
with the CC3100.
2015-02-23 15:02:57 +01:00
danicampora
379a3fa305
cc3200: Change UART.print() to make it consistent with the rest.
2015-02-23 15:02:55 +01:00
danicampora
88b7f52ebb
cc3200: Replace WLAN.get_ip() with WLAN.ifconfig().
...
Also change other methods' names to make them consistent.
2015-02-23 15:02:55 +01:00
danicampora
44bb616b53
cc3200: Add simplelink non-os task calls.
2015-02-22 18:59:50 +01:00
danicampora
4bfc491753
cc3200: Add wlan_urn() thanks to Nadim El-Fata and Bryan Morrissey.
2015-02-22 18:43:01 +01:00
danicampora
33ddb566a7
cc3200: Remove dependencies from FreeRTOS.
...
Use the simplelink wrappers instead. This is one step further
towards having a single module for the cc3200 and the cc3100.
2015-02-22 17:50:50 +01:00
danicampora
92ea99a0fb
cc3200: Add support for connecting to WEP secured networks.
2015-02-21 22:27:54 +01:00
danicampora
18605b36dc
cc3200: Rename SD.config() to SD.config_pins().
2015-02-21 22:27:48 +01:00
danicampora
7102e51506
cc3200: Add UART __del__ method.
2015-02-21 22:27:44 +01:00
danicampora
a7208bcc43
cc3200: Remove sd paths from sys path when disabling the sd card.
2015-02-21 22:27:39 +01:00
Damien George
4a23a01945
cc3200: Add explicit py/ path-prefix for py includes.
...
This is how it should be, so one knows exactly where the includes are
coming from.
2015-02-21 18:58:43 +00:00
danicampora
59d14914cd
cc3200: Correct pybsd_config() params retrieval.
2015-02-21 14:26:38 +01:00
danicampora
c020109cfa
cc3200: Add SD module and disable SD card support for the LAUNCHXL.
2015-02-21 14:19:40 +01:00
danicampora
6b21c3fdd6
cc3200: Refactor UART and I2C object creation.
...
I2C objects can be freed by the GC and a __del__ method is provided
in order to de-init the peripheral prior to being garbage collected.
UART objects are now added to a local list and this list is now part
of the VM_STATE.
2015-02-20 16:41:55 +01:00
danicampora
7807da20ab
cc3200: Increase UART default read buffer size to 128 bytes.
2015-02-20 16:41:49 +01:00
danicampora
868fa82ea4
cc3200: Add ADC module.
2015-02-20 16:40:59 +01:00
danicampora
2b899b6708
cc3200: Remove asserts from sl_Stop() and reduce timeout to 250ms.
2015-02-20 16:40:15 +01:00
danicampora
6ff9a47255
cc3200: Move closed field in mod_network_socket_obj_t out of the union.
2015-02-20 16:40:10 +01:00
danicampora
e1dfc44178
cc3200: Disable FreeRTOS asserts. Optimize more files if BTYPE=debug.
2015-02-20 16:40:06 +01:00
danicampora
99f3f6b5de
cc3200: Add I2C module. Only master mode is currently supported.
2015-02-13 17:54:04 +01:00
Damien George
0b32e50365
stmhal: Make pybstdio usable by other ports, and use it.
...
Now all ports can use pybstdio.c to provide sys.stdin/stdout/stderr, so
long as they implement mp_hal_stdin_* and mp_hal_stdout_* functions.
2015-02-13 15:04:53 +00:00
danicampora
53716fcc3e
cc3200: Rename GPIO module to Pin.
...
This change helps making the cc3200 port API a bit closer to stmhal.
The ramaining differences are due to the specific hardware details
of each chip. One feature that has been deliberately disabled is the
possibility to add custom names and custom pin mappings. Those
features are nice and convenient, but in this port, code size is a
major concern.
2015-02-09 20:01:54 +01:00
danicampora
8785645a95
cc3200: Add cc3200 port of MicroPython.
...
The port currently implements support for GPIO, RTC, ExtInt and the WiFi
subsystem. A small file system is available in the serial flash. A
bootloader which makes OTA updates possible, is also part of this initial
implementation.
2015-02-06 22:10:11 +00:00
