bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
15,561 Commits 1 Branch 4 Tags 151 MiB
14fe7ee414
Commit Graph

15561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
047c412df6 Merge pull request #3428 from thinkyhead/rc_consolidate_reprap_keypad 
Consolidate REPRAPWORLD_KEYPAD, disallow moves for unhomed Delta/SCARA
 2016-04-07 19:06:57 -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
Silvio
cc4bb5aa09 Merge pull request #2 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-04-07 19:14:17 +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
DavidBjerreBjoerklund
b80b40a578 Update language_da.h 
Added translation mentioned in issue #3351:
Homing would be best tranlated homing, or "Kører til udgangsposition".

#define MSG_SET_HOME_OFFSETS
#define MSG_LEVEL_BED_HOMING
#define MSG_LEVEL_BED_WAITING 
#define MSG_LEVEL_BED_DONE
#define MSG_LEVEL_BED_CANCEL 
#define MSG_HOME_OFFSETS_APPLIED
 2016-04-07 12:52:31 +02:00
Scott Lahteine
573d772c92 Merge pull request #3416 from paulusjacobus/RCBugFix 
Optimised Ducth messages to fit in 16 Char display Update language_nl.h
 2016-04-06 20:41:14 -07:00
paulusjacobus
3f7ae9a7ce Update language_nl.h 
Optimised all added messages to fit within 16 Characters
 2016-04-07 13:15:00 +10:00
Scott Lahteine
865dcf3fb4 Fix FILAMENT_WIDTH_SENSOR measurement 
Only measure and store filament width when E is going forward.
 2016-04-06 19:48:04 -07:00
Scott Lahteine
2f6c5fe2da Report the probe position in G30 2016-04-06 16:55:21 -07:00
Scott Lahteine
74effedbf5 Merge pull request #3412 from paulusjacobus/RCBugFix 
rebased my fork with RCBugFix release in order to push language_nl.h
 2016-04-06 16:53:35 -07:00
Scott Lahteine
bba1f16589 Merge pull request #3411 from esenapaj/patch-1 
Update Readme.fonts about Kana
 2016-04-06 16:19:19 -07:00
Scott Lahteine
c506743f63 Merge pull request #3406 from tnw513/FixLangIt 
Update to language_it.h
 2016-04-06 16:18:58 -07:00
Paul de Groot
48a4410f02 rebased my fork with RCBugFix release in order to push language_nl.h 2016-04-07 08:17:59 +10:00
esenapaj
ff9511b870 Update Readme.fonts about Kana 
I think that that sentence has been completed its part. 
Because Kana fonts were revised by me the other day(PR #3289), who am a native Japanese.

And for @AnHardt,
I'd like to take this opportunity to express one's heartfelt gratitude as a far eastern person,
about you has been maintaining the resource of Japanese despite you are a far western person.
 2016-04-07 07:13:46 +09:00
Silvio Didonna
e215c7100d fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:45:04 +02:00
Silvio Didonna
6208db3b00 fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:40:01 +02:00
Silvio
62612580ef Merge pull request #1 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-04-06 16:04:09 +02:00
João Brázio
e48d0263bf Bugfix: M32 was still using the old print timer 2016-04-06 04:41:36 +01:00
João Brázio
e8b80d8c20 Implemented M75, M76, M77 to control the print timer 2016-04-06 04:38:42 +01:00
João Brázio
eb61051556 Rework the print job timer to use the stopwatch class 2016-04-06 04:34:03 +01:00
João Brázio
399101fff3 Implemented the stopwatch class and methods 2016-04-06 04:23:45 +01:00
Scott Lahteine
2988147880 Merge pull request #3400 from thinkyhead/rc_sensor_per_extruder 
Add more leveling-debug output
 2016-04-05 19:38:03 -07:00
Scott Lahteine
98f2e9fc83 Reduce string storage required for DEBUG_LEVELING 2016-04-05 19:04:42 -07:00
Scott Lahteine
1af5d7b35f Add more leveling-debug output 2016-04-05 18:31:10 -07:00
Scott Lahteine
d5b19a49f6 Merge pull request #3384 from thinkyhead/rc_adjust_M111_output 
Final tweaks to M111 output
 2016-04-05 16:48:59 -07:00
Scott Lahteine
9536e28978 Merge pull request #3398 from thinkyhead/rc_sensor_per_extruder 
Catch a TEMP_SENSOR error before a pins issue
 2016-04-05 16:36:50 -07:00
Scott Lahteine
da2ff4a6d3 Catch a TEMP_SENSOR error before a pins issue 2016-04-05 16:17:28 -07:00
Scott Lahteine
90f6f02aca Merge pull request #3397 from thinkyhead/rc_menu_issues_fixer 
Revert #3388, clean up lcd_move code
 2016-04-05 15:45:35 -07:00
Scott Lahteine
fb38d698db Add feedback after "Click to Begin" 2016-04-05 15:35:05 -07:00
Scott Lahteine
d5f0db26dc Merge pull request #3390 from jbrazio/docs/update-source-url 
Update DEFAULT_SOURCE_URL comment
 2016-04-05 15:17:07 -07:00