3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-11 21:14:34 +00:00
Code Issues Releases Wiki Activity
8,385 Commits 21 Branches 81 Tags 2 GiB
4b16fa3272
Commit Graph

126 Commits

Author SHA1 Message Date
Scott Lahteine
d19cfcfc1d max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK 2016-10-02 06:34:56 -05:00
esenapaj
ee60225c07 Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY) 2016-09-24 06:18:27 +09:00
Scott Lahteine
13523cbf29 Fix and extend BLTouch support 2016-09-20 16:20:36 -05:00
Scott Lahteine
f38a33a5d8 Add handling of BLTouch error state 2016-09-18 22:00:32 -05:00
Scott Lahteine
b4034915f8 Move z safe homing to its own function 2016-09-13 03:33:00 -05:00
Scott Lahteine
00cdb15cec Move invariant LCD strings to language.h 2016-08-26 02:48:57 -05:00
Scott Lahteine
cec61c350d Set language display charset in language.h 2016-08-15 19:01:12 -07:00
Scott Lahteine
d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Scott Lahteine
4be635ec6e Remove MSG_PRINT_TIME from languages 2016-07-26 12:47:45 -07:00
João Brázio
9e5dbf67e8 Update the stats menu to include longest job and extruded filament 2016-07-23 03:05:45 +01:00
Scott Lahteine
05da02f0a2 Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER 2016-07-17 10:53:10 -07:00
Petr Zahradník junior
2d7fe9dc78 LCD Longer print 2016-07-16 18:21:06 -07:00
esenapaj
af9b1d79b1 Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15) 
・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files
・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German
file
 2016-07-16 18:39:22 +09:00
Scott Lahteine
c5e51f6b96 finished => completed 2016-07-14 11:46:35 -07:00
Scott Lahteine
a8d71f0ac6 Support longer print times in M31 2016-07-14 11:39:58 -07:00
Scott Lahteine
a8b6b6a128 Merge pull request #4252 from thinkyhead/rc_rename_hpb 
Replace PLA/ABS preheating with generic
 2016-07-12 20:00:33 -07:00
AnHardt
b273736962 Make MAPPER_NON the fall back mapper 
Make MAPPER_NON the fall back mapper - if no other is defined.
One list less to maintain.
 2016-07-12 19:59:14 +02:00
Scott Lahteine
928ff6487a Greek language pack from @psavva 2016-07-10 18:59:04 -07:00
AnHardt
faac2bcfdb Add a kill-screen 2016-07-10 04:50:45 +02:00
Scott Lahteine
1026e5b071 Replace PLA/ABS preheating with generic 2016-07-09 18:06:51 -07:00
Scott Lahteine
ef8980bfa0 Shorter labels for Print Stats info 2016-07-03 16:00:24 -07:00
Scott Lahteine
a06c5165a7 Shorter strings for smaller LCDs 2016-07-02 15:47:16 -07:00
Petr Zahradnik
43ff0ce35f Rewritten FILAMENT_CHANGE_ENABLE feature 2016-07-02 15:34:33 -07:00
Scott Lahteine
51b7820686 Patch up About Printer sub-menus 2016-07-02 15:22:34 -07:00
Anthony Birkett
7a377c1d75 Add "About Printer" information menu. 
Includes:
  *firmware version / branch / date.
  *extruder count
  *board information (name, serial details, power supply type)
  *thermistors (names, min/max temperatures)
  *printer statistics (PRINTCOUNTER details)

Thanks to @thinkyhead for contributions.
 2016-07-02 15:22:26 -07:00
AnHardt
39883d03fc universalize axis_unhomed_error() 2016-06-27 20:19:51 -07:00
Scott Lahteine
a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
João Brázio
09150cae79 Individual Axis Homing LCD menu items 2016-05-11 19:28:19 -07:00
Scott Lahteine
9bcb72e7f8 Further patches to MBL - break up into more handlers 2016-04-20 16:37:35 -07:00
Scott Lahteine
f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine
7c16e774ca Show all endstops on LCD in checkHitEndstops 2016-04-16 20:08:42 -07:00
Scott Lahteine
011f4736f1 Remove redundant text from MSG_ERR_REDUNDANT_TEMP 2016-04-10 19:14:46 -07:00
Scott Lahteine
09c6f80c1e Fix MSG_LEVEL_BED_CANCEL english 2016-04-03 16:41:27 -07:00
Scott Lahteine
c94482168b Add MSG_LEVEL_BED_CANCEL for MBL 2016-04-03 16:27:29 -07:00
Scott Lahteine
5719fcba51 Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING 2016-04-02 18:14:49 -07:00
Scott Lahteine
80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine
a393941d2d Combine "XYZ" with MSG_LEVEL_BED_HOMING 2016-04-01 17:51:03 -07:00
Scott Lahteine
18de9f55ac Merge pull request #3242 from thinkyhead/rc_epatel_mesh_fixes 
Updated Mesh Bed Leveling
 2016-03-25 06:48:12 -07:00
AnHardt
94962ee678 axis_known_position -> axis_homed 
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
 2016-03-25 14:05:20 +01:00
Edward Patel
c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. 
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
 2016-03-25 04:58:43 -07:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
Scott Lahteine
bcbac698f2 Patch minor spelling issue in cn, en, gl language file headings 2016-03-23 22:30:07 -07:00
esenapaj
22299c13c1 Change link to the document 
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757,
but http://www.marlinfirmware.org/ isn't working.
 2016-03-22 19:58:41 +09:00
Scott Lahteine
6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine
772460a7b8 Various minor spelling corrections 
Redo of #2939 rebased against RCBugFix
 2016-03-05 20:41:15 -08:00
Scott Lahteine
0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670) 
Keep "astyled" reformatting
 2015-10-03 22:02:45 -05:00
Scott Lahteine
7ac7ddbf20 Show nozzles, heaters, and extruders numbered 1-4 2015-09-12 07:40:18 -05:00
Eric Kuzmenko
b23d765991 Added Extrude From Multiple Extruders from LCD feature 2015-09-05 05:33:18 -05:00
Richard Wackerbarth
b217474eab Compiler Complaints about concatenated tokens (PR#2566) 2015-07-31 17:08:44 -05:00
Scott Lahteine
4b40964064 Overridable Options - Part 3 (PR#2555) 
Apply `ENABLED` / `DISABLED` macros to language-related files.
 2015-07-31 00:19:13 -05:00
AnHardt
87a97f3724 Fix conditions for display strings 2015-07-26 20:41:21 -05:00
AnHardt
aaccea0260 Shift some display only strings from language.h to lenguage_en.h 
and translate them to German.
 2015-07-26 20:41:15 -05:00
AnHardt
f18f689c01 Replace MSG_F? with MSG_N? 
To avoid double definitions.
I prefer to read N for Number not for Nozzle.
 2015-05-28 20:30:23 +02:00
AnHardt
da246f5cb1 Activate BED_MINTEMP error. 
And call _temp_error() directly for ERR_MAXTEMP_BED to avoid the only one time use of bed_max_temp_error().

Includes #2156.
 2015-05-25 13:23:19 +02:00
AnHardt
6b1b71837c Intit. commit for Chinese 
Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
Added Chinese font to make_fonts.bat
Created 'dogm_font_data_ISO10646_CN.h'
Added Chinese to 'language.h'
Added 'language_cn.h' with some minor edits.
Added Chinese font in 'language_en.h' to not fall back to European font.
Added cn to 'Configuration.h'
Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.

In 'dogm_lcd_implementation.h'
Added Chinese Font
Made 1 pixel more room for the larger Chinese font on the status line.
Changed geometry of the 'select bar' by one pixel.
Changed the way the position for values and postcars are set.
 2015-04-27 12:15:36 +02:00
Ivan Galvez Junquera
d08782386b Added new trasnslatable labels. 
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
 2015-03-31 16:59:43 +02:00
AnHardt
9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
 2015-03-24 16:59:15 +01:00
AnHardt
00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
Edward Patel
8005d22c81 Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
AnHardt
2f374f1465 Removed Kanji. 2015-03-15 16:44:37 +01:00
AnHardt
96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
alexborro
9157cbd8f3 Add Travel Acceleration and change the M204 options 
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
 2015-03-11 13:19:02 -03:00
AnHardt
2d5134b0ed Introduce - clean - prepae language files 2015-03-10 17:46:25 +01:00
Scott Lahteine
fd1ea9d56f Move literal strings to language files 2015-02-24 23:03:08 -08:00
Scott Lahteine
57bc28b42c Cleanup and fix ultralcd.cpp 
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
 2015-02-21 17:38:56 -08:00
AnHardt
3aac2df057 Now the oter way around. 
Include of language_en.h now behind national language.

All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
 2015-02-08 20:41:20 +01:00
AnHardt
0e40408ee5 Make exemplaric use of new display charsets in language_en.h and languag_de.h 2015-02-01 13:20:58 +01:00
Scott Lahteine
c90f2e77d8 Remove language strings that only add a number 
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
 2015-01-27 21:36:58 -08:00
MagoKimbra
986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
grob6000
7d32c7f36d Multiple PID parameter edit for ultralcd 
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
 2015-01-11 01:14:02 +11:00
Bo Herrmannsen
a18b625534 Merge pull request #1261 from wgm4321/Development 
Add Filament menu and add Filament/Retract settings to config store.
 2015-01-02 15:35:29 +01:00
Caleb Anderson
5b336a4cdb Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051 
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
 2014-12-29 10:13:00 -07:00
wgm4321
cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
Scott Lahteine
e970461adb Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
Scott Lahteine
0c06e97e98 Split up languages.h, use ISO codes 
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
 2014-12-18 09:31:19 -08:00