5b4625f79c
added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing.
2011-12-09 12:51:08 +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
b99c49ec3b
Add option to only check endstop when homing
2011-12-04 20:17:21 +01:00
95a0b28acb
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-12-04 19:54:43 +01:00
af22e9cd38
Some advance modifications
2011-12-04 19:54:07 +01:00
4f909963e4
make QUICKHOME configureable
2011-12-04 09:02:09 +01:00
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
2011-12-02 17:45:05 +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
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
2011-11-27 21:12:55 +01:00
aad4b75b94
First parts 2nd extruder
2011-11-26 17:33:25 +01:00
a0dc66f7bf
Home retract distance configureable per axis.
2011-11-26 12:04:06 +01:00
6d6f323535
make an option if sd-card stop should release the steppers.
2011-11-26 11:51:38 +01:00
74d0032e25
cooldown blocking selectable by #define.
2011-11-26 09:03:12 +01:00
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
2011-11-25 13:43:06 +01:00
2e43f9c809
Changed min max temperature code.
2011-11-20 13:14:58 +01:00
8a1e719a3f
overworked config file
2011-11-19 20:52:43 +01:00
f52e1a9571
autotemp working, default=disabled.
2011-11-19 17:07:44 +01:00
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
b15902d3b5
Fixed bug in configuration.h
2011-11-18 19:46:16 +01:00
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
e7dca8614b
Advance experiments. Not working yet.
2011-11-18 18:59:17 +01:00
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
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
7919a40d06
watchdog,percent done,
2011-11-15 20:54:40 +01:00
805d37f77b
Fixed some small planner bugs
2011-11-15 18:14:00 +01:00
5fd41ae872
Some fixes in planner
2011-11-14 23:57:34 +01:00
95126c09c0
Added slowdown
2011-11-14 20:04:29 +01:00
331e82dcd3
Buffer size > 16
2011-11-14 18:53:09 +01:00
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-14 18:26:57 +01:00
1d0452f10c
250000 baud
2011-11-14 18:24:02 +01:00
c57906b627
fixed bug with adjusting ki in realtime.
2011-11-13 21:43:26 +01:00
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-13 20:46:44 +01:00
65934eee9c
A lot of changes in the planner code
2011-11-13 20:42:08 +01:00
36958ee305
minor changes and first not-well working version of autotemp
2011-11-09 22:09:16 +01:00
27361e7cd0
beautified the config. ordered it into thematic sections.
2011-11-09 20:28:40 +01:00
d3bfffcb6e
Corrected thermistor naming
2011-11-06 22:37:43 +01:00
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-06 19:49:04 +01:00
87aaf0f70a
static'ified Marlin.pde.
2011-11-06 19:48:37 +01:00
76b3f805c0
Added teensylu pins
2011-11-06 19:30:04 +01:00
1d171e9e52
reformating and some minor bugs/things found on the way.
2011-11-06 19:23:08 +01:00
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
2011-11-06 14:03:41 +01:00
0b82465168
First arcs version. (Arcs not working ok)
2011-11-06 12:39:00 +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
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
2011-11-05 14:13:20 +01:00
95d3d9847c
M109 now equal to sprinter
2011-11-04 23:38:25 +01:00
bf879ceaa9
Added thermistor tables
2011-11-04 22:51:14 +01:00
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
2011-11-04 18:02:56 +01:00
8e017b81ab
Sync with non-gen6 version
2011-09-14 18:56:45 +02:00
