61 Commits (3898ace24685f28db16fa19778988747c7a1b607)

Author SHA1 Message Date
AnHardt 6cdcd6c6d1 Fix iss#1492
10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
10 years ago
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp
10 years ago
Scott Lahteine a2109cb492 Patch to make Z look more like X and Y on UltraLCD
10 years ago
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Scott Lahteine e69313fc2b Reduce dogm lcd code
10 years ago
Bo Herrmannsen 31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1
10 years ago
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor
10 years ago
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Scott Lahteine 92e21d3ee2 M0-M1 Enhancements
10 years ago
Filip Mulier d84934d8c5 Display Filament Sensor data on 20x4 LCD
10 years ago
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Pablo Clemente d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
11 years ago
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104
11 years ago
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes.
11 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Erik van der Zalm a5be0c52c6 no message
12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs
12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
12 years ago
Dirk Eichel a49c09a776 Add variable for animated fan, add float conversion w/o sign
12 years ago
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
daid303 1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
daid303 6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
12 years ago
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
12 years ago
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h
12 years ago
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD
12 years ago
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit
13 years ago
stohn 06c03fe2f0 new method for message for making KILLED message visible
13 years ago
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
13 years ago
Bernhard 0c123950e9 __ header file replace
13 years ago
Bernhard bf077125b9 added firmware retract. disabled by default
13 years ago
Daid d494688565 Do not initialize in the header file.
13 years ago
Daid 516ec90242 Add M401 - Wait for user on LCD button press
13 years ago
MaikStohn 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
13 years ago
MaikStohn d188ae4c9d added missing declaration of buttons_init()
13 years ago
MaikStohn 032df0b2c6 Moved LCD initialization out of constructor
13 years ago
Daid 3d83109028 Fixed general 16x2 LCD build without SD support.
13 years ago
Erik van der Zalm df1437bd86 Changed display format for some numbers.
13 years ago
Erik van der Zalm 8816ef1c64 Small fixes after merge
13 years ago
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair
13 years ago
Blair Thompson a05a261b72 Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
13 years ago
Christian Thalhammer 4cc8e37bf1 lcd menue "move_axis" added
13 years ago
Christian Thalhammer b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1
13 years ago
Bernhard 11f2dafc4e one step closer to a functional makefile..
13 years ago
Bernhard 3c1a4aac2b header file simplification
13 years ago
Bernhard 7714b98da7 solved some compiler warnings that are now visible in arduino 1.0.
13 years ago
Bernhard 26a1de1e44 force inline
13 years ago
Bernhard Kubicek 924bab1a03 less lcd flickering
13 years ago