bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
4,725 Commits 1 Branch 4 Tags 151 MiB
196af30467
Commit Graph

3819 Commits

Author SHA1 Message Date
Scott Lahteine
f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine
3613c550fa Rename README file for fonts 2016-04-18 20:09:03 -07:00
esenapaj
1110814ecf Update and change Japanese translation 
Update and change Japanese translation

・Follow-up the PR #3411(Update Readme.fonts about Kana), Remove "who really..." strings. I had forgotten it.
・Add readable translated strings in comment
・Add Japanese translation.
  MSG_LCD_ENDSTOPS "エンドストップ"
  (utf8 version only. Because non-utf8 version ("ｴﾝﾄﾞｽﾄｯﾌﾟ") over 8 characters)
・Change translation.
  MSG_ACC "カソクド mm/s2"
  MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" ("ｶｿｸﾄﾞ mm/s2")
 2016-04-19 11:28:26 +09:00
Scott Lahteine
a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine
ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine
eda821ca1c Merge pull request #3556 from philfifi/fix_pullup 
Fix bug in pullups handling for Z_MIN_PROBE
 2016-04-18 18:04:26 -07:00
Scott Lahteine
25b1556a94 Merge pull request #3552 from tnw513/fix_endstops_witbox 
Endstop settings modified (witbox). Issue #3547
 2016-04-18 18:03:22 -07:00
Scott Lahteine
2bc2485313 Update font remarks in Conditionals.h 2016-04-18 17:33:41 -07:00
Philippe LUC
86c868771b Fix bug in pullups handling for Z_MIN_PROBE 2016-04-18 21:16:23 +02:00
Silvio Didonna
91de69bb6e Endstop settings modified. Witbox have max endstops for X and Y. 2016-04-18 16:46:19 +02:00
Scott Lahteine
f2558b1f2c Additional delta config updates 2016-04-17 20:04:52 -07:00
Marc Urben
9a661bdd59 Updated Kossel XL config files for the latest Marlin 2016-04-17 20:04:19 -07:00
Scott Lahteine
09c6323b68 Merge pull request #3543 from thinkyhead/rc_better_bootscreen 
Better splash screen consolidation
 2016-04-17 17:20:13 -07:00
Scott Lahteine
5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift 
Add a final lift, if configured, in Manual Bed Leveling
 2016-04-17 17:20:02 -07:00
Scott Lahteine
af1711365b Merge pull request #3538 from jbrazio/bugfix/endtop-hit-redeclared 
_ENDSTOP_HIT redeclared
 2016-04-17 17:12:56 -07:00
Scott Lahteine
ed622ac796 Better splash screen consolidator 2016-04-17 17:06:07 -07:00
Jeff K
90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops 
Signed-off-by: Jeff K
 2016-04-17 19:28:50 -04:00
João Brázio
bcf1e027bb
Fix the redeclaration of _ENDSTOP_HIT 2016-04-17 18:37:37 +01:00
Scott Lahteine
c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine
b6227932f5 Merge pull request #3530 from thinkyhead/rc_set_rcbugfix_for_now 
Set version for RCBugFix
 2016-04-16 21:40:55 -07:00
Scott Lahteine
19741a0ba6 Merge pull request #3503 from thinkyhead/rc_lcd_endstop_msg 
Show all endstops on LCD in checkHitEndstops
 2016-04-16 21:32:25 -07:00
Scott Lahteine
7aaff371b0 Set version for RCBugFix 2016-04-16 21:30:52 -07:00
Scott Lahteine
db86aaf385 Merge pull request #3528 from thinkyhead/rc_fix_bed_level_equation_oopsie 
Fix borked set_bed_level_equation_lsq
 2016-04-16 21:01:06 -07:00
Scott Lahteine
837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine
7c16e774ca Show all endstops on LCD in checkHitEndstops 2016-04-16 20:08:42 -07:00
Scott Lahteine
40050db210 Improve code in Sd2Card::readBlock 2016-04-16 20:03:39 -07:00
Scott Lahteine
8429ae6beb Merge pull request #3525 from thinkyhead/rc_fix_pid_params_per_extruder 
Fix broken PID_PARAMS_PER_EXTRUDER
 2016-04-16 19:49:42 -07:00
Scott Lahteine
339b5b3e34 Patch more configs with new changes 2016-04-16 19:35:02 -07:00
Scott Lahteine
ef2fd620e9 Suggested fixups for LCD/SD config comments 2016-04-16 19:35:02 -07:00
João Brázio
7b5d6ba315 Rebase & feedback 2016-04-16 19:35:02 -07:00
João Brázio
d7cc2c0847 Moved some conditionals to Conditionals.h 2016-04-16 19:32:41 -07:00
João Brázio
36a49eab1c Improved the LCD and SD comments blocks in Configuration.h 2016-04-16 19:32:41 -07:00
Scott Lahteine
d4a848c72a Fix broken PID_PARAMS_PER_EXTRUDER 
As noted by @FalloutBe in #3519
 2016-04-16 19:19:40 -07:00
Scott Lahteine
0fc84b75f4 Merge pull request #3522 from esenapaj/patch-1 
Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
 2016-04-16 19:03:27 -07:00
Scott Lahteine
4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -07:00
esenapaj
832e1c1f2a Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking) 
・Add more "UL" suffix
・Restore removed "UL" suffix
 2016-04-17 07:50:02 +09:00
Scott Lahteine
234987ee2f Fix MBL lift 2016-04-16 14:17:06 -07:00
Scott Lahteine
e0830bf8f1 Don't use LCD alert unless error or alert level is reset later 2016-04-15 18:48:49 -07:00
Scott Lahteine
773229b020 Merge pull request #3515 from thinkyhead/rc_wider_splash 
On wider screens show a wider splash page, if possible
 2016-04-15 17:26:01 -07:00
Scott Lahteine
86467c24be On wider screens show a wider splash page, if possible 2016-04-15 16:42:29 -07:00
Scott Lahteine
a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
esenapaj
5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco
8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine
1cc622b167 Fix minor spelling in comments 2016-04-14 20:06:59 -07:00
Scott Lahteine
866c5be395 Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros 
Reduce redundancy in MENU_ITEM code
 2016-04-14 19:09:14 -07:00
Scott Lahteine
6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging 
Fix debugging of vector_3
 2016-04-14 19:08:30 -07:00
Scott Lahteine
88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits 
Relating current_position, min_pos, max_pos, and home_offset
 2016-04-14 18:50:43 -07:00
Scott Lahteine
b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine
4fb8013be1 Reduce redundancy in MENU_ITEM code 2016-04-14 18:42:06 -07:00
Scott Lahteine
b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs 
General cleanup of arc code
 2016-04-14 18:19:44 -07:00
Scott Lahteine
f2abfd6d48 Merge pull request #3501 from thinkyhead/rc_config_comment_cleanup 
Update some comments in Configuration.h
 2016-04-14 18:19:29 -07:00
Scott Lahteine
2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine
0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine
b05f448317 Comments on MBL menu items 2016-04-14 16:58:42 -07:00
Scott Lahteine
e08dd0d831 Merge pull request #3498 from thinkyhead/rc_preheat_abs_both_3489 
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
 2016-04-14 16:57:38 -07:00
Scott Lahteine
9e95f30de0 Merge pull request #3495 from jbrazio/bugfix/followup-3485 
Throw an error if ENCODER_PULSES_PER_STEP < -1
 2016-04-14 16:56:36 -07:00
Scott Lahteine
8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine
5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine
de8c0baf8b Update some comments in Configuration.h 2016-04-14 16:41:20 -07:00
Scott Lahteine
fda8f96f00 Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123 
Trying to preheat a non-existent extruder causes a crash.
 2016-04-14 15:48:43 -07:00
João Brázio
9a3f676709
Throw an error if ENCODER_PULSES_PER_STEP < -1 2016-04-14 16:20:17 +01:00
gralco
69c00aea4c Include bed hysteresis setting in the example configs 2016-04-14 08:03:38 -06:00
Scott Lahteine
9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments 
Document some movement functions, rename a local
 2016-04-13 20:55:20 -07:00
Scott Lahteine
f8e10ff1d8 Merge pull request #3491 from thinkyhead/rc_mechanical_probe 
Support for "mechanical probe" with Allen Key as a special case
 2016-04-13 20:55:14 -07:00
Scott Lahteine
7eb476597f Update some comments in Configuration.h 2016-04-13 20:34:42 -07:00
esenapaj
2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine
cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine
5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine
c1b953d38f Merge pull request #3487 from thinkyhead/rc_redo_esenpaj_3479 
Apply esenapaj 3479 and delta/scara position bugfix
 2016-04-13 18:11:33 -07:00
Scott Lahteine
a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine
2ae7394640 More fine-grained control of LCD redraw 2016-04-12 21:34:34 -07:00
Scott Lahteine
525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array 
Fix: gcode_T using non-existent Z offset
 2016-04-12 18:23:08 -07:00
Scott Lahteine
b9301e6c62 Merge pull request #3482 from thinkyhead/rc_fix_HAS_Z_MIN_PROBE 
Patch conditions for HAS_Z_MIN_PROBE
 2016-04-12 18:23:02 -07:00
Scott Lahteine
dc0a3e37be Patch conditions for HAS_Z_MIN_PROBE 2016-04-12 18:11:36 -07:00
Scott Lahteine
46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine
edf376ce0d Fix: gcode_T using non-existent Z offset 
As noted by @snowzach in #3461
 2016-04-12 17:15:10 -07:00
gralco
178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine
0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t 
Add DEBUG_LEVELING output for gcode_T
 2016-04-11 21:03:15 -07:00
Scott Lahteine
c03e5f5efd Merge pull request #3475 from thinkyhead/rc_language_cleanup 
General cleanup of language files
 2016-04-11 20:50:57 -07:00
Scott Lahteine
910d3648bb Merge pull request #3474 from thinkyhead/rc_russian_apr2016 
Additional Russian translations
 2016-04-11 20:50:50 -07:00
Scott Lahteine
63d8893f5d Add DEBUG_LEVELING output for gcode_T 2016-04-11 20:45:10 -07:00
Scott Lahteine
081cfc5cf3 Merge pull request #3472 from thinkyhead/fix_issue_3375 
Initialize stepper counts for Delta/SCARA
 2016-04-11 19:59:12 -07:00
Scott Lahteine
fe0fe184aa Replace some tabs with spaces 2016-04-11 19:42:20 -07:00
Scott Lahteine
e773d081c0 General language file cleanup 2016-04-11 19:42:09 -07:00
Scott Lahteine
b63c79b5ff Merge pull request #3473 from thinkyhead/rc_one_more_elapse 
Fix a messed up ELAPSED instance
 2016-04-11 19:30:59 -07:00
Scott Lahteine
068bc980ce Additional Russian translations 
Thanks to @gans-AD – #3363
 2016-04-11 19:30:14 -07:00
Scott Lahteine
f840c7de4d Initialize stepper counts for Delta/SCARA 2016-04-11 19:02:35 -07:00
Scott Lahteine
c5a8755cc0 Fix a messed up ELAPSED instance 2016-04-11 18:48:27 -07:00
Scott Lahteine
81918657f4 Fix Deutsch string errors, redundancies 2016-04-11 18:12:32 -07:00
Scott Lahteine
56acaf3594 Merge pull request #3469 from thinkyhead/rc_aleph_cooldownfix 
Fix for M109 and M190 cooldown
 2016-04-11 18:01:01 -07:00
gralco
c218db136a Fix for M109 and M190 cooldown 
Also removes the re-definition of now inside M190's while loop
 2016-04-11 17:12:23 -07:00
Scott Lahteine
e2a197ab71 Merge pull request #3467 from AnHardt/Fix-Servo-without-endstop-probe 
Fix-Servo-without-endstop/probe
 2016-04-11 17:04:54 -07:00
Scott Lahteine
3a1ac14bbc Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement 
More bits when encoderPosition is cast as signed
 2016-04-11 17:03:23 -07:00
Scott Lahteine
c5a2ce4366 Merge pull request #3446 from thinkyhead/rc_fixup_M206_and_mesh 
Fix home_offset handling and account for it in G29
 2016-04-11 16:49:01 -07:00
Scott Lahteine
b1bb1c7989 Merge pull request #3466 from thinkyhead/rc_look_for_leveling_bug 
Add CORE support to st_set_position and plan_set_position
 2016-04-11 16:45:00 -07:00
AnHardt
9cc571b312 Fix-Servo-without-endstop-probe 
Sorry for not having realized someone (me) redefined not existing servo pinns to -1, some lines above.
This is a simple error - not a feature.
 2016-04-12 01:01:11 +02:00
Scott Lahteine
3e5312f116 CORE support for st_set_position & plan_set_position 2016-04-11 15:13:42 -07:00
Scott Lahteine
e087a99a10 Some cleanup of st_get_pos functions 2016-04-11 15:13:42 -07:00
João Brázio
ca6c6ec4ca
Versions of Arduino IDE prior to 1.6.0 are no longer supported 2016-04-11 19:03:06 +01:00
Scott Lahteine
fdee2be49c More logging of matrix behavior 2016-04-11 00:06:33 -07:00
Scott Lahteine
7f265db3ef Move sync_plan_position after DEBUG_LEVELING 2016-04-10 23:40:11 -07:00
Scott Lahteine
02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190 
ELAPSED / PENDING for rollover-safe time checking
 2016-04-10 20:25:02 -07:00
Scott Lahteine
7c770f039c Merge pull request #3456 from thinkyhead/rc_MSG_ERR_REDUNDANT_TEMP 
Remove redundant text from MSG_ERR_REDUNDANT_TEMP
 2016-04-10 20:23:55 -07:00
Scott Lahteine
925cc305ce Merge pull request #3455 from michos-conradt/RCBugFix 
Add missing translations for German
 2016-04-10 19:18:42 -07:00
Scott Lahteine
011f4736f1 Remove redundant text from MSG_ERR_REDUNDANT_TEMP 2016-04-10 19:14:46 -07:00
Scott Lahteine
906c1c066f Merge pull request #3423 from jbrazio/translate/pt_BR 
Added missing pt_BR translation
 2016-04-10 19:13:52 -07:00
Scott Lahteine
803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Michael Conradt
f3a7a5c99b Merge branch 'RCBugFix' into translations 2016-04-11 03:50:23 +02:00
Michael Conradt
8b923039e2 Add missing german translations. 2016-04-11 03:20:21 +02:00
Scott Lahteine
386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine
1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine
f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine
562e281c73 Merge pull request #3443 from thinkyhead/rc_host_timeout_tweak 
Adjust timeout code in host_keepalive
 2016-04-09 17:45:36 -07:00
Scott Lahteine
6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine
8198cc30b5 More bits when encoderPosition is cast as signed 2016-04-09 14:22:12 -07:00
Michael Neumann
95acba2cfa Wrong Pin Assignment Megatronics 3 
SERVO2 is doubled defined and causes compiler errors
 2016-04-09 11:23:22 +02:00
Scott Lahteine
50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
Scott Lahteine
6bd20371f0 Merge pull request #3438 from thinkyhead/rc_M109_residency_loop_fix 
Fix bug which can cause an infinite M109 loop
 2016-04-08 21:36:30 -07:00
Scott Lahteine
96e37bb70a Merge pull request #3419 from DavidBjerreBjoerklund/patch-2 
Update language_da.h
 2016-04-08 21:35:58 -07:00
Scott Lahteine
13d758c651 Merge pull request #3420 from DavidBjerreBjoerklund/patch-3 
Update language_da.h
 2016-04-08 21:31:14 -07:00
Scott Lahteine
518068a5a8 Merge pull request #3425 from tnw513/FixLangIt 
Optimized Italian strings to fit in 16 character display
 2016-04-08 21:29:28 -07:00
Scott Lahteine
1b81e5adc7 Merge pull request #3431 from AnHardt/lang-de 
de-language additions
 2016-04-08 21:25:00 -07:00
Scott Lahteine
1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco
907aed57db Fix bug which can cause an infinite M109 loop 
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
 2016-04-08 21:20:23 -07:00
jbrazio
dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine
843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling 
Additional debug leveling output
 2016-04-08 18:57:18 -07:00
Scott Lahteine
a644ab1de4 Minor patch ups to G29 
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
 2016-04-08 17:53:15 -07:00
Scott Lahteine
cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
AnHardt
c3d1b7db2d de-language additions 2016-04-08 22:51:04 +02:00
Scott Lahteine
4e17187c96 Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara 
No LCD Move for unhomed Delta/SCARA
 2016-04-07 19:29:45 -07:00
Scott Lahteine
5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR 
No casting needed for SERIAL_ECHOPAIR
 2016-04-07 19:29:18 -07:00
Scott Lahteine
e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine
85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine
2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -07:00
Scott Lahteine
098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position 
Report the probe position in G30
 2016-04-07 19:25:33 -07:00
Scott Lahteine
3460d01441 Merge pull request #3422 from jbrazio/translate/pt_PT 
Update pt_PT translation
 2016-04-07 19:18:56 -07:00
Scott Lahteine
c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion 
M109: Protect against EXTRUDE_MINTEMP expansion
 2016-04-07 19:18:34 -07:00
Scott Lahteine
d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch 
Print job timer rework
 2016-04-07 19:18:03 -07:00
Scott Lahteine
f834bcd43a Merge pull request #3415 from thinkyhead/rc_filwidth_issue 
Fix FILAMENT_WIDTH_SENSOR measurement
 2016-04-07 19:08:42 -07:00
Scott Lahteine
5fc6daba2b Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed 2016-04-07 18:40:54 -07:00
Scott Lahteine
7bb15a1c57 Consolidate REPRAPWORLD_KEYPAD definitions 2016-04-07 18:40:54 -07:00
Scott Lahteine
dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
Scott Lahteine
165e73794a Tweak encoderPosition non-zero test 2016-04-07 16:09:42 -07:00
Scott Lahteine
479d307a44 Disable LCD Move XYZ for unhomed Delta/SCARA 2016-04-07 16:09:42 -07:00
Silvio Didonna
9088802da1 Optimized Italian strings to fit in 16 character display 2016-04-07 19:18:22 +02:00
João Brázio
801cd48a72
Added missing pt_BR translation 2016-04-07 13:07:57 +01:00
João Brázio
013f19054b
Update pt_PT translation 2016-04-07 13:00:08 +01:00
João Brázio
471d30cc1c
M109: Protected against EXTRUDE_MINTEMP expansion 2016-04-07 12:50:57 +01:00
DavidBjerreBjoerklund
5f840d2e30 Update language_da.h 
Corrected:
MSG_KILLED
MSG_NO_MOVE
MSG_STOPPED
MSG_PRINT_ABORTED
MSG_ON
MSG_OFF
 2016-04-07 13:42:27 +02:00
João Brázio
7c7e30f4cc
Adherence to the new OOP coding standards 2016-04-07 12:41:09 +01:00