Erik van der Zalm
43f5c3e82b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-12-07 19:55:17 +01:00
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
2011-12-06 00:09:16 -05:00
Bernhard
12e8edcac3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-12-04 22:27:37 +01:00
Bernhard
cf50ba140f
added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.
2011-12-04 22:26:42 +01:00
Erik van der Zalm
89e832c295
Update endstops only for homing. (use less resources when not used)
2011-12-04 21:03:02 +01:00
Erik van der Zalm
b99c49ec3b
Add option to only check endstop when homing
2011-12-04 20:17:21 +01:00
Erik van der Zalm
95a0b28acb
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-12-04 19:54:43 +01:00
Erik van der Zalm
af22e9cd38
Some advance modifications
2011-12-04 19:54:07 +01:00
Bernhard
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
Bernhard
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
2011-12-04 09:48:53 +01:00
Bernhard
4f909963e4
make QUICKHOME configureable
2011-12-04 09:02:09 +01:00
Erik van der Zalm
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
2011-12-02 17:45:05 +01:00
Bernhard
0bc9daa4f7
make it compile with arduino 1.0 ; function is still untested.
2011-12-01 16:38:01 +01:00
Bernhard
b0c3871750
more fixing of the sanguino math round problem
2011-11-30 09:07:56 +01:00
Bernhard
9c57453168
removed stream.h referenece from marlinserial.
2011-11-30 08:57:30 +01:00
Bernhard
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
Bernhard
7a4be21b4f
made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h
2011-11-30 08:32:28 +01:00
Bernhard
716e89b87c
first homing move diagonal towards home switches.
2011-11-29 22:11:45 +01:00
Bernhard
d00b7e5587
repaired compiliation in windows
2011-11-28 22:45:40 +01:00
Bernhard
e4ab0e5982
more inlines
2011-11-28 22:11:17 +01:00
Bernhard
8cb29921a0
possible stepper release after sd printing
2011-11-28 22:09:17 +01:00
Bernhard
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-28 21:52:16 +01:00
Bernhard
b19c8b74b9
force inline
2011-11-28 21:51:44 +01:00
Erik van der Zalm
6d95644c0d
Moved M88 into M84. (M84 E)
2011-11-28 21:49:54 +01:00
Bernhard
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
2011-11-28 21:36:01 +01:00
Erik van der Zalm
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
2011-11-28 21:17:06 +01:00
Erik van der Zalm
98805c9228
Added M88 command. (Request from Action68)
2011-11-28 20:51:01 +01:00
Bernhard
85da81e673
inlineing of small functions in serial
2011-11-28 19:34:42 +01:00
Bernhard
b9ad0bb2ce
removed unecessary indirect register adressing in serial.
2011-11-28 19:28:38 +01:00
Bernhard
dd5ca68c87
get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
2011-11-28 19:13:40 +01:00
Erik van der Zalm
dd5296ad4d
Fixed temperature reading bug.
...
(When using the lower and upper adc input bank)
2011-11-28 17:42:49 +01:00
Erik van der Zalm
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
Bernhard
2d9a715655
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
2011-11-27 17:27:17 +01:00
Bernhard
d2f034ba84
lcd message from gcode, m117
2011-11-27 16:53:11 +01:00
Bernhard
6aecf80278
add autotemp support to the lcd
2011-11-27 16:45:19 +01:00
Bernhard
b128d25f27
overlooked some inlines..
2011-11-27 16:45:00 +01:00
Bernhard
26a1de1e44
force inline
2011-11-27 16:04:58 +01:00
Bernhard
f8e170a44b
planner optimization by inline functions
2011-11-27 14:57:12 +01:00
Erik van der Zalm
aad4b75b94
First parts 2nd extruder
2011-11-26 17:33:25 +01:00
Bernhard
a0dc66f7bf
Home retract distance configureable per axis.
2011-11-26 12:04:06 +01:00
Bernhard
6d6f323535
make an option if sd-card stop should release the steppers.
2011-11-26 11:51:38 +01:00
Bernhard
4d6a5c29df
disable steppers as routine in stepper.cpp
2011-11-26 11:50:23 +01:00
Bernhard
74d0032e25
cooldown blocking selectable by #define.
2011-11-26 09:03:12 +01:00
Bernhard
191f36b493
slowdown
2011-11-25 23:59:30 +01:00
Bernhard
c54a807824
overworked ultralcd a bit
2011-11-25 23:37:08 +01:00
Bernhard
a6823a84e1
another typo
2011-11-25 22:36:33 +01:00
Bernhard
57e163e989
typo
2011-11-25 22:34:12 +01:00
Bernhard
b58787a367
now velocities are also set in mm/sec in gcode.
2011-11-25 22:32:26 +01:00
Bernhard
71ca78982b
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-25 22:14:36 +01:00
Bernhard
235051253a
overworked lcd+eeprom to have only mm/sec and PID including pid_dt
2011-11-25 22:14:29 +01:00
