3c1a4aac2b
header file simplification
2011-12-22 12:38:50 +01:00
84d9cf7339
merging
2011-12-12 20:35:46 +01:00
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
82c99625fa
instant stop of sd prints from the panel.
2011-12-11 22:10:06 +01:00
b1d84d879b
st_synchronize back to normal..
2011-12-09 16:13:58 +01:00
61c943b4bf
fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.
2011-12-09 12:32:31 +01:00
754d2d69b2
z homing sound fix, for now until the actual cause is found..
2011-12-07 23:08:13 +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
89e832c295
Update endstops only for homing. (use less resources when not used)
2011-12-04 21:03:02 +01: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
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
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
2011-12-02 17:45:05 +01:00
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
2011-11-28 21:36: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
b128d25f27
overlooked some inlines..
2011-11-27 16:45:00 +01:00
4d6a5c29df
disable steppers as routine in stepper.cpp
2011-11-26 11:50:23 +01:00
a6823a84e1
another typo
2011-11-25 22:36:33 +01:00
27654bfe69
Fixed variable (removed 0x)
2011-11-25 22:10:06 +01:00
ac8adabb2b
Small nominal speed improvement.
2011-11-25 15:32:50 +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
4e5becfc51
Added endstop reporting
2011-11-20 14:50:08 +01:00
e7dca8614b
Advance experiments. Not working yet.
2011-11-18 18:59:17 +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
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
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
2011-11-09 20:27:44 +01:00
72ace55e6a
better visibility of public/private/imported variables
2011-11-06 23:34:40 +01:00
907daa49af
made loop counters uint8_t most were int(16_t) before
2011-11-06 23:21:12 +01:00
1d171e9e52
reformating and some minor bugs/things found on the way.
2011-11-06 19:23:08 +01:00
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
2011-11-06 17:33:09 +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
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
2011-11-05 14:19:57 +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
