Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
2011-11-06 19:23:08 +01:00 |
|
|
Bernhard Kubicek
|
900e0c9bf2
|
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
|
2011-11-06 17:33:09 +01:00 |
|
|
Bernhard Kubicek
|
1740a83e11
|
correcting commit errors.
|
2011-11-06 15:10:29 +01:00 |
|
|
Bernhard Kubicek
|
e8092898b1
|
watchdog into dedicated file
|
2011-11-06 14:22:15 +01:00 |
|
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
|
2011-11-05 20:03:38 +01:00 |
|
|
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
2011-11-05 19:21:36 +01:00 |
|
|
Bernhard Kubicek
|
b9ea0651ec
|
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
|
2011-11-05 16:49:29 +01:00 |
|
|
Bernhard Kubicek
|
8bcdb9f5f0
|
this is not working. Do you maybe know why?
|
2011-11-05 16:43:44 +01:00 |
|
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
2011-11-05 14:13:20 +01:00 |
|
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
2011-11-04 18:02:56 +01:00 |
|
|
Erik van der Zalm
|
8e017b81ab
|
Sync with non-gen6 version
|
2011-09-14 18:56:45 +02:00 |
|
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
2011-08-12 22:28:35 +02:00 |
|