97 Commits (bdf778bec22cba70a47d3d64330a87af872d36cb)

Author SHA1 Message Date
fmalpartida 93da52d011 Added support for OLED SSD1306 I2C based LCDs. 10 years ago
AnHardt 9b8c6ed254 Merge pull request #2120 from chris-bo/dogm_config
move dogm font selection to configuration_adv.h
10 years ago
Christian Bohn 258bcdefe0 move dogm font selection to configuration_adv.h 10 years ago
Ed Boston a83bf18ee1 More functional seperation
Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h.
Added U8GLIB_LM6059_AF to define display specific actions.
Added reminder to compile in u8glib
10 years ago
Ed Boston 047e688e93 Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER
Rename of define to avoid confusion between the controller and the
display which had similar names.
10 years ago
Ed Boston 1999ac415c Formatting Changes
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
10 years ago
Ed Boston 41f8cdb3a6 ADAFRUIT_ST7565
Added support for new display type
10 years ago
Scott Lahteine 1a4a09c26f Display unknown XYZ on the LCD as "---"
- Also show 2 digits past decimal for Z on DOGM
10 years ago
Scott Lahteine 2bc1d70a31 Merge pull request #1977 from AnHardt/Cinese2
We mark this historic day, when Marlin went to China.
10 years ago
Scott Lahteine 5b248757c7 Level Bed in Prepare submenu
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
10 years ago
AnHardt 76b12edecf Give TALL_FONT_CORRECTION a default 10 years ago
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.
10 years ago
Scott Lahteine a22a228bcc Rename files to move them in the IDE 10 years ago
Scott Lahteine 09d60e0128 Naming and code comments 10 years ago
Scott Lahteine ccddc280be Apply three more commits 10 years ago
AnHardt ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h
to avoid errors in Marlin_main.cpp. #1860

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
10 years ago
Scott Lahteine 756bb5e268 Cleanup formatting in hitachi & dogm lcd 10 years ago
Scott Lahteine 43773ff735 Formatting and lcd contrast masking 10 years ago
AnHardt 6ae714894e Now the simplycistic solution.
Just and only display splashscreen only once.
10 years ago
AnHardt d521693641 Revert "Draw content in display loop only when needed"
This reverts commit bf04a92cc0.
10 years ago
AnHardt bf04a92cc0 Draw content in display loop only when needed
Example for splash screen.
10 years ago
AnHardt 9865318f1c Disable splash-screen when done once
Splash screen was shown with every display init.
That means every time the menus where entered.

Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
10 years ago
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 10 years ago
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi...
Thanks @MagoKimbra.
10 years ago
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder]
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
10 years ago
AnHardt 507efa771b Remove unused variable fan_rot
and satisfy the compiler about the implicit compare.
10 years ago
AnHardt c481c3b180 Move variable blink from ultralcd.h to dogm_lcd_implementation.h
to avoid warnings about unused blink.

Concentrate definitions of variables in dogm_lcd_implementation.h to one place.

Make only local used variable currentfont static.
10 years ago
Scott Lahteine bc2f249cc6 Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
The big Language Pack
10 years ago
Christian Bohn 4c3cbc0961 use only one implementation for beeper feedback 10 years ago
AnHardt 4beffbca69 Make SMALL_INFOFONT configurable.
Tweak the documentation
10 years ago
AnHardt c686069ccd Revert "Remove 6x9 font"
This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
10 years ago
AnHardt b00a531df8 Revert "Removed now unneded FONT_STATUSMENU"
This reverts commit 8c5bb38748.
10 years ago
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 10 years ago
AnHardt e72cb3e45d Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/ultralcd_implementation_hitachi_HD44780.h

Fix merge conflicts 2
10 years ago
AnHardt 6bfccaf99e Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
10 years ago
AnHardt f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.
10 years ago
AnHardt fa889cd6e1 Beautivy statusscreen
by shifting things some pixels around
10 years ago
Scott Lahteine 7279e4f82f Small code tweaks re lcd.print 10 years ago
Scott Lahteine 15d29efad5 Pass sel to lcd_implementation_mark_as_selected
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
10 years ago
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code
Get upstream changes
10 years ago
AnHardt e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
10 years ago
AnHardt 1883e1bb60 Applied thinkyheads corrections from 2015-03-17 10 years ago
AnHardt be79235ef2 Add new (cleaner) Marlin font
with sources in /fonts
10 years ago
AnHardt 8a29dd4839 Cleaned typo in dogm_lcd_implementation.h 10 years ago
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
Conflicts:
	Marlin/language.h
Conflict cleaned
10 years ago
AnHardt e6cb8ee188 Remove 6x9 font
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
10 years ago
Scott Lahteine 7629c4f05c Cleanup for menu optimization
- Compare pr_char to space
- Fewer calls to lcd_strlen
10 years ago
Scott Lahteine 3405f85a6a Reduce size of menu code
- Get rid of _selected functions, passing selected state instead
10 years ago
AnHardt 2f374f1465 Removed Kanji. 10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago