e017228569
Merged multiple extruder support.
...
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
2011-12-12 19:34:37 +01:00
3320a5b37d
make autotemp compatile for use without pid
2011-12-11 22:25:52 +01:00
88ee053af0
heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.
2011-12-09 17:07:44 +01:00
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
2011-12-06 00:09:16 -05:00
7714b98da7
solved some compiler warnings that are now visible in arduino 1.0.
...
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
2011-12-04 12:40:18 +01:00
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
2011-12-04 09:48:53 +01:00
59205ac5fc
preliminiary implementation for the early heating finish.
...
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
2011-11-30 08:51:46 +01:00
e4ab0e5982
more inlines
2011-11-28 22:11:17 +01:00
b19c8b74b9
force inline
2011-11-28 21:51:44 +01:00
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
2011-11-28 21:36:01 +01:00
26a1de1e44
force inline
2011-11-27 16:04:58 +01:00
aad4b75b94
First parts 2nd extruder
2011-11-26 17:33:25 +01:00
c57906b627
fixed bug with adjusting ki in realtime.
2011-11-13 21:43:26 +01:00
1d171e9e52
reformating and some minor bugs/things found on the way.
2011-11-06 19:23:08 +01:00
1740a83e11
correcting commit errors.
2011-11-06 15:10:29 +01:00
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
2011-11-06 14:03:41 +01:00
2e8e8878e5
Corrected temp variables.
2011-11-05 20:21:09 +01:00
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
d15f01e1b4
Temperature changes
2011-11-05 19:21:36 +01:00
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
2011-11-05 16:49:29 +01:00
8bcdb9f5f0
this is not working. Do you maybe know why?
2011-11-05 16:43:44 +01:00
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
2011-11-05 14:13:20 +01:00
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
2011-11-04 18:02:56 +01:00
