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
преди 13 години
Bernhard Kubicek
02b9eceead
show sd%
преди 13 години
Bernhard Kubicek
7919a40d06
watchdog,percent done,
преди 13 години
Bernhard Kubicek
c57906b627
fixed bug with adjusting ki in realtime.
преди 13 години
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.
преди 13 години
Bernhard Kubicek
ff592b056a
heater power repair.
преди 13 години
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 "@:"
преди 13 години
Bernhard Kubicek
36958ee305
minor changes and first not-well working version of autotemp
преди 13 години
Bernhard Kubicek
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
преди 13 години
Bernhard Kubicek
27361e7cd0
beautified the config. ordered it into thematic sections.
преди 13 години
Bernhard Kubicek
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
преди 13 години
Bernhard Kubicek
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
преди 13 години
Bernhard Kubicek
72ace55e6a
better visibility of public/private/imported variables
преди 13 години
Bernhard Kubicek
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
преди 13 години
Bernhard Kubicek
907daa49af
made loop counters uint8_t most were int(16_t) before
преди 13 години
Erik van der Zalm
e3af73ee0c
Thermistor name problem
преди 13 години
Bernhard Kubicek
0b43761c3a
preprocessor magic to have a single source principle
преди 13 години
Bernhard Kubicek
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
преди 13 години
Bernhard Kubicek
fc0064e525
made cardreader more selfsustained
преди 13 години
Erik van der Zalm
d3bfffcb6e
Corrected thermistor naming
преди 13 години
Bernhard Kubicek
01df04e02c
first compile with the cardreader class
преди 13 години
Bernhard Kubicek
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
преди 13 години
Bernhard Kubicek
87aaf0f70a
static'ified Marlin.pde.
преди 13 години
Erik van der Zalm
5cf349a24a
Fixed some arc bugs
преди 13 години
Bernhard Kubicek
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
преди 13 години
Erik van der Zalm
76b3f805c0
Added teensylu pins
преди 13 години
Bernhard Kubicek
1d171e9e52
reformating and some minor bugs/things found on the way.
преди 13 години
Bernhard Kubicek
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
преди 13 години
Bernhard Kubicek
1740a83e11
correcting commit errors.
преди 13 години
Bernhard Kubicek
7cc358b56b
wrong file location
преди 13 години
Bernhard Kubicek
e8092898b1
watchdog into dedicated file
преди 13 години
Bernhard Kubicek
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
преди 13 години
Erik van der Zalm
0b82465168
First arcs version. (Arcs not working ok)
преди 13 години
Erik van der Zalm
2e8e8878e5
Corrected temp variables.
преди 13 години
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
преди 13 години
Erik van der Zalm
d15f01e1b4
Temperature changes
преди 13 години
Bernhard Kubicek
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
преди 13 години
Bernhard Kubicek
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0 .
преди 13 години
Bernhard Kubicek
8bcdb9f5f0
this is not working. Do you maybe know why?
преди 13 години
Bernhard Kubicek
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
преди 13 години
Bernhard Kubicek
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
преди 13 години
Erik van der Zalm
d7c4f0780b
Added M42, M80 and M81
преди 13 години
Erik van der Zalm
95d3d9847c
M109 now equal to sprinter
преди 13 години
Erik van der Zalm
bf879ceaa9
Added thermistor tables
преди 13 години
Erik van der Zalm
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
преди 13 години
Erik van der Zalm
0b1423c303
Fixed crashes.
преди 13 години
Erik van der Zalm
27664c6da6
Software endstps added
преди 13 години
Erik van der Zalm
b099fe142c
Merge branch 'master' of github.com:ErikZalm/Marlin
преди 13 години
Erik van der Zalm
8e017b81ab
Sync with non-gen6 version
преди 13 години
ErikZalm
67967a4b60
Edited README via GitHub
преди 13 години