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
12e8edcac3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-12-04 22:27:37 +01:00
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
b99c49ec3b
Add option to only check endstop when homing
2011-12-04 20:17:21 +01: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
4f909963e4
make QUICKHOME configureable
2011-12-04 09:02:09 +01:00
b0c3871750
more fixing of the sanguino math round problem
2011-11-30 09:07:56 +01:00
716e89b87c
first homing move diagonal towards home switches.
2011-11-29 22:11:45 +01:00
e4ab0e5982
more inlines
2011-11-28 22:11:17 +01:00
8cb29921a0
possible stepper release after sd printing
2011-11-28 22:09:17 +01:00
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-28 21:52:16 +01:00
6d95644c0d
Moved M88 into M84. (M84 E)
2011-11-28 21:49:54 +01:00
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
2011-11-28 21:36:01 +01:00
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
2011-11-28 21:17:06 +01:00
98805c9228
Added M88 command. (Request from Action68)
2011-11-28 20:51:01 +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
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
d2f034ba84
lcd message from gcode, m117
2011-11-27 16:53:11 +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
4d6a5c29df
disable steppers as routine in stepper.cpp
2011-11-26 11:50:23 +01:00
74d0032e25
cooldown blocking selectable by #define.
2011-11-26 09:03:12 +01:00
57e163e989
typo
2011-11-25 22:34:12 +01:00
b58787a367
now velocities are also set in mm/sec in gcode.
2011-11-25 22:32:26 +01:00
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
2011-11-25 19:34:36 +01:00
0e0e4945d8
Removed ISR overtaken message from ISR routine
2011-11-25 13:59:58 +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
5535e51bf6
Yes, thats the beta.
2011-11-20 17:04:57 +01:00
4e5becfc51
Added endstop reporting
2011-11-20 14:50:08 +01:00
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-19 21:33:15 +01:00
915ef2d4a1
Added software endstops
2011-11-19 21:32:47 +01:00
e87df99e22
update mcode documentation
2011-11-19 21:01:07 +01:00
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
2011-11-19 18:22:22 +01:00
2a6afee832
make it compile without autotemp
2011-11-19 17:09:33 +01:00
8a08b8e07e
trying to get autotemp to work.
2011-11-19 15:37:10 +01:00
70abca195a
overworked cardreader for folder support; not finished yet.
2011-11-19 13:13:34 +01:00
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-18 22:22:23 +01:00
5df5727e93
removed some debugging comments
2011-11-18 22:20:53 +01:00
64f2121ab1
updated to sdfatlib2010902
2011-11-18 22:17:37 +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
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
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-14 18:26:57 +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
9980ceb4a3
added a m400, that finished all moves,
...
and the mechanism so that if an endstop is hit it the ISR, the steps_to_be_taken are stored, and some current_block data that will be deleted in the next move
If the normal loop() then finds such an event, the position is calculated (floats would have taken too long in the ISR) A serial message is generated.
2011-11-13 19:58:09 +01:00
e9adfa27b5
re-enabled heaterpower as storage for the current storage of the heater PWM duty cycle.
...
the M301 now returns the current PID settings of the machine.
M105 returns heating pwm duty cylce as "@:"
2011-11-12 20:37:28 +01:00
