Commit Graph

131 Commits

Author SHA1 Message Date
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. 2012-08-21 23:46:10 +01:00
0c123950e9 __ header file replace 2012-06-02 20:44:17 +02:00
bf077125b9 added firmware retract. disabled by default 2012-06-02 20:32:28 +02:00
d494688565 Do not initialize in the header file. 2012-05-19 17:57:52 +02:00
516ec90242 Add M401 - Wait for user on LCD button press 2012-05-19 17:54:07 +02:00
1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 2012-05-11 15:19:09 +02:00
d188ae4c9d added missing declaration of buttons_init()
This is required when moving the buttons_init() function to the
lcd_init() function
2012-05-03 15:48:44 +02:00
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.
2012-05-03 14:28:17 +02:00
3d83109028 Fixed general 16x2 LCD build without SD support. 2012-02-29 15:33:23 +01:00
df1437bd86 Changed display format for some numbers. 2012-02-21 23:05:43 +01:00
8816ef1c64 Small fixes after merge 2012-02-21 20:36:43 +01:00
d298dd121f merged SBUBA82 and Justblair 2012-02-21 20:26:59 +01:00
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
2012-02-18 23:56:31 +00:00
4cc8e37bf1 lcd menue "move_axis" added 2012-02-07 12:58:05 +01:00
b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1
2012-02-06 12:22:44 +01:00
11f2dafc4e one step closer to a functional makefile.. 2011-12-22 16:43:28 +01:00
3c1a4aac2b header file simplification 2011-12-22 12:38:50 +01:00
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.
2011-12-04 12:40:18 +01:00
26a1de1e44 force inline 2011-11-27 16:04:58 +01:00
924bab1a03 less lcd flickering 2011-11-20 16:37:01 +01:00
379ea642e1 make tuneing sub-menu. 2011-11-20 16:05:42 +01:00
b21d5193f2 made ultralcd compatible with folders. 2011-11-20 14:43:47 +01:00
cd2268f10a code cleanup in ultralcd. 2011-11-20 11:55:33 +01:00
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
2011-11-15 22:50:43 +01:00
7919a40d06 watchdog,percent done, 2011-11-15 20:54:40 +01:00
ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram. 2011-11-09 20:27:44 +01:00
01df04e02c first compile with the cardreader class 2011-11-06 21:39:53 +01:00
1d171e9e52 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
40e8081623 changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 2011-11-04 18:02:56 +01:00