Erik van der Zalm
|
ff69e0a772
|
Changed max/min temp init. Removed second uart from sabguino core
|
13 gadus atpakaļ |
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 gadus atpakaļ |
Erik van der Zalm
|
331e82dcd3
|
Buffer size > 16
|
13 gadus atpakaļ |
Bernhard Kubicek
|
c57906b627
|
fixed bug with adjusting ki in realtime.
|
13 gadus atpakaļ |
Erik van der Zalm
|
65934eee9c
|
A lot of changes in the planner code
|
13 gadus atpakaļ |
Bernhard Kubicek
|
ff592b056a
|
heater power repair.
|
13 gadus atpakaļ |
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 gadus atpakaļ |
Bernhard Kubicek
|
ba8a53a40f
|
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
|
13 gadus atpakaļ |
Bernhard Kubicek
|
ab154d5592
|
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
72ace55e6a
|
better visibility of public/private/imported variables
|
13 gadus atpakaļ |
Erik van der Zalm
|
e3af73ee0c
|
Thermistor name problem
|
13 gadus atpakaļ |
Bernhard Kubicek
|
79d1bfb5c0
|
made many possible variables static, so they cannot be used extern.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
900e0c9bf2
|
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
1740a83e11
|
correcting commit errors.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
2afb7bd4cf
|
refactured temperature.cpp so that there are now abstract functions to access temperatures.
|
13 gadus atpakaļ |
Erik van der Zalm
|
2e8e8878e5
|
Corrected temp variables.
|
13 gadus atpakaļ |
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
13 gadus atpakaļ |
Bernhard Kubicek
|
ea86a5e10f
|
moved the variables in the ISR, thats the most normal use case of static.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
b9ea0651ec
|
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
8bcdb9f5f0
|
this is not working. Do you maybe know why?
|
13 gadus atpakaļ |
Bernhard Kubicek
|
40e8081623
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 gadus atpakaļ |
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 gadus atpakaļ |
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
13 gadus atpakaļ |
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
13 gadus atpakaļ |