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
Erik van der Zalm
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
2011-11-25 19:34:36 +01:00
Erik van der Zalm
0e0e4945d8
Removed ISR overtaken message from ISR routine
2011-11-25 13:59:58 +01:00
Erik van der Zalm
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
Bernhard Kubicek
5535e51bf6
Yes, thats the beta.
2011-11-20 17:04:57 +01:00
Erik van der Zalm
4e5becfc51
Added endstop reporting
2011-11-20 14:50:08 +01:00
Erik van der Zalm
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-19 21:33:15 +01:00
Erik van der Zalm
915ef2d4a1
Added software endstops
2011-11-19 21:32:47 +01:00
Bernhard Kubicek
e87df99e22
update mcode documentation
2011-11-19 21:01:07 +01:00
Bernhard Kubicek
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
2011-11-19 18:22:22 +01:00
Bernhard Kubicek
2a6afee832
make it compile without autotemp
2011-11-19 17:09:33 +01:00
Bernhard Kubicek
8a08b8e07e
trying to get autotemp to work.
2011-11-19 15:37:10 +01:00
Bernhard Kubicek
70abca195a
overworked cardreader for folder support; not finished yet.
2011-11-19 13:13:34 +01:00
Bernhard Kubicek
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-18 22:22:23 +01:00
Bernhard Kubicek
5df5727e93
removed some debugging comments
2011-11-18 22:20:53 +01:00
Bernhard Kubicek
64f2121ab1
updated to sdfatlib2010902
2011-11-18 22:17:37 +01:00
Erik van der Zalm
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
Erik van der Zalm
e7dca8614b
Advance experiments. Not working yet.
2011-11-18 18:59:17 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
7919a40d06
watchdog,percent done,
2011-11-15 20:54:40 +01:00
Erik van der Zalm
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-14 18:26:57 +01:00
Bernhard Kubicek
c57906b627
fixed bug with adjusting ki in realtime.
2011-11-13 21:43:26 +01:00
Erik van der Zalm
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-13 20:46:44 +01:00
Erik van der Zalm
65934eee9c
A lot of changes in the planner code
2011-11-13 20:42:08 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
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
Bernhard Kubicek
36958ee305
minor changes and first not-well working version of autotemp
2011-11-09 22:09:16 +01:00
Bernhard Kubicek
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
2011-11-09 20:30:41 +01:00
Bernhard Kubicek
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
2011-11-09 20:27:44 +01:00
Bernhard Kubicek
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
2011-11-07 22:33:13 +01:00
Bernhard Kubicek
907daa49af
made loop counters uint8_t most were int(16_t) before
2011-11-06 23:21:12 +01:00
Bernhard Kubicek
0b43761c3a
preprocessor magic to have a single source principle
2011-11-06 23:13:19 +01:00
Bernhard Kubicek
fc0064e525
made cardreader more selfsustained
2011-11-06 22:48:15 +01:00
Bernhard Kubicek
01df04e02c
first compile with the cardreader class
2011-11-06 21:39:53 +01:00
Bernhard Kubicek
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-06 19:49:04 +01:00
Bernhard Kubicek
87aaf0f70a
static'ified Marlin.pde.
2011-11-06 19:48:37 +01:00
Erik van der Zalm
5cf349a24a
Fixed some arc bugs
2011-11-06 19:37:12 +01:00
Bernhard Kubicek
1d171e9e52
reformating and some minor bugs/things found on the way.
2011-11-06 19:23:08 +01:00
Bernhard Kubicek
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
2011-11-06 17:33:09 +01:00
Bernhard Kubicek
1740a83e11
correcting commit errors.
2011-11-06 15:10:29 +01:00
Bernhard Kubicek
e8092898b1
watchdog into dedicated file
2011-11-06 14:22:15 +01:00
Bernhard Kubicek
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
2011-11-06 14:03:41 +01:00
Erik van der Zalm
0b82465168
First arcs version. (Arcs not working ok)
2011-11-06 12:39:00 +01:00
Erik van der Zalm
2e8e8878e5
Corrected temp variables.
2011-11-05 20:21:09 +01:00
Erik van der Zalm
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
Erik van der Zalm
d15f01e1b4
Temperature changes
2011-11-05 19:21:36 +01:00
Bernhard Kubicek
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
2011-11-05 16:49:29 +01:00
Bernhard Kubicek
8bcdb9f5f0
this is not working. Do you maybe know why?
2011-11-05 16:43:44 +01:00
Bernhard Kubicek
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
2011-11-05 14:13:20 +01:00
Erik van der Zalm
d7c4f0780b
Added M42, M80 and M81
2011-11-05 11:18:52 +01:00
Erik van der Zalm
95d3d9847c
M109 now equal to sprinter
2011-11-04 23:38:25 +01:00
Erik van der Zalm
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
2011-11-04 18:02:56 +01:00
Erik van der Zalm
0b1423c303
Fixed crashes.
2011-10-18 19:13:30 +02:00
Erik van der Zalm
27664c6da6
Software endstps added
2011-09-15 17:37:58 +02:00
Erik van der Zalm
8e017b81ab
Sync with non-gen6 version
2011-09-14 18:56:45 +02:00
Erik van der Zalm
b5f6482dce
Fixed small feedrate bug.
...
Copied Camiels comments in the Configuration.h file
2011-08-21 18:29:47 +02:00
Erik van der Zalm
0024a26ccf
Fixed lookup table bug.
2011-08-15 19:26:40 +02:00
Erik van der Zalm
5a1787b2f4
Fix M109
2011-08-14 22:15:33 +02:00
Erik van der Zalm
26bf57e22c
first-commit
2011-08-13 10:09:54 +02:00
Erik van der Zalm
750f6c33e3
first commit
2011-08-12 22:28:35 +02:00
