30 Commits (89282ebaa6492f8f123c167e8c5261f791c133ce)

Author SHA1 Message Date
Steffen Vogel 69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
Conflicts:
	Marlin/dogm_lcd_implementation.h
10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
Steffen Vogel b9cf1465a7 updated LCD bouts with new strings and bitmaps
new version is pretty generic and should work in most scenarios
10 years ago
Bo Herrmannsen d94109e886 updated logo post and ver info 10 years ago
Bo Herrmannsen cd33b5b062 changed logo and ver info
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round

ver info is placed centered and there is a 9 pixel from bottom of display to ver info
10 years ago
Bo Herrmannsen 9b6c1cfda6 removed unneeded lines in welcome msg 10 years ago
Bo Herrmannsen ffa09f86f4 moved ver info 5 spaces to the right 10 years ago
Bo Herrmannsen 590caafa2d changed ver info 10 years ago
Bo Herrmannsen 3d9f4ac757 Merge pull request #1303 from wgm4321/Development
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
10 years ago
wgm4321 f8aa5ff771 Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined 10 years ago
Scott Lahteine 2ec2bf1564 Fix regressions affecting compilation
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
Caleb Anderson e6774fb7d2 Using the new language implementation wasn't behaving as expected.
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.

This is an attempt to pull my changes from #1222 over.
10 years ago
Bo Herrmannsen bd25e7393b Merge pull request #1192 from thinkyhead/split_language
Split up languages.h. Use ISO language codes.
10 years ago
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.
10 years ago
Scott Lahteine e69313fc2b Reduce dogm lcd code 10 years ago
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor
Display filament sensor data on a 20x4 LCD or Graphical LCD
10 years ago
Jonas 0d97dec434 Adaption of LCD info screen
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
10 years ago
Filip Mulier 3b1ab84536 Display Filament Sensor data on graphic LCD
Added support to show the filament width on the status line of the
graphic LCD.  The status will show for 5 sec and then switch over to
data.  Status can be seen by clicking the button.
10 years ago
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Michael Mayer 99b7e926e7 added MaKr3d Melzi board 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
MaikStohn 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 12 years ago
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 12 years ago
MaikStohn 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 12 years ago
MaikStohn 16afbf9bfa FIX: adopted latest changes from hitachi implementation 12 years ago
Dirk Eichel 6c66cae694 GLCD init screen cosmetics 12 years ago
Dirk Eichel 5d3862f9d1 Modified u8glib logo on welcome screen 12 years ago
Dirk Eichel 0b320f75e9 Removed debug code, add some comments 12 years ago
Dirk Eichel 4a141a694f Marlin code for GLCD display
This contains the menues, status screen etc...
12 years ago