zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
5628 commits 1 branch 0 tags 156 MiB
Commit graph

66 commits

Author SHA1 Message Date
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