Bernhard Kubicek
6b14f95b3e
Merge pull request #170 from linagee/Marlin_v1
...
Marlin v1
13 years ago
Bernhard Kubicek
b7fc14bc65
repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright.
13 years ago
linagee
2e8c5049c5
Update Marlin/thermistortables.h
13 years ago
linagee
2d0d8e5272
Small correction.
13 years ago
linagee
9e9db65c3f
Update Marlin/thermistortables.h
13 years ago
linagee
bd966ef389
Update Marlin/thermistortables.h
13 years ago
linagee
775da3f103
Added top ratings and extended to ADC=1 for table 3 and 5.
13 years ago
linagee
96a4baa0be
Update Marlin/thermistortables.h
13 years ago
linagee
2aa9f7b131
Update Marlin/thermistortables.h
13 years ago
linagee
dd9144994e
Tested May 19 - It works! Verified with separate thermocouple TM-902C also.
13 years ago
linagee
4c37d0d9f1
Extended range above 250C. (Operating range states up to 300C)
13 years ago
linagee
241f5a4c0e
Update Marlin/thermistortables.h
13 years ago
Bernhard
57f9359a41
simplified the includes, makefile now works with arduino23
13 years ago
Denis B
4fd75dc813
Working version of multiple extruders (up to 3)
...
- The temperature control is pretty much complete
(not sure what to do w/ autotemp though)
Changed the pins assignment to clearly separate bed and extruder heaters
and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
(only chanages what pins it uses depending on the active_extruder var,
but that's enough for switching extruder in the start.gcode in the
the profiles)
- Tested only w/ RAMPS 1.4
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
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
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
bf879ceaa9
Added thermistor tables
13 years ago
Erik van der Zalm
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
Erik van der Zalm
750f6c33e3
first commit
13 years ago