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
|
02b9eceead
|
show sd%
|
13 years ago |
|
Bernhard Kubicek
|
7919a40d06
|
watchdog,percent done,
|
13 years ago |
|
Bernhard Kubicek
|
36958ee305
|
minor changes and first not-well working version of autotemp
|
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
|
72ace55e6a
|
better visibility of public/private/imported variables
|
13 years ago |
|
Bernhard Kubicek
|
907daa49af
|
made loop counters uint8_t most were int(16_t) before
|
13 years ago |
|
Bernhard Kubicek
|
fc0064e525
|
made cardreader more selfsustained
|
13 years ago |
|
Bernhard Kubicek
|
01df04e02c
|
first compile with the cardreader class
|
13 years ago |
|
Bernhard Kubicek
|
79d1bfb5c0
|
made many possible variables static, so they cannot be used extern.
|
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
|
2afb7bd4cf
|
refactured temperature.cpp so that there are now abstract functions to access temperatures.
|
13 years ago |
|
Erik van der Zalm
|
2e8e8878e5
|
Corrected temp variables.
|
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 |