Bernhard Kubicek
|
36958ee305
|
minor changes and first not-well working version of autotemp
|
13 years ago |
Bernhard Kubicek
|
ba8a53a40f
|
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
|
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
|
7b70caab7c
|
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
|
13 years ago |
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
13 years ago |
Bernhard Kubicek
|
900e0c9bf2
|
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
|
13 years ago |
Bernhard Kubicek
|
1740a83e11
|
correcting commit errors.
|
13 years ago |
Bernhard Kubicek
|
e8092898b1
|
watchdog into dedicated file
|
13 years ago |
Erik van der Zalm
|
04d3b5537f
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h
|
13 years ago |
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
13 years ago |
Bernhard Kubicek
|
b9ea0651ec
|
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0 .
|
13 years ago |
Bernhard Kubicek
|
8bcdb9f5f0
|
this is not working. Do you maybe know why?
|
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 |
Erik van der Zalm
|
8e017b81ab
|
Sync with non-gen6 version
|
13 years ago |
Erik van der Zalm
|
750f6c33e3
|
first commit
|
13 years ago |