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
11 years ago
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
11 years ago
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
11 years ago
gregor
2739c26c4f
changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
11 years ago
gregor
6fb9573157
added support for the reprapworld keypad
11 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.
11 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
12 years ago
Bernhard
bf077125b9
added firmware retract. disabled by default
12 years ago
Daid
d494688565
Do not initialize in the header file.
12 years ago
Daid
516ec90242
Add M401 - Wait for user on LCD button press
12 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
12 years ago
MaikStohn
d188ae4c9d
added missing declaration of buttons_init()
This is required when moving the buttons_init() function to the
lcd_init() function
12 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.
12 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
Bernhard
26a1de1e44
force inline
13 years ago
Bernhard Kubicek
924bab1a03
less lcd flickering
13 years ago
Bernhard Kubicek
379ea642e1
make tuneing sub-menu.
13 years ago
Bernhard Kubicek
b21d5193f2
made ultralcd compatible with folders.
13 years ago
Bernhard Kubicek
cd2268f10a
code cleanup in ultralcd.
13 years ago
Bernhard Kubicek
a9c7da06e3
and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
13 years ago
Bernhard Kubicek
7919a40d06
watchdog,percent done,
13 years ago
Erik van der Zalm
331e82dcd3
Buffer size > 16
13 years ago
Bernhard Kubicek
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
13 years ago
Bernhard Kubicek
01df04e02c
first compile with the cardreader class
13 years ago
Bernhard Kubicek
1d171e9e52
reformating and some minor bugs/things found on the way.
13 years ago
Bernhard Kubicek
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
Bernhard Kubicek
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
Erik van der Zalm
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago