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
|
2011-11-15 22:50:43 +01:00 |
|
Bernhard Kubicek
|
c57906b627
|
fixed bug with adjusting ki in realtime.
|
2011-11-13 21:43:26 +01:00 |
|
Bernhard Kubicek
|
ff592b056a
|
heater power repair.
|
2011-11-13 00:48:55 +01:00 |
|
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 "@:"
|
2011-11-12 20:37:28 +01:00 |
|
Bernhard Kubicek
|
ba8a53a40f
|
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
|
2011-11-09 20:30:41 +01:00 |
|
Bernhard Kubicek
|
ab154d5592
|
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
|
2011-11-09 20:27:44 +01:00 |
|
Bernhard Kubicek
|
72ace55e6a
|
better visibility of public/private/imported variables
|
2011-11-06 23:34:40 +01:00 |
|
Erik van der Zalm
|
e3af73ee0c
|
Thermistor name problem
|
2011-11-06 23:20:01 +01:00 |
|
Bernhard Kubicek
|
79d1bfb5c0
|
made many possible variables static, so they cannot be used extern.
|
2011-11-06 19:36:29 +01:00 |
|
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
2011-11-06 19:23:08 +01:00 |
|
Bernhard Kubicek
|
900e0c9bf2
|
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
|
2011-11-06 17:33:09 +01:00 |
|
Bernhard Kubicek
|
1740a83e11
|
correcting commit errors.
|
2011-11-06 15:10:29 +01:00 |
|
Bernhard Kubicek
|
2afb7bd4cf
|
refactured temperature.cpp so that there are now abstract functions to access temperatures.
|
2011-11-06 14:03:41 +01:00 |
|
Erik van der Zalm
|
2e8e8878e5
|
Corrected temp variables.
|
2011-11-05 20:21:09 +01:00 |
|
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
|
2011-11-05 20:03:38 +01:00 |
|
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
2011-11-05 19:21:36 +01:00 |
|
Bernhard Kubicek
|
ea86a5e10f
|
moved the variables in the ISR, thats the most normal use case of static.
|
2011-11-05 16:53:37 +01:00 |
|
Bernhard Kubicek
|
b9ea0651ec
|
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
|
2011-11-05 16:49:29 +01:00 |
|
Bernhard Kubicek
|
8bcdb9f5f0
|
this is not working. Do you maybe know why?
|
2011-11-05 16:43:44 +01:00 |
|
Bernhard Kubicek
|
40e8081623
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
2011-11-05 14:19:57 +01:00 |
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
2011-11-05 14:13:20 +01:00 |
|
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
2011-11-04 22:51:14 +01:00 |
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
2011-11-04 18:02:56 +01:00 |
|