1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Commit Graph

598 Commits

Author SHA1 Message Date
Cristian Maglie
bb23ef2e3b [sam] Fixed IDE compiling process 2012-05-09 15:34:00 +02:00
Thibault RICHARD
4d59afcc64 [SAM] CDC working. (workaround implemented for Windows previous issue) 2012-05-09 12:45:14 +02:00
Thibault RICHARD
d6d23c530a [SAM] HID and CDC verified okay on Linux/Mac by Cristian. Fixed OTG clock
init issue. CDC is not working correctly under Windows (possible inf
issue).
2012-05-07 20:12:00 +02:00
Thibault RICHARD
84e887003d [SAM] CDC working. Need to check inf file. 2012-05-04 18:58:24 +02:00
Thibault RICHARD
2315728358 [SAM] HID working. 2012-05-03 17:12:46 +02:00
Thibault RICHARD
56c7e2fdb8 Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm 2012-05-03 14:34:12 +02:00
Thibault RICHARD
b2c35a4e68 [SAM] HID is working. Printf issue in UDD_Send8 function. 2012-05-03 14:32:24 +02:00
Thibaut VIARD
a2c2d4b174 [sam] adding libsam archives into git 2012-05-03 10:04:43 +02:00
Cristian Maglie
3979a4b1c9 [sam] Removed warning for aggregate values in function call 2012-05-02 19:51:45 +02:00
Cristian Maglie
fe63430cb7 [sam] removed unuseful new.cpp module 2012-05-02 19:21:52 +02:00
Cristian Maglie
348c307539 [sam] HardwareSerial is now a pure virtual class 2012-05-02 19:21:12 +02:00
Thibaut VIARD
4af0a4abc2 Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm 2012-05-02 17:01:43 +02:00
Thibaut VIARD
16de9dc13c [sam] adding google adk2 support on whole build system and makefiles
cleanup
2012-05-02 17:00:55 +02:00
Zach Eveland
9520a531de renamed Leonardo USB_ class to USBDevice_ to be unambiguous. renamed "USB" object to "USBDevice" to prevent conflict with USB Host library (thanks Massimo) 2012-05-01 11:18:15 -04:00
Thibault RICHARD
45a1d32e71 [SAM] enumeration is now okay. Device still not working. 2012-04-30 20:17:40 +02:00
Thibault RICHARD
8dfa9f8459 [SAM] USB device stack updated. Failing at configuration descriptor stage. 2012-04-30 19:34:27 +02:00
Thibault RICHARD
4658ab7468 [SAM] added missing interrupt files for libsam 2012-04-30 13:45:53 +02:00
Thibault RICHARD
8c1f9af9f5 [SAM] uotghs first implementation, compilation is okay. Code untested. 2012-04-30 13:42:04 +02:00
Thibaut VIARD
41ef57b963 [sam] intermediate step 2012-04-29 00:54:05 +02:00
Thibaut VIARD
dc95506b06 Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm 2012-04-29 00:51:47 +02:00
Thibaut VIARD
46b9f96d4a [sam] intermediate commit 2012-04-28 20:15:23 +02:00
Thibault RICHARD
1d99429752 [SAM] Test app working on SAM3X-EK 2012-04-28 19:59:24 +02:00
Thibault RICHARD
fc82f1e556 [SAM] Fixing SysTick handler issue 2012-04-28 19:58:40 +02:00
Thibault RICHARD
373c0096c3 [SAM] Updating debug scripts 2012-04-28 19:56:36 +02:00
Thibault RICHARD
e034de5ea9 [SAM] Added SAM3X_EK support for USB debug 2012-04-28 17:36:57 +02:00
Cristian Maglie
7e14a0d2fb [sam] updated boards.txt from upstream 2012-04-28 15:47:19 +02:00
Thibaut VIARD
86533a5e8f [sam] first USB with Init/Attach/Detach 2012-04-28 15:16:13 +02:00
Cristian Maglie
08b614048d [sam] fixed compiling on wiring_analog.c 2012-04-28 12:45:30 +02:00
Cristian Maglie
4da2833a81 [sam] updated Print class and all derivated classes. 2012-04-28 12:44:49 +02:00
Thibaut VIARD
f09771258e [sam] fixing analog according to updated pmc api 2012-04-28 12:11:40 +02:00
Thibaut VIARD
c0a5eb38e2 [sam] adding USB updates 2012-04-28 11:49:28 +02:00
Thibaut VIARD
ed0be7c1b8 [sam] USB device cleanup 2012-04-28 10:14:04 +02:00
Thibaut VIARD
5f0a03c86c [sam] adding validation app for usb device stack 2012-04-28 09:56:53 +02:00
Thibaut VIARD
fbf65ab217 [sam] updating makefiles: test app now builds all needed libs 2012-04-28 09:51:54 +02:00
Cristian Maglie
afaeee22ac [sam] Fixed pinout for Serial4. Fixed keywords. Recompiled shipped libsam binary 2012-04-27 14:25:57 +02:00
Thibaut VIARD
a4b61c7b1b [SAM] fixing header includes 2012-04-26 20:22:15 +02:00
Thibaut VIARD
88c10ba1e2 [SAM] fixing make clean 2012-04-26 20:21:33 +02:00
Thibaut VIARD
d0d41ba673 Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm 2012-04-26 20:20:13 +02:00
Thibaut VIARD
4a50ae7f9c [SAM] Updating CMSIS to fix devices package IT handlers issue 2012-04-26 20:17:47 +02:00
Zach Eveland
2e575db249 changed PID values for Leonardo bootloader and sketch
done to avoid driver problems for users who installed the pre-release bootloader and driver
2012-04-25 15:56:18 -04:00
Cristian Maglie
45619b4336 [sam] SPI Fixed modes constants 2012-04-24 18:43:33 +02:00
Cristian Maglie
33870d3aae [sam] bugfix for SPI on SAM3*. Extended API for SPI master devices is in ALPHA, to be validated. 2012-04-24 09:31:50 +02:00
Cristian Maglie
d6c57415a3 [sam] fixed compilation problem with temporary USB driver 2012-04-23 15:51:03 +02:00
Cristian Maglie
00ceed55d2 [sam] Fixed compilation problem on SPI class. SPI device is now called SPI_0 to avoid name clashes. 2012-04-23 15:50:30 +02:00
Zach Eveland
4fb17c47cd bugfix for configuring PWM on D6 and D13 too early. (thanks to Limor Fried)
was starting PWM on these pins too soon - in init() instead of when analogWrite() was called.  as a result doing output on port registers directly failed.
2012-04-19 15:52:16 -04:00
Zach Eveland
9904a6f497 bugfix for boards with a timer 4 but no channel D
compilation failed for Mega because the COM4D1 and OCR4D registers are defined for 32U4 but not for Mega
2012-04-19 15:46:32 -04:00
Cristian Maglie
95738df9bf [sam] update USB device API 2012-04-19 17:37:13 +02:00
Cristian Maglie
0b5e66af37 [sam] Moved USB stuff inside a folder 2012-04-18 14:52:30 +02:00
Cristian Maglie
008df0430c [sam] added AndroidAccesory class from ADK 2012-04-18 14:34:51 +02:00
Cristian Maglie
761d472f23 [sam] temporarily removed asserts from PMC_* functions 2012-04-12 10:37:02 +02:00
Zach Eveland
bb9a4f89cc merged Caterina with Blink 2012-04-11 23:24:04 -04:00
Zach Eveland
7e235dbff8 fixed logic bug in Caterina that could stop the bootloader from entering self-programming mode 2012-04-11 23:19:05 -04:00
Thibault RICHARD
9aaf61327b [sam] added ADC test in validation app (makefile based) 2012-04-11 19:32:29 +02:00
Thibault RICHARD
6ae6a0eaf2 [sam] fixing ADC, taken from ASF, checked and tested verified 2012-04-11 19:30:13 +02:00
Thibault RICHARD
0832334a71 [sam] fixing makefiles for toolchain path containing spaces 2012-04-11 19:26:06 +02:00
Thibaut VIARD
431f3ea5fe [sam] preliminary update for analog 2012-04-10 18:27:43 +02:00
Zach Eveland
d3a8e450ee Micro I hardly knew ye 2012-04-09 10:12:14 -04:00
Zach Eveland
3f6342e9bb Micro and Leonardo bootloaders for distribution are now merged with Blink sketch 2012-04-09 08:08:34 -04:00
Zach Eveland
caeaa4571c sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt 2012-04-09 08:06:35 -04:00
Zach Eveland
d02e4481d3 PID and VID are no longer hard-coded in bootloader. instead they are passed in at compile-time from makefile. also added and renamed built bootloader images for Micro and Leonardo 2012-04-09 08:03:56 -04:00
Zach Eveland
437025c6ee Revert "Revert "added a short delay and comment to boolean operator in CDC""
This reverts commit 200eefb4e2.
2012-04-06 21:23:17 -04:00
Federico Vanzati
200eefb4e2 Revert "added a short delay and comment to boolean operator in CDC"
This reverts commit ade4893f58.
2012-04-06 17:36:09 +02:00
Cristian Maglie
650d2e9a1a Added USBHost lib from Arduino ADK 2012-04-06 17:18:55 +02:00
Thibaut VIARD
be1ded6c86 [sam] adding -fdata-sections to makefiles 2012-04-05 20:14:21 +02:00
Thibaut VIARD
e10cabc054 [sam] fixing linker files and adding a compiler option 2012-04-05 18:23:19 +02:00
Thibaut VIARD
5e3faa6d5d [sam] putting temporary USBCore as disabled to allow compilation 2012-04-05 18:00:45 +02:00
Thibaut VIARD
ba47ad6b8d [sam] fixing badly the SAM3U UDPHS driver 2012-04-05 12:13:48 +02:00
Zach Eveland
ade4893f58 added a short delay and comment to boolean operator in CDC
Delay fixes problem where the port has been configured but not quite opened.  Federico found that 10 ms was the minimum time needed to avoid problems.
2012-04-03 10:52:38 -04:00
Cristian Maglie
b7c8b3ea74 Fixed compiling on windows 2012-04-02 18:30:53 +02:00
Zach Eveland
b685aef6ec added Boolean operators to HardwareSerial and CDC to test whether the port is ready to send data.
Mostly useful for Leonardo - simple way to test whether the port is actually opened by an application and ready to receive data.  For Serial objects attached to real UARTs always returns true.
2012-04-01 12:54:35 -04:00
Thibaut VIARD
f83cd2f3e7 [sam] prelimanary work on USB Device stack 2012-03-29 21:11:05 +02:00
Thibaut VIARD
5b3580fe36 [sam] fixing boards definitions 2012-03-29 17:16:37 +02:00
Thibaut VIARD
009bc1b722 [sam] adding prototypes to USB_driver.h 2012-03-29 11:37:35 +02:00
Thibaut VIARD
d7ae25360a [sam] removing usb driver from API core 2012-03-29 11:00:47 +02:00
Thibaut VIARD
1b591962f1 [sam] separating usb driver from core part 2012-03-29 10:59:24 +02:00
Thibaut VIARD
f865dde7ee [sam] moving ATMEL boards to dedicated place 2012-03-29 10:48:24 +02:00
Zach Eveland
97d9ce93ca fixed logic error in Keyboard.release() - now removes every occurrence of a key if it's present more than once 2012-03-28 19:46:32 -04:00
Zach Eveland
b86ec2723a removed horrible multi-key Keyboard.press() and Keyboard.release() methods
Saves 924 bytes of Flash
2012-03-28 18:46:10 -04:00
Zach Eveland
3d15f3781a eliminated Keyboard.type() - unnecessary duplication of Keyboard.write() (David Mellis). Also edit KeyboardReprogram example which was the only example using type() 2012-03-28 18:35:26 -04:00
Thibaut VIARD
dd8a20ad20 [sam] harmonizing building and source between variants (SAM EK need
rework)
2012-03-27 13:16:27 +02:00
Thibaut VIARD
d77dbe24ef Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm 2012-03-27 12:22:32 +02:00
Thibaut VIARD
e84859656a [sam] fixing int handlers prototypes and build files cleanup 2012-03-27 12:20:47 +02:00
Thibaut VIARD
baf2b2cc07 [sam] adding c99 and c++98 std options 2012-03-27 12:13:51 +02:00
Thibaut VIARD
3f1cdbaf5a [sam] fixing warning and doing cleanup of libsam build 2012-03-27 12:03:40 +02:00
Zach Eveland
259a2f18b3 added methods to Keyboard to handle multiple simultaneous key presses or releases (up to six each) 2012-03-26 17:28:02 -04:00
Zach Eveland
63fdb8ef7a Keyboard.type() now just presses and releases the key indicated - doesn't releaseAll() 2012-03-26 17:00:16 -04:00
Zach Eveland
2e140e4950 added stub methods for begin() and end() to Mouse and Keyboard 2012-03-26 16:02:40 -04:00
Cristian Maglie
21c661c9d4 [sam] fixed basic IDE compilation for sam3x 2012-03-26 19:27:45 +02:00
Thibaut VIARD
042149a9b1 [sam] Fixing arduino_due_x variant 2012-03-26 18:09:10 +02:00
Thibaut VIARD
2aa1f3ea34 [sam] removing useless DAC datasheet 2012-03-26 17:18:40 +02:00
Thibaut VIARD
02f620c1d3 [sam] switching to CMSIS Atmel package 2012-03-26 16:50:47 +02:00
Thibaut VIARD
62f3181008 [sam] removing current CMSIS package, better to use Atmel one 2012-03-26 13:46:46 +02:00
Thibaut VIARD
d1c8c5db3a [sam] fixing variants names following Cristian renaming 2012-03-26 13:26:19 +02:00
Zach Eveland
a0f1f1a930 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-24 09:30:17 -04:00
unknown
aa3dde0973 [sam] fixing libsam and adding support of due_x 2012-03-23 16:24:17 +01:00
unknown
33d4e07315 [sam] fixing wrong function header 2012-03-23 16:10:35 +01:00
unknown
47a37049eb [sam] Fixing cmsis system_sam3xa.c call to header 2012-03-23 16:03:41 +01:00
unknown
bdb4e991aa [sam] renaming cmsis system files to be consistent with the series naming 2012-03-23 16:02:00 +01:00
Cristian Maglie
d32541353e ARM: Added sam3x variant 2012-03-20 13:48:44 +01:00
David A. Mellis
13e0b9335c Putting ArduinoISP back to 19200 baud.
From 9600.  And lowering the delay in the heartbeat from 40 to 20,
which seems to fix things again.
2012-03-15 19:02:08 -04:00
Zach Eveland
067cca7baa reduced delay before starting the Leonardo bootloader
Since we use a magic RAM flag to signal to the bootloader there's a risk of the sketch overwriting the magic RAM location before the bootloader starts.  By reducing the watchdog timeout we reduce the chance of this happening.
2012-03-14 18:17:22 -04:00
Zach Eveland
a05a0d531b bugfix for Caterina not starting sketch if "verify upload" turned off in IDE.
Previously, if avrdude skipped the upload step the read while write memory might never be reenabled.  This would prevent the bootloader from ending and the sketch from starting - the bootloader just continued to run even after a successful upload.  Now enable RWW when we receive the AVR109 "Exit bootloader" 'E' command.  Had to disable lock bit changing support in the bootloader to free up flash for the change - will anyone miss it?
2012-03-14 17:48:11 -04:00
Zach Eveland
2a19c327bb changed Caterina timeout after self-programming to 500 ms (from 250 ms)
attempt to fix bug reported by Dave Mellis:
"avrdude: ser_close(): can’t reset attributes for device: Invalid argument"
is thrown after attempting an upload in the IDE (though the upload seems to be successful)
2012-03-14 17:07:14 -04:00
Zach Eveland
30421143f9 give Leonardo bootloader 250 ms to finish housekeeping before leaving self-programming mode
Earlier approach had bootloader end as soon as it was told to.  On Linux this caused problems with avrdude because the microcontroller never had a chance to send an acknowledgement.
2012-03-08 14:20:12 -05:00
Zach Eveland
33116711b0 removed old version of Leonardo's caterina bootloader, replaced with LUFA-based caterina 2012-03-08 13:47:42 -05:00
Cristian Maglie
177746aa7f Fix for some strange behaviours during board reset 2012-03-07 16:21:04 +01:00
Zach Eveland
18f08bc7d4 Added Keyboard support for all modifier and all common non-printing keys. 2012-03-03 23:37:39 -05:00
Zach Eveland
aec3752e52 Removed support for key mapping in Keyboard.
Was no longer being used and would be damn near impossible to support with the new scheme for handling modifiers and non-printing keyboard characters.
2012-03-03 23:06:44 -05:00
Zach Eveland
db82ab90eb added Keyboard methods press(), release(), and releaseAll()
Changes mean that a single, persistent key report must be used so keys can be added or removed.  Also reimplemented type() using the new methods.
2012-03-03 22:54:45 -05:00
Zach Eveland
8a35793794 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
Conflicts:
	.gitignore
2012-03-03 13:28:39 -05:00
Zach Eveland
7387db0673 fixed minor compilation warnings for Leonardo 2012-03-03 13:26:57 -05:00
David A. Mellis
f4f62f9a12 Small changes for the ATmega1284.
http://code.google.com/p/arduino/issues/detail?id=736
2012-03-02 18:58:53 -05:00
Zach Eveland
09aa8bd678 reduced Caterina timeout to 8 seconds from 16 2012-03-01 08:51:47 -05:00
Zach Eveland
93a47f884d changed auto-reset logic for Leonardo. only do WDT manipulation if the port is opened at 1200 bps. (Dave Mellis) 2012-03-01 08:51:16 -05:00
Zach Eveland
f505a3da4c Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-01 08:32:21 -05:00
David A. Mellis
7ab140700b Switching Mini w/ ATmega328 upload protocol from stk500 to arduino. 2012-02-29 17:25:46 -05:00
Cristian Maglie
5eef4ca79c Autoreset 1200 bps fix. 2012-02-27 17:41:38 +01:00
Zach Eveland
ae23ed0570 shortened the watchdog period for resetting Leonardo from 2 s to 250 ms. Reset into bootloader is much snappier. 2012-02-22 22:33:44 -05:00
Zach Eveland
65ddc6c43b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-22 15:19:32 -05:00
Zach Eveland
4c3aa52258 Leonardo now checks whether bootloader should be run after a WDT event.
Before the sketch initiates an auto-reset for upload it pokes a magic word into a specific RAM address.  On starting the bootloader checks this address.  If it finds the magic word it knows the bootloader code should run. If not it jumps straight back to sketch.

Test in a sketch by adding to setup():
wdt_enable(WDTO_2S);

Sketch should upload, start, run for two seconds, WDT, and sketch should restart (not bootloader).

Had to cut out unused descriptor code to make the bootloader still fit in 4k.
2012-02-14 12:17:30 -05:00
Zach Eveland
94c09c2618 Changed Leonardo fuses to select longer clock startup time.
Done with the aim of discriminating more reliably between reset sources.
2012-02-14 10:00:55 -05:00
Zach Eveland
52b0c7214b Leonardo bootloader jumps straight to sketch for a power-on reset.
Disconnect programmer after burning bootloader to get the full effect.  ICSP and JTAG programmers do a hardware reset after any reset condition, confusing the firmware a little.
2012-02-14 09:59:48 -05:00
Cristian Maglie
9d4cb18f05 ARM: Fixed some compiling issues 2012-02-13 18:00:10 +01:00
Cristian Maglie
1479b2b4cf ARM: updated package preferences 2012-02-13 17:58:30 +01:00
Zach Eveland
bab3c5eade Leonardo auto-reset-and-upload changes for Windows (explanation below)
On Windows COM port changes when board switched between bootloader and sketch.  No way to prevent this so now Windows users have to select the upload port separate from the comm port.  Also, handling of reset into bootloader was broken on Windows.  Would occasionally leave the original COM port completely unusable.  Changed the way this reset is initiated.
Finally, had to add upload.disable.flushing=true flag to boards.txt so IDE wouldn't try to flush the original COM port after it disappeared.
2012-02-13 00:56:06 -05:00
Zach Eveland
25a4fe8607 changed Leonardo bootloader and sketch PID values again (now 0x0701 for bootloader, 0x0801 for sketch) 2012-02-13 00:10:16 -05:00
David A. Mellis
0acebeeff4 prog_char -> char PROGMEM in Print.cpp
http://code.google.com/p/arduino/issues/detail?id=795
2012-02-12 19:52:03 -05:00
Zach Eveland
c39793001c adjusting descriptors - trying to prevent sketch and bootloader from grabbing different COM numbers on Windows 2012-02-08 01:16:56 -05:00
Zach Eveland
4ee57f12e9 changed Caterina descriptors - Arduino LLC VID, new PID, manufacturer string, and serial number 2012-02-07 23:52:55 -05:00
Zach Eveland
5d53eed01a fixed bug in Caterina which caused some programming instructions to fail
Timer 1 interrupts were trashing self-programming timing.  Now disable Timer 1 compare match before doing Flash tasks and reenable afterward.
2012-02-07 23:46:31 -05:00
Zach Eveland
f2d5ea87ad increased Leonardo bootloader timeout to 16 seconds 2012-02-06 15:23:41 -05:00
Cristian Maglie
043c190876 Upload size computation is now parametric 2012-02-06 00:51:24 +01:00
Cristian Maglie
a141a1dc1e Upload/Program with configurable generic command line tools (wip) 2012-02-05 23:17:15 +01:00
Zach Eveland
5483adf8fe proper bootloader timeout and LED control in Leonardo bootloader 2012-02-03 23:15:04 -05:00
Zach Eveland
1e0700b536 fixed starting Leonardo bootloader from sketch
AvrdudeUploader class opens and closes Leonardo port at the magic baudrate before starting avrdude; reduced reset timeout from 250 ms to 15 ms
2012-02-03 21:42:46 -05:00
Zach Eveland
086ed6382c modify boards.txt with new settings for Caterina_LUFA 2012-02-03 20:24:24 -05:00
Zach Eveland
5eb7ad154b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-03 19:54:33 -05:00
David A. Mellis
915e4889e4 Making head and tail unsigned to avoid division in serial ISR.
http://code.google.com/p/arduino/issues/detail?id=776
2012-02-03 17:24:29 -05:00
Cristian Maglie
30ec90aca3 First attemp to generalize upload for mutiplatform IDE 2012-02-01 14:34:29 +01:00
Zach Eveland
1303b6fbba Caterina now cleanly hands off operation to the sketch
had to remove TIMER1 operation from bootloader - was interfering with normal sketch operation
2012-01-24 18:04:10 -05:00
Zach Eveland
6498b66059 move interrupt vector table to application section before jumping to it after upload finished. 2012-01-21 16:51:55 -05:00
Zach Eveland
73f6f2edd5 Leonardo bootloader checks reason for reset and jumps immediately to sketch if reset was caused by WDT 2012-01-21 16:39:06 -05:00
Zach Eveland
371b72c681 stripped all LUFA LED control. from LUFA-based Caterina 2012-01-19 21:31:51 -05:00
Zach Eveland
83c9f21667 changed fuses to select 4k bootloader for LUFA-based Caterina 2012-01-19 21:18:07 -05:00
Zach Eveland
db397d5b35 added Board/LEDs.h to LUFA-based Caterina 2012-01-19 21:17:12 -05:00
Zach Eveland
98b0491fbd superficial changes to stock LUFA CDC bootloader - renamed project, removed unnecessary files 2012-01-19 20:31:35 -05:00
Zach Eveland
9c0352b22a initial checkin of LUFA 111009 CDC bootloader 2012-01-19 20:04:55 -05:00
Cristian Maglie
861aa9308b [arm] other refinements to platform.txt for sam3u 2012-01-13 20:41:01 +01:00
Cristian Maglie
fe001fdaba Factored out some common build variables 2012-01-13 20:39:48 +01:00
Cristian Maglie
160fa18adb Fixed platforms.txt and corrected some paths for multiplatform IDE 2012-01-13 19:09:07 +01:00