Bernhard Kubicek
|
8a1e719a3f
|
overworked config file
|
2011-11-19 20:52:43 +01:00 |
|
Bernhard Kubicek
|
f52e1a9571
|
autotemp working, default=disabled.
|
2011-11-19 17:07:44 +01:00 |
|
Bernhard Kubicek
|
70650c331d
|
corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf
|
2011-11-19 14:50:31 +01:00 |
|
Erik van der Zalm
|
b15902d3b5
|
Fixed bug in configuration.h
|
2011-11-18 19:46:16 +01:00 |
|
Erik van der Zalm
|
e63e224a33
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
|
2011-11-18 19:04:09 +01:00 |
|
Erik van der Zalm
|
e7dca8614b
|
Advance experiments. Not working yet.
|
2011-11-18 18:59:17 +01:00 |
|
Bernhard Kubicek
|
46f80e82d9
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/ultralcd.h
|
2011-11-15 22:53:04 +01:00 |
|
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
|
2011-11-15 22:50:43 +01:00 |
|
Bernhard Kubicek
|
7919a40d06
|
watchdog,percent done,
|
2011-11-15 20:54:40 +01:00 |
|
Erik van der Zalm
|
805d37f77b
|
Fixed some small planner bugs
|
2011-11-15 18:14:00 +01:00 |
|
Erik van der Zalm
|
5fd41ae872
|
Some fixes in planner
|
2011-11-14 23:57:34 +01:00 |
|
Erik van der Zalm
|
95126c09c0
|
Added slowdown
|
2011-11-14 20:04:29 +01:00 |
|
Erik van der Zalm
|
331e82dcd3
|
Buffer size > 16
|
2011-11-14 18:53:09 +01:00 |
|
Erik van der Zalm
|
c00eefb824
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-14 18:26:57 +01:00 |
|
Erik van der Zalm
|
1d0452f10c
|
250000 baud
|
2011-11-14 18:24:02 +01:00 |
|
Bernhard Kubicek
|
c57906b627
|
fixed bug with adjusting ki in realtime.
|
2011-11-13 21:43:26 +01:00 |
|
Erik van der Zalm
|
ac82411c73
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-13 20:46:44 +01:00 |
|
Erik van der Zalm
|
65934eee9c
|
A lot of changes in the planner code
|
2011-11-13 20:42:08 +01:00 |
|
Bernhard Kubicek
|
36958ee305
|
minor changes and first not-well working version of autotemp
|
2011-11-09 22:09:16 +01:00 |
|
Bernhard Kubicek
|
27361e7cd0
|
beautified the config. ordered it into thematic sections.
|
2011-11-09 20:28:40 +01:00 |
|
Erik van der Zalm
|
d3bfffcb6e
|
Corrected thermistor naming
|
2011-11-06 22:37:43 +01:00 |
|
Bernhard Kubicek
|
163efdf1c7
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-06 19:49:04 +01:00 |
|
Bernhard Kubicek
|
87aaf0f70a
|
static'ified Marlin.pde.
|
2011-11-06 19:48:37 +01:00 |
|
Erik van der Zalm
|
76b3f805c0
|
Added teensylu pins
|
2011-11-06 19:30:04 +01:00 |
|
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
2011-11-06 19:23:08 +01:00 |
|
Bernhard Kubicek
|
2afb7bd4cf
|
refactured temperature.cpp so that there are now abstract functions to access temperatures.
|
2011-11-06 14:03:41 +01:00 |
|
Erik van der Zalm
|
0b82465168
|
First arcs version. (Arcs not working ok)
|
2011-11-06 12:39:00 +01:00 |
|
Erik van der Zalm
|
2e8e8878e5
|
Corrected temp variables.
|
2011-11-05 20:21:09 +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
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
2011-11-05 14:13:20 +01:00 |
|
Erik van der Zalm
|
95d3d9847c
|
M109 now equal to sprinter
|
2011-11-04 23:38:25 +01:00 |
|
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
2011-11-04 22:51:14 +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
|
b5f6482dce
|
Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
|
2011-08-21 18:29:47 +02:00 |
|
Erik van der Zalm
|
26bf57e22c
|
first-commit
|
2011-08-13 10:09:54 +02:00 |
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
2011-08-12 22:28:35 +02:00 |
|