233df9cca0
Add missing LF at the end of the file
13 years ago
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
13 years ago
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
13 years ago
8efd4cfd73
fixed merge conflict
13 years ago
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
13 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
13 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
13 years ago
aed5965ad8
Italian language: remove space and some fix
13 years ago
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
13 years ago
a0d4e8e78e
Add Messages for SD Card init. & change
13 years ago
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.
13 years ago
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.
13 years ago
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
13 years ago
7f30039d2a
+ Finnish translation
13 years ago
5f82f03ff3
Add italian MSG_RESUMING.
13 years ago
5e3873c8db
Add german MSG_RESUMING.
13 years ago
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.
13 years ago
58e806f3fa
Fix the russial translation.
13 years ago
50a5ce1dc4
deduplicate messages
13 years ago
6123a00e64
Fix the german translation.
13 years ago
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.
13 years ago
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)
13 years ago
9b1d2483a0
I hope last changes to french translation
13 years ago
b1adc567da
Correction to french translation (non-ASCII chars only)
13 years ago
0807d82af0
Correction to french translation (plain text only)
13 years ago
bb119739b0
Added french translation
13 years ago
6a55ca8370
Added Polish translation. Cosmetic changes to English.
13 years ago
332344bd43
Update Marlin/language.h
...
Included Portuguese language
13 years ago
695938ba3f
Italian language support
13 years ago
24bcc9647d
Added Russian translation
13 years ago
df09e2adce
Spanish updated
13 years ago
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
13 years ago
4bf8b1aeee
fesfas
13 years ago
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
13 years ago
ebc4601185
Some new dialogs translated to Spanish
13 years ago
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
13 years ago
0e58ef6805
Some dialogs are corrected
13 years ago
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
13 years ago
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
13 years ago
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)
13 years ago
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.
13 years ago
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
13 years ago
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
13 years ago
d38b96fff1
Update Marlin/language.h
13 years ago
9f7f7354f5
Set default language 1
13 years ago
aee475aa55
Update Marlin/language.h
...
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
13 years ago
e10355500d
Updated Language.h with pause, resume, and retract
13 years ago
603a5e25b3
Updated german translations in language.h and eliminated a few double lines.
13 years ago
bf077125b9
added firmware retract. disabled by default
14 years ago
Dirk Eichel