Commit graph

63 commits

Author SHA1 Message Date
Dirk Eichel ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin 2013-03-01 17:27:57 +01:00
Dirk Eichel 8efd4cfd73 fixed merge conflict 2013-03-01 16:27:35 +01:00
Denis Bakin 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
Conflicts:
	Marlin/language.h
	Marlin/thermistortables.h
2013-02-18 12:10:52 -05:00
daid 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1
Marlin v1, alignment of the Italian language
2013-02-16 15:41:43 -08:00
Daniele Sdei 82e28851bd Italian language: SD-Card change and SD-Card init 2013-02-16 12:17:29 +01:00
Daniele Sdei aed5965ad8 Italian language: remove space and some fix 2013-02-16 12:14:50 +01:00
codenamepawel d360846dd4 Update Marlin/language.h
Update Polish language 	#define MSG_RESUMING "Wznawiam drukowanie"
2013-02-16 03:42:53 +01:00
Dirk Eichel a0d4e8e78e Add Messages for SD Card init. & change 2013-02-13 10:05:18 +01:00
Denis B 70871715e4 Added support for extruder offset handling
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
2013-02-04 23:05:45 -05:00
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger.
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
2013-01-27 13:21:34 +01:00
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-01-14 15:47:40 +01:00
daid 965baf2683 Merge pull request #362 from daid/Marlin_v1
Finnish language
2013-01-09 02:42:09 -08:00
Henry Palonen 7f30039d2a + Finnish translation 2013-01-08 19:21:34 +02:00
Daniele Sdei 5f82f03ff3 Add italian MSG_RESUMING. 2012-12-28 11:44:35 +01:00
daid303 5e3873c8db Add german MSG_RESUMING. 2012-12-25 20:53:11 +01:00
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. 2012-12-21 16:14:47 +01:00
Sergey Taranenko 58e806f3fa Fix the russial translation. 2012-12-14 15:39:26 +04:00
Sergey Taranenko 50a5ce1dc4 deduplicate messages 2012-12-14 15:37:05 +04:00
daid303 6123a00e64 Fix the german translation. 2012-12-14 11:11:02 +01:00
daid303 1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated. 2012-12-12 11:47:03 +01:00
daid303 5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition) 2012-12-11 14:53:53 +01:00
Gege 9b1d2483a0 I hope last changes to french translation 2012-11-18 22:34:56 +01:00
Gege b1adc567da Correction to french translation (non-ASCII chars only) 2012-11-18 20:00:41 +01:00
Gege 0807d82af0 Correction to french translation (plain text only) 2012-11-18 19:39:56 +01:00
gege2b bb119739b0 Added french translation 2012-11-16 18:38:50 +01:00
Martin Lukasik 6a55ca8370 Added Polish translation. Cosmetic changes to English. 2012-11-12 15:54:07 +00:00
YanFM 332344bd43 Update Marlin/language.h
Included Portuguese language
2012-11-07 09:43:13 -02:00
Daniele Sdei 695938ba3f Italian language support 2012-10-17 12:48:26 +02:00
Sergey Taranenko 24bcc9647d Added Russian translation 2012-10-12 18:33:05 +04:00
elgambitero df09e2adce Spanish updated 2012-09-26 19:14:07 +02:00
elgambitero ddf6603d81 Spanish language updated. Bug fixes on dialogs. 2012-09-26 19:11:45 +02:00
elgambitero 4bf8b1aeee fesfas 2012-09-26 19:05:31 +02:00
elgambitero 7afd202b89 New dialogs translated to spanish. Bug fixes.
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
2012-09-25 19:16:57 +02:00
elgambitero ebc4601185 Some new dialogs translated to Spanish 2012-09-25 19:08:44 +02:00
ZetaPhoenix 8ac5b29e02 Changes to M119 response for easier visual comparison
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic.  Added strings to language.h.

Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
2012-09-16 14:51:24 -07:00
Erik vd Zalm 0e58ef6805 Some dialogs are corrected 2012-08-29 21:15:59 +02:00
elgambitero 6cd150842f Update Marlin/language.h
Some dialogs corrected and Default language set to 1
2012-08-22 21:46:22 +03:00
elgambitero 299c18596f Update Marlin/language.h
Some dialogs are corrected
2012-08-22 21:44:57 +03:00
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
2012-08-22 13:05:42 +02:00
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. 2012-08-21 23:46:10 +01:00
stohn 69961dbba3 fixed incorrect menu messages from last commit...
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
2012-08-21 14:44:20 +02:00
Blair Thompson 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde 2012-08-20 21:54:47 +01:00
elgambitero d38b96fff1 Update Marlin/language.h 2012-08-12 22:45:11 +03:00
Erik vd Zalm 9f7f7354f5 Set default language 1 2012-08-12 21:29:42 +02:00
elgambitero aee475aa55 Update Marlin/language.h
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
2012-08-12 21:26:17 +03:00
James Adams e10355500d Updated Language.h with pause, resume, and retract 2012-08-11 15:29:26 +02:00
kobaan 603a5e25b3 Updated german translations in language.h and eliminated a few double lines. 2012-07-16 14:26:28 +03:00
Bernhard bf077125b9 added firmware retract. disabled by default 2012-06-02 20:32:28 +02:00
Daid b59724e42b Add strigification for extruder amount in M115 report. 2012-05-19 19:01:14 +02:00
Daid 516ec90242 Add M401 - Wait for user on LCD button press 2012-05-19 17:54:07 +02:00