This website requires JavaScript.
0e0e4945d8
Removed ISR overtaken message from ISR routine
Erik van der Zalm
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.
Erik van der Zalm
2011-11-25 13:43:06 +01:00
0db97b9c7f
Update README.md
ErikZalm
2011-11-21 22:40:47 +01:00
c9005865ed
Update README
ErikZalm
2011-11-20 19:21:51 +01:00
1022a5eaa7
Update README
ErikZalm
2011-11-20 19:21:19 +01:00
5535e51bf6
Yes, thats the beta.
Bernhard Kubicek
2011-11-20 17:04:57 +01:00
8b14a8ad34
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-20 16:39:39 +01:00
924bab1a03
less lcd flickering
Bernhard Kubicek
2011-11-20 16:37:01 +01:00
379ea642e1
make tuneing sub-menu.
Bernhard Kubicek
2011-11-20 16:05:42 +01:00
959d82e81e
Small temperature disable bug.
Erik van der Zalm
2011-11-20 15:03:35 +01:00
15bb3f284e
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-20 14:51:40 +01:00
4e5becfc51
Added endstop reporting
Erik van der Zalm
2011-11-20 14:50:08 +01:00
eeb4f029db
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-20 14:45:38 +01:00
b21d5193f2
made ultralcd compatible with folders.
Bernhard Kubicek
2011-11-20 14:43:47 +01:00
85c8a87e70
Small changes to README.md
Erik van der Zalm
2011-11-20 13:31:07 +01:00
2e43f9c809
Changed min max temperature code.
Erik van der Zalm
2011-11-20 13:14:58 +01:00
cd2268f10a
code cleanup in ultralcd.
Bernhard Kubicek
2011-11-20 11:55:33 +01:00
d8e7e2f72e
more readme
Bernhard Kubicek
2011-11-20 11:55:06 +01:00
6dba34ab0e
even more format.
Bernhard Kubicek
2011-11-20 09:09:11 +01:00
4687c56f53
format
Bernhard Kubicek
2011-11-20 09:06:05 +01:00
4258841241
format
Bernhard Kubicek
2011-11-20 09:03:42 +01:00
827cd72703
format readme.
Bernhard Kubicek
2011-11-20 09:00:19 +01:00
d41547a397
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-19 22:04:55 +01:00
61e0740bf0
overworked readme
Bernhard Kubicek
2011-11-19 22:04:37 +01:00
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-19 21:33:15 +01:00
915ef2d4a1
Added software endstops
Erik van der Zalm
2011-11-19 21:32:47 +01:00
e87df99e22
update mcode documentation
Bernhard Kubicek
2011-11-19 21:01:07 +01:00
8a1e719a3f
overworked config file
Bernhard Kubicek
2011-11-19 20:52:43 +01:00
5ad1d19384
make it compile without sd_support
Bernhard Kubicek
2011-11-19 20:18:54 +01:00
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
Bernhard Kubicek
2011-11-19 18:22:22 +01:00
e02af3e66a
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-19 17:23:47 +01:00
537b5c155d
Fixed arc flowrate.
Erik van der Zalm
2011-11-19 17:23:28 +01:00
953d830bba
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-19 17:09:43 +01:00
2a6afee832
make it compile without autotemp
Bernhard Kubicek
2011-11-19 17:09:33 +01:00
f52e1a9571
autotemp working, default=disabled.
Bernhard Kubicek
2011-11-19 17:07:44 +01:00
6e6fdb9a4e
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-19 16:18:13 +01:00
6841a10446
Fixed max/min temperature bug
Erik van der Zalm
2011-11-19 16:16:26 +01:00
8a08b8e07e
trying to get autotemp to work.
Bernhard Kubicek
2011-11-19 15:37:10 +01:00
f0154de5b3
found bug that disabled printing from root.
Bernhard Kubicek
2011-11-19 15:36:49 +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
Bernhard Kubicek
2011-11-19 14:50:31 +01:00
9d90220537
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-19 14:35:53 +01:00
869cee74e6
host-based sd card printing seems now to work with folders
Bernhard Kubicek
2011-11-19 14:34:27 +01:00
70abca195a
overworked cardreader for folder support; not finished yet.
Bernhard Kubicek
2011-11-19 13:13:34 +01:00
ff69e0a772
Changed max/min temp init. Removed second uart from sabguino core
Erik van der Zalm
2011-11-19 12:19:53 +01:00
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-18 22:22:23 +01:00
edb5ea7efa
the normal config again..
Bernhard Kubicek
2011-11-18 22:22:07 +01:00
5df5727e93
removed some debugging comments
Bernhard Kubicek
2011-11-18 22:20:53 +01:00
64f2121ab1
updated to sdfatlib2010902
Bernhard Kubicek
2011-11-18 22:17:37 +01:00
b15902d3b5
Fixed bug in configuration.h
Erik van der Zalm
2011-11-18 19:46:16 +01:00
e63e224a33
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-18 19:04:09 +01:00
e7dca8614b
Advance experiments. Not working yet.
Erik van der Zalm
2011-11-18 18:59:17 +01:00
46f80e82d9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
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
Bernhard Kubicek
2011-11-15 22:50:43 +01:00
02b9eceead
show sd%
Bernhard Kubicek
2011-11-15 20:55:00 +01:00
7919a40d06
watchdog,percent done,
Bernhard Kubicek
2011-11-15 20:54:40 +01:00
805d37f77b
Fixed some small planner bugs
Erik van der Zalm
2011-11-15 18:14:00 +01:00
5fd41ae872
Some fixes in planner
Erik van der Zalm
2011-11-14 23:57:34 +01:00
95126c09c0
Added slowdown
Erik van der Zalm
2011-11-14 20:04:29 +01:00
331e82dcd3
Buffer size > 16
Erik van der Zalm
2011-11-14 18:53:09 +01:00
2643ae93d6
Added modified Sanguino files
Erik van der Zalm
2011-11-14 18:27:47 +01:00
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-14 18:26:57 +01:00
1d0452f10c
250000 baud
Erik van der Zalm
2011-11-14 18:24:02 +01:00
c57906b627
fixed bug with adjusting ki in realtime.
Bernhard Kubicek
2011-11-13 21:43:26 +01:00
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-13 20:46:44 +01:00
65934eee9c
A lot of changes in the planner code
Erik van der Zalm
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.
Bernhard Kubicek
2011-11-13 19:58:09 +01:00
ff592b056a
heater power repair.
Bernhard Kubicek
2011-11-13 00:48:55 +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 "@:"
Bernhard Kubicek
2011-11-12 20:37:28 +01:00
36958ee305
minor changes and first not-well working version of autotemp
Bernhard Kubicek
2011-11-09 22:09:16 +01:00
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
Bernhard Kubicek
2011-11-09 20:30:41 +01:00
27361e7cd0
beautified the config. ordered it into thematic sections.
Bernhard Kubicek
2011-11-09 20:28:40 +01:00
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
Bernhard Kubicek
2011-11-09 20:27:15 +01:00
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
Bernhard Kubicek
2011-11-07 22:33:13 +01:00
72ace55e6a
better visibility of public/private/imported variables
Bernhard Kubicek
2011-11-06 23:34:40 +01:00
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-06 23:21:33 +01:00
907daa49af
made loop counters uint8_t most were int(16_t) before
Bernhard Kubicek
2011-11-06 23:21:12 +01:00
e3af73ee0c
Thermistor name problem
Erik van der Zalm
2011-11-06 23:20:01 +01:00
0b43761c3a
preprocessor magic to have a single source principle
Bernhard Kubicek
2011-11-06 23:13:19 +01:00
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-06 22:48:36 +01:00
fc0064e525
made cardreader more selfsustained
Bernhard Kubicek
2011-11-06 22:48:15 +01:00
d3bfffcb6e
Corrected thermistor naming
Erik van der Zalm
2011-11-06 22:37:43 +01:00
01df04e02c
first compile with the cardreader class
Bernhard Kubicek
2011-11-06 21:39:53 +01:00
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek
2011-11-06 19:49:04 +01:00
87aaf0f70a
static'ified Marlin.pde.
Bernhard Kubicek
2011-11-06 19:48:37 +01:00
5cf349a24a
Fixed some arc bugs
Erik van der Zalm
2011-11-06 19:37:12 +01:00
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
Bernhard Kubicek
2011-11-06 19:36:29 +01:00
76b3f805c0
Added teensylu pins
Erik van der Zalm
2011-11-06 19:30:04 +01:00
1d171e9e52
reformating and some minor bugs/things found on the way.
Bernhard Kubicek
2011-11-06 19:23:08 +01:00
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
Bernhard Kubicek
2011-11-06 17:33:09 +01:00
1740a83e11
correcting commit errors.
Bernhard Kubicek
2011-11-06 15:10:29 +01:00
7cc358b56b
wrong file location
Bernhard Kubicek
2011-11-06 14:58:12 +01:00
e8092898b1
watchdog into dedicated file
Bernhard Kubicek
2011-11-06 14:22:15 +01:00
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
Bernhard Kubicek
2011-11-06 14:03:41 +01:00
0b82465168
First arcs version. (Arcs not working ok)
Erik van der Zalm
2011-11-06 12:39:00 +01:00
2e8e8878e5
Corrected temp variables.
Erik van der Zalm
2011-11-05 20:21:09 +01:00
04d3b5537f
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-11-05 20:03:38 +01:00
d15f01e1b4
Temperature changes
Erik van der Zalm
2011-11-05 19:21:36 +01:00
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
Bernhard Kubicek
2011-11-05 16:53:37 +01:00
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
Bernhard Kubicek
2011-11-05 16:49:29 +01:00
8bcdb9f5f0
this is not working. Do you maybe know why?
Bernhard Kubicek
2011-11-05 16:43:44 +01:00
Erik van der Zalm
Bernhard Kubicek