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
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
0c123950e9
__ header file replace
13 years ago
bf077125b9
added firmware retract. disabled by default
13 years ago
d494688565
Do not initialize in the header file.
13 years ago
516ec90242
Add M401 - Wait for user on LCD button press
13 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
13 years ago
d188ae4c9d
added missing declaration of buttons_init()
This is required when moving the buttons_init() function to the
lcd_init() function
13 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.
13 years ago
3d83109028
Fixed general 16x2 LCD build without SD support.
13 years ago
df1437bd86
Changed display format for some numbers.
13 years ago
8816ef1c64
Small fixes after merge
13 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
13 years ago
4cc8e37bf1
lcd menue "move_axis" added
13 years ago
b51e8bf7e5
-disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1
13 years ago
11f2dafc4e
one step closer to a functional makefile..
13 years ago
3c1a4aac2b
header file simplification
13 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.
13 years ago
26a1de1e44
force inline
13 years ago
924bab1a03
less lcd flickering
13 years ago
379ea642e1
make tuneing sub-menu.
13 years ago
b21d5193f2
made ultralcd compatible with folders.
13 years ago
cd2268f10a
code cleanup in ultralcd.
13 years ago
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
7919a40d06
watchdog,percent done,
13 years ago
331e82dcd3
Buffer size > 16
13 years ago
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
13 years ago
01df04e02c
first compile with the cardreader class
13 years ago
1d171e9e52
reformating and some minor bugs/things found on the way.
13 years ago
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
stohn
Blair Thompson
Bernhard
Daid
MaikStohn
Erik van der Zalm
Christian Thalhammer
Bernhard Kubicek