98 Commits (54bab3e0d031e8286708f0df546cc624b4a7956d)

Author SHA1 Message Date
Mark Hanford 54bab3e0d0 Merge branch 'Marlin_v1' into localisation
Conflicts:
	Marlin/language.h
11 years ago
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 11 years ago
Daniel Martinez c8e5a82d49 keep English as default lang. 11 years ago
Daniel Martinez f64592e362 Add Aragonese translation 11 years ago
MatixYo 36086d3ca4 Update language.h
Updated Polish translations.
11 years ago
whosawhatsis d24df7af2c M200 implementation 11 years ago
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2 11 years ago
Alex Borro b33375d438 Z Axis Safe Homing when using Z Probe
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)

This feature has two changes:

1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:

Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT

2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
11 years ago
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits. 11 years ago
Kaz Walker a5e8575829 Add UUID support to M115 responses. 11 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h 11 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 11 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
11 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 11 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
11 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Gabino Lopez 68be33b1fc Update language.h
I update the spanish Messages, now this compile for spanish language.
12 years ago
Nicolas Rossi 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
Erik van der Zalm 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
Erik van der Zalm 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
Erik van der Zalm 73f21cd5d6 Spanish updated so far. 12 years ago
Erik van der Zalm 8b0d82e9db Removed "awaiting translation" for french 12 years ago
BorisLandoni c1d7cf939e Update language.h 12 years ago
Scott Lahteine 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
daid303 ac52dcc174 Updated the card menu and watch messages to make it more informative. 12 years ago
Simon Oliver 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
Erik van der Zalm 038d405254 Corrected #endif in language.h 12 years ago
Dirk Eichel 443aaa30bf Removed GIT fragments
Seems that there was something wrong while merging
12 years ago
Dirk Eichel 4e448b700a Merged fetched files from Marlin_v1 branch
Pull requests: #414 #433 #432 #428
12 years ago
blddk 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
Dirk Eichel 233df9cca0 Add missing LF at the end of the file 12 years ago
Dirk Eichel 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
Nicolas Rossi 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
Dirk Eichel ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin 12 years ago
Dirk Eichel 8efd4cfd73 fixed merge conflict 12 years ago
Denis Bakin 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
Conflicts:
	Marlin/language.h
	Marlin/thermistortables.h
12 years ago
daid 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1
Marlin v1, alignment of the Italian language
12 years ago
Daniele Sdei 82e28851bd Italian language: SD-Card change and SD-Card init 12 years ago
Daniele Sdei aed5965ad8 Italian language: remove space and some fix 12 years ago
codenamepawel d360846dd4 Update Marlin/language.h
Update Polish language 	#define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
Dirk Eichel a0d4e8e78e Add Messages for SD Card init. & change 12 years ago
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.
12 years ago
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.
12 years ago
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
daid 965baf2683 Merge pull request #362 from daid/Marlin_v1
Finnish language
12 years ago
Henry Palonen 7f30039d2a + Finnish translation 12 years ago
Daniele Sdei 5f82f03ff3 Add italian MSG_RESUMING. 12 years ago
daid303 5e3873c8db Add german MSG_RESUMING. 12 years ago