95a0b28acb
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
af22e9cd38
Some advance modifications
13 years ago
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.
13 years ago
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
13 years ago
4f909963e4
make QUICKHOME configureable
13 years ago
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
13 years ago
0bc9daa4f7
make it compile with arduino 1.0 ; function is still untested.
13 years ago
b0c3871750
more fixing of the sanguino math round problem
13 years ago
9c57453168
removed stream.h referenece from marlinserial.
13 years ago
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.
13 years ago
7a4be21b4f
made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h
13 years ago
716e89b87c
first homing move diagonal towards home switches.
13 years ago
d00b7e5587
repaired compiliation in windows
13 years ago
e4ab0e5982
more inlines
13 years ago
8cb29921a0
possible stepper release after sd printing
13 years ago
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b19c8b74b9
force inline
13 years ago
6d95644c0d
Moved M88 into M84. (M84 E)
13 years ago
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
13 years ago
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
13 years ago
98805c9228
Added M88 command. (Request from Action68)
13 years ago
85da81e673
inlineing of small functions in serial
13 years ago
b9ad0bb2ce
removed unecessary indirect register adressing in serial.
13 years ago
dd5ca68c87
get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
13 years ago
dd5296ad4d
Fixed temperature reading bug.
...
(When using the lower and upper adc input bank)
13 years ago
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
2d9a715655
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
13 years ago
d2f034ba84
lcd message from gcode, m117
13 years ago
6aecf80278
add autotemp support to the lcd
13 years ago
b128d25f27
overlooked some inlines..
13 years ago
26a1de1e44
force inline
13 years ago
f8e170a44b
planner optimization by inline functions
13 years ago
aad4b75b94
First parts 2nd extruder
13 years ago
a0dc66f7bf
Home retract distance configureable per axis.
13 years ago
6d6f323535
make an option if sd-card stop should release the steppers.
13 years ago
4d6a5c29df
disable steppers as routine in stepper.cpp
13 years ago
74d0032e25
cooldown blocking selectable by #define.
13 years ago
191f36b493
slowdown
13 years ago
c54a807824
overworked ultralcd a bit
13 years ago
a6823a84e1
another typo
13 years ago
57e163e989
typo
13 years ago
b58787a367
now velocities are also set in mm/sec in gcode.
13 years ago
71ca78982b
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
235051253a
overworked lcd+eeprom to have only mm/sec and PID including pid_dt
13 years ago
27654bfe69
Fixed variable (removed 0x)
13 years ago
cdf0bd4e63
Fixed config bug when EEPROM was disabled
13 years ago
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
13 years ago
ac8adabb2b
Small nominal speed improvement.
13 years ago
0e0e4945d8
Removed ISR overtaken message from ISR routine
13 years ago
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
13 years ago
5535e51bf6
Yes, thats the beta.
13 years ago
8b14a8ad34
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
924bab1a03
less lcd flickering
13 years ago
379ea642e1
make tuneing sub-menu.
13 years ago
959d82e81e
Small temperature disable bug.
13 years ago
15bb3f284e
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
4e5becfc51
Added endstop reporting
13 years ago
eeb4f029db
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b21d5193f2
made ultralcd compatible with folders.
13 years ago
2e43f9c809
Changed min max temperature code.
13 years ago
cd2268f10a
code cleanup in ultralcd.
13 years ago
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
915ef2d4a1
Added software endstops
13 years ago
e87df99e22
update mcode documentation
13 years ago
8a1e719a3f
overworked config file
13 years ago
5ad1d19384
make it compile without sd_support
13 years ago
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
13 years ago
e02af3e66a
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
537b5c155d
Fixed arc flowrate.
13 years ago
953d830bba
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
2a6afee832
make it compile without autotemp
13 years ago
f52e1a9571
autotemp working, default=disabled.
13 years ago
6e6fdb9a4e
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
6841a10446
Fixed max/min temperature bug
13 years ago
8a08b8e07e
trying to get autotemp to work.
13 years ago
f0154de5b3
found bug that disabled printing from root.
13 years ago
70650c331d
corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf
13 years ago
9d90220537
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
869cee74e6
host-based sd card printing seems now to work with folders
13 years ago
70abca195a
overworked cardreader for folder support; not finished yet.
13 years ago
ff69e0a772
Changed max/min temp init. Removed second uart from sabguino core
13 years ago
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
edb5ea7efa
the normal config again..
13 years ago
5df5727e93
removed some debugging comments
13 years ago
64f2121ab1
updated to sdfatlib2010902
13 years ago
b15902d3b5
Fixed bug in configuration.h
13 years ago
e63e224a33
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
13 years ago
e7dca8614b
Advance experiments. Not working yet.
13 years ago
46f80e82d9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/ultralcd.h
13 years ago
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
13 years ago
02b9eceead
show sd%
13 years ago
7919a40d06
watchdog,percent done,
13 years ago
805d37f77b
Fixed some small planner bugs
13 years ago
5fd41ae872
Some fixes in planner
13 years ago
95126c09c0
Added slowdown
13 years ago
331e82dcd3
Buffer size > 16
13 years ago
2643ae93d6
Added modified Sanguino files
13 years ago
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
1d0452f10c
250000 baud
13 years ago
c57906b627
fixed bug with adjusting ki in realtime.
13 years ago
Erik van der Zalm