MagoKimbra
0ebf896070
Add 4th extruder
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
wgm4321
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Scott Lahteine
e7db8ee9e5
ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
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
d080027ff4
ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
10 years ago
Scott Lahteine
f390b3f314
Patch to make Z look more like X and Y on UltraLCD
10 years ago
Scott Lahteine
e69313fc2b
Reduce dogm lcd code
10 years ago
Scott Lahteine
92e21d3ee2
M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
Scott Lahteine
cd769781a1
M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
Filip Mulier
d84934d8c5
Display Filament Sensor data on 20x4 LCD
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD. The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed. The status message can be seen by
re-selecting the info screen in the menu.
10 years ago
Pablo Clemente
2096188ac3
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
c51a6f94e0
Fixed stop print LCD function on M104
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
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
Diffed and merged, preserving my updates
12 years ago
gregor
2739c26c4f
changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
gregor
6fb9573157
added support for the reprapworld keypad
12 years ago
Robert F-C
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
12 years ago
Dirk Eichel
a49c09a776
Add variable for animated fan, add float conversion w/o sign
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
Robert F-C
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
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
06c03fe2f0
new method for message for making KILLED message visible
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
12 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.
12 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()
This is required when moving the buttons_init() function to the
lcd_init() function
13 years ago
MaikStohn
032df0b2c6
Moved LCD initialization out of constructor
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
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
Blair Thompson
a05a261b72
Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
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
- redo disable Beeper 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.
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
13 years ago