2cb716f513
Run Marlin/language.h through dos2unix
12 years ago
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
12 years ago
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
e509cdbeb0
added contrast control function for gLCDs
12 years ago
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
12 years ago
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
12 years ago
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
12 years ago
73f21cd5d6
Spanish updated so far.
12 years ago
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
c1d7cf939e
Update language.h
12 years ago
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
ac52dcc174
Updated the card menu and watch messages to make it more informative.
12 years ago
93f0463b21
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
...
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
12 years ago
038d405254
Corrected #endif in language.h
12 years ago
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
12 years ago
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
d2b00fe486
Removed html and added rumba
...
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
12 years ago
233df9cca0
Add missing LF at the end of the file
12 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.
12 years ago
86bf911139
Toggle menu for PSU from LCD pannel
...
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
12 years ago
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
8efd4cfd73
fixed merge conflict
12 years ago
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
aed5965ad8
Italian language: remove space and some fix
12 years ago
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
a0d4e8e78e
Add Messages for SD Card init. & change
12 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.
12 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.
12 years ago
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
12 years ago
7f30039d2a
+ Finnish translation
12 years ago
5f82f03ff3
Add italian MSG_RESUMING.
12 years ago
5e3873c8db
Add german MSG_RESUMING.
12 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.
12 years ago
58e806f3fa
Fix the russial translation.
12 years ago
50a5ce1dc4
deduplicate messages
12 years ago
6123a00e64
Fix the german translation.
12 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.
12 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)
12 years ago
9b1d2483a0
I hope last changes to french translation
12 years ago
b1adc567da
Correction to french translation (non-ASCII chars only)
12 years ago
0807d82af0
Correction to french translation (plain text only)
12 years ago
bb119739b0
Added french translation
12 years ago
6a55ca8370
Added Polish translation. Cosmetic changes to English.
12 years ago
332344bd43
Update Marlin/language.h
...
Included Portuguese language
12 years ago
695938ba3f
Italian language support
12 years ago
24bcc9647d
Added Russian translation
12 years ago
df09e2adce
Spanish updated
12 years ago
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
12 years ago
4bf8b1aeee
fesfas
12 years ago
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
12 years ago
ebc4601185
Some new dialogs translated to Spanish
12 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
12 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
13 years ago
b59724e42b
Add strigification for extruder amount in M115 report.
13 years ago
516ec90242
Add M401 - Wait for user on LCD button press
13 years ago
279d00da9f
Fixed #if for Ultimaker.
13 years ago
5aa80e6c05
Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"
13 years ago
8503b78876
Added support for 2nd extruder temperature to UltraLCD
13 years ago
ad8bc71d3e
- Fixed a typo
13 years ago
63aec3c56e
Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
...
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
4deeffbc88
Added missing defines to the german section.
...
Translation still needed.
13 years ago
632528aa95
merging with SCUBA82
13 years ago
046a8e0039
Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
13 years ago
a92b3afe64
added german translation;Menue should be in english.. sounds better
13 years ago
9fa586bbed
fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
...
english
13 years ago
d9f2f509d5
Added new menu items under the prepare submenu.
...
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
ae3e7586c6
Added HOME_POS. This adds the posibility to make the center 0
...
Updated the Xsteps ... settings via the LCD menu
13 years ago
fe940a142d
Added a structure that will allow easy translations/modifications to the LCD menu.
...
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years ago
Guillaume Seguin