Erik van der Zalm
|
8816ef1c64
|
Small fixes after merge
|
13 years ago |
|
Erik van der Zalm
|
d298dd121f
|
merged SBUBA82 and Justblair
|
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 |
|
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 |
