Cylindric
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
2014-02-20 14:28:29 +00:00
Cylindric
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
2014-02-20 14:20:27 +00:00
Marco
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
2014-02-18 09:40:10 +01:00
Marco
cf5c3b6610
Added dutch to language.h
2014-02-17 17:00:50 +01:00
nothinman
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
2014-02-13 11:58:14 +00:00
daid
9b7d87e885
Remove duplicate contrast define.
2014-02-13 10:50:17 +01:00
Martin Lukasik
0b9ecf3824
Language cleanup, part 1.
2014-02-12 13:21:26 +00:00
nothinman
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
2014-02-11 22:38:01 +00:00
Mark Hanford
0778f5f028
Add missing entries to the new Aragonian language.
2014-02-11 14:40:53 +00:00
Mark Hanford
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
...
Conflicts:
Marlin/language.h
2014-02-11 14:35:28 +00:00
Mark Hanford
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
2014-02-11 13:54:43 +00:00
Daniel Martinez
c8e5a82d49
keep English as default lang.
2014-02-09 18:24:24 +01:00
Daniel Martinez
f64592e362
Add Aragonese translation
2014-02-09 18:19:37 +01:00
MatixYo
36086d3ca4
Update language.h
...
Updated Polish translations.
2014-02-07 19:15:51 +01:00
whosawhatsis
d24df7af2c
M200 implementation
2014-01-31 00:54:19 -08:00
Alex Borro
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
2014-01-16 18:13:46 -02:00
daid
df194f75e1
Added PT100 support for Ultiboard2
2014-01-06 11:20:03 +01:00
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.
2013-11-27 22:37:35 -02:00
Erik van der Zalm
48a185d004
Fixed compile errors from bad commits.
2013-11-10 16:36:37 +01:00
Kaz Walker
a5e8575829
Add UUID support to M115 responses.
2013-11-01 14:51:50 -06:00
Guillaume Seguin
eb23a68e92
Update French translation in language.h
2013-07-28 18:50:47 +02:00
Guillaume Seguin
44f327d738
Uniformly reindent language.h
2013-07-23 22:13:40 +02:00
Guillaume Seguin
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
2013-07-23 22:11:54 +02:00
Guillaume Seguin
2cb716f513
Run Marlin/language.h through dos2unix
2013-07-23 21:49:37 +02:00
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
2013-07-23 21:46:41 +02:00
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
2013-07-14 15:45:49 +02:00
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
2013-07-14 15:28:26 +07:00
Gabino Lopez
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
2013-07-04 10:23:00 +02:00
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
2013-06-20 23:59:56 +02:00
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
2013-06-09 22:57:40 +02:00
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
2013-06-09 22:26:47 +02:00
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
2013-06-09 21:40:35 +02:00
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
2013-06-09 12:24:06 +02:00
BorisLandoni
c1d7cf939e
Update language.h
2013-06-07 17:38:17 +02:00
Scott Lahteine
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
2013-05-02 09:22:58 -07:00
daid303
ac52dcc174
Updated the card menu and watch messages to make it more informative.
2013-04-15 15:11:22 +02:00
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
2013-04-12 13:31:30 +02:00
Erik van der Zalm
038d405254
Corrected #endif in language.h
2013-03-31 20:28:29 +02:00
Dirk Eichel
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
2013-03-30 23:26:42 +01:00
Dirk Eichel
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
2013-03-26 21:43:04 +01:00
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.
2013-03-22 18:28:16 +01:00
Dirk Eichel
233df9cca0
Add missing LF at the end of the file
2013-03-19 19:12:33 +01:00
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.
2013-03-19 06:46:05 +01:00
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.
2013-03-05 14:52:51 +01:00
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
