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
14 years ago
02b9eceead
show sd%
14 years ago
7919a40d06
watchdog,percent done,
14 years ago
805d37f77b
Fixed some small planner bugs
14 years ago
5fd41ae872
Some fixes in planner
14 years ago
95126c09c0
Added slowdown
14 years ago
331e82dcd3
Buffer size > 16
14 years ago
2643ae93d6
Added modified Sanguino files
14 years ago
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
14 years ago
1d0452f10c
250000 baud
14 years ago
c57906b627
fixed bug with adjusting ki in realtime.
14 years ago
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
14 years ago
65934eee9c
A lot of changes in the planner code
14 years ago
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.
14 years ago
ff592b056a
heater power repair.
14 years ago
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 "@:"
14 years ago
36958ee305
minor changes and first not-well working version of autotemp
14 years ago
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
14 years ago
27361e7cd0
beautified the config. ordered it into thematic sections.
14 years ago
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
14 years ago
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
14 years ago
72ace55e6a
better visibility of public/private/imported variables
14 years ago
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
14 years ago
907daa49af
made loop counters uint8_t most were int(16_t) before
14 years ago
e3af73ee0c
Thermistor name problem
14 years ago
0b43761c3a
preprocessor magic to have a single source principle
14 years ago
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
14 years ago
fc0064e525
made cardreader more selfsustained
14 years ago
d3bfffcb6e
Corrected thermistor naming
14 years ago
01df04e02c
first compile with the cardreader class
14 years ago
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
14 years ago
87aaf0f70a
static'ified Marlin.pde.
14 years ago
5cf349a24a
Fixed some arc bugs
14 years ago
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
14 years ago
76b3f805c0
Added teensylu pins
14 years ago
1d171e9e52
reformating and some minor bugs/things found on the way.
14 years ago
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
14 years ago
1740a83e11
correcting commit errors.
14 years ago
7cc358b56b
wrong file location
14 years ago
e8092898b1
watchdog into dedicated file
14 years ago
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
14 years ago
0b82465168
First arcs version. (Arcs not working ok)
14 years ago
2e8e8878e5
Corrected temp variables.
14 years ago
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
14 years ago
d15f01e1b4
Temperature changes
14 years ago
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
14 years ago
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
14 years ago
8bcdb9f5f0
this is not working. Do you maybe know why?
14 years ago
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
14 years ago
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
14 years ago
Bernhard Kubicek