zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
4430 commits 1 branch 0 tags 156 MiB
Commit graph

4430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 7bb15a1c57 Consolidate REPRAPWORLD_KEYPAD definitions 2016-04-07 18:40:54 -07: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 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
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
Scott Lahteine ce58d1d4d5 Merge pull request #3392 from barus93/patch-2 
Update language_it.h
 2016-04-05 15:16:24 -07:00
Scott Lahteine bd5ca62290 Merge pull request #3393 from gege2b/RCBugFix 
Some omitted french translation
 2016-04-05 15:14:48 -07:00
Scott Lahteine 582b58e660 Add audio feedback to edit items 2016-04-05 14:51:11 -07:00
Scott Lahteine a70c3ffc21 Minor syntax tweak with encoderPosition 2016-04-05 14:51:11 -07:00
Scott Lahteine 0f247187b8 Drop extra setting of currentMenu 2016-04-05 14:51:11 -07:00
Scott Lahteine 24cde86a4f Fix syntax highlighting of menu_edit_type lines 2016-04-05 14:51:11 -07:00
Scott Lahteine 86372cd394 Add underscore to internal lcd move function names 2016-04-05 14:51:11 -07:00
Scott Lahteine aa97328cd3 Use min_pos/max_pos for _lcd_move 2016-04-05 14:51:10 -07:00
Scott Lahteine f936df9507 Small cleanup of feedrate dead-zone 2016-04-05 14:51:10 -07:00
Scott Lahteine f5c2fb27cd Handle defer_return_to_status in lcd_goto_menu 2016-04-05 14:51:10 -07:00
Scott Lahteine 8459f7fa5c Use ms where possible. 2016-04-05 14:51:10 -07:00
Scott Lahteine 34ce9c4c1c Restore save previous for menu edit items 2016-04-05 14:26:36 -07:00
Gege2B 03d5c9a482 Merge remote-tracking branch 'upstream/RCBugFix' into RCBugFix 2016-04-05 12:14:15 +02:00
Gege2B 4ea45d5c56 Some omitted french translation 2016-04-05 12:04:29 +02:00
barus93 f43e37bb0c Update language_it.h 
New messages translated:
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Click to Begin"
#define MSG_LEVEL_BED_DONE "Leveling Done!"
#define MSG_LEVEL_BED_CANCEL "Cancel"
. . .
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
 2016-04-05 07:24:07 +02:00
João Brázio 9240682630 Followup #3326: Update DEFAULT_SOURCE_URL comment 2016-04-05 02:21:23 +01:00
Scott Lahteine 6c48b4e006 Merge pull request #3387 from thinkyhead/travis_readability 
Comments for legibility, include DEBUG_LEVELING, SDSUPPORT
 2016-04-04 17:05:58 -07:00
Scott Lahteine 4b8a71055e Merge pull request #3388 from thinkyhead/rc_fix_move_menu_bug 
Fix: menu edit items saving position twice
 2016-04-04 17:05:15 -07:00
Scott Lahteine 1220dfd5d6 Fix: menu edit items saving position twice 2016-04-04 16:36:04 -07:00
Scott Lahteine ad61a8684a Comments for legibility, test DEBUG_LEVELING 2016-04-04 16:31:37 -07:00
Scott Lahteine b5920837ea Merge pull request #3370 from esenapaj/patch-1 
Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags
 2016-04-04 16:12:50 -07:00
Scott Lahteine 53b397ab14 Merge pull request #3364 from jbrazio/script/find-missing-translations 
Added a script to check all language files for missing translations
 2016-04-04 16:10:36 -07:00
Scott Lahteine d6fe454a13 Merge pull request #3386 from thinkyhead/rc_spanish_rebase 
Add Missing Spanish translation
 2016-04-04 16:07:34 -07:00
Scott Lahteine 2abea41c41 Merge pull request #3385 from thinkyhead/rc_dutch_translation 
Update language_nl.h
 2016-04-04 16:02:11 -07:00
RicardoGA 1bfaf57ee5 Add Missing Spanish translation 
Add the missing translation (Spanish) issue #3353
 2016-04-04 15:55:59 -07:00
paulusjacobus 4a4b797dca Update language_nl.h 
Added these messages with Dutch translation
#define MSG_BED_Z
#define MSG_A_TRAVEL
#define MSG_HEATING_FAILED_LCD
#define MSG_ERR_REDUNDANT_TEMP
#define MSG_THERMAL_RUNAWAY
#define MSG_ERR_MAXTEMP
#define MSG_ERR_MINTEMP
#define MSG_ERR_MAXTEMP_BED
#define MSG_ERR_MINTEMP_BED
#define MSG_HEATING
#define MSG_HEATING_COMPLETE
#define MSG_BED_HEATING
#define MSG_BED_DONE
 2016-04-04 15:46:50 -07:00
Scott Lahteine 1ee903f30d Merge pull request #3376 from gege2b/RCBugFix 
French translation
 2016-04-04 15:40:00 -07:00
Scott Lahteine c5ff2c7d32 Merge pull request #3377 from clexpert/patch-1 
Update language_cz.h
 2016-04-04 15:39:44 -07:00
Scott Lahteine 99898ea652 Merge pull request #3379 from barus93/patch-2 
Update language_it.h
 2016-04-04 15:39:15 -07:00
Scott Lahteine 56e8e2b0eb Final tweaks to M111 output 2016-04-04 15:36:07 -07:00