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.
11 years ago
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
11 years ago
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
11 years ago
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
11 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
11 years ago
e69313fc2b
Reduce dogm lcd code
11 years ago
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
11 years ago
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
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.
11 years ago
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.
11 years ago
6e3406d228
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
d86c3cf43c
Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
12 years ago
86b4b805d2
Fixed stop print LCD function on M104
12 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
12 years ago
5d50819791
Various typo fixes - only in comments, no code changes.
12 years ago
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
a5be0c52c6
no message
12 years ago
e509cdbeb0
added contrast control function for gLCDs
12 years ago
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
13 years ago
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.
13 years ago
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.
13 years ago
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.
13 years ago
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.
13 years ago
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.
13 years ago
efcc28d347
Fix check for include LiquidCrystalRus.h
13 years ago
cfc193cdac
Enables support the Cyrillic alphabet for LCD
13 years ago
1d224cc031
merged with upstream and FIXED AGAIN bad translation commit
...
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS
When you add new menu items / messages always copy them to ALL
languages (just use english)
13 years ago
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.
13 years ago
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
0c123950e9
__ header file replace
14 years ago
bf077125b9
added firmware retract. disabled by default
14 years ago
d494688565
Do not initialize in the header file.
14 years ago
516ec90242
Add M401 - Wait for user on LCD button press
14 years ago
1efe9ab497
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
14 years ago
d188ae4c9d
added missing declaration of buttons_init()
...
This is required when moving the buttons_init() function to the
lcd_init() function
14 years ago
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.
14 years ago
3d83109028
Fixed general 16x2 LCD build without SD support.
14 years ago
df1437bd86
Changed display format for some numbers.
14 years ago
8816ef1c64
Small fixes after merge
14 years ago
d298dd121f
merged SBUBA82 and Justblair
14 years ago
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
14 years ago
4cc8e37bf1
lcd menue "move_axis" added
14 years ago
b51e8bf7e5
-disabled CARDDETECT if PIN is set to -1
...
- redo disable Beeper if PIN is set to -1
14 years ago
11f2dafc4e
one step closer to a functional makefile..
14 years ago
3c1a4aac2b
header file simplification
14 years ago
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.
14 years ago
26a1de1e44
force inline
14 years ago
924bab1a03
less lcd flickering
14 years ago
379ea642e1
make tuneing sub-menu.
14 years ago
Scott Lahteine