summaryrefslogtreecommitdiff
path: root/Sprinter
diff options
context:
space:
mode:
authorkliment <kliment.yanev@gmail.com>2012-05-01 03:50:02 -0700
committerkliment <kliment.yanev@gmail.com>2012-05-01 03:50:02 -0700
commitd651a6cb90a205b1ec203d756663a9ffdc9b485a (patch)
treee6c08f7bf202f18c14deeba88454bca4e546a5ea /Sprinter
parent52f7f3040874dc8b2ef4b0d570f7fa9d0291dfc3 (diff)
parent976c90b315a873b73bb19f4bbf1f8907cab37d82 (diff)
Merge pull request #167 from OhmEye/master
Fix compile error if SD_FAST_XFER_AKTIV is on and PID is off
Diffstat (limited to 'Sprinter')
-rw-r--r--Sprinter/Sprinter.pde4
1 files changed, 3 insertions, 1 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index 308ee19..61f895b 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -359,7 +359,7 @@ unsigned char manage_monitor = 255;
#ifdef SD_FAST_XFER_AKTIV
#ifdef PIDTEMP
- extern int g_heater_pwm_val;
+ extern volatile unsigned char g_heater_pwm_val;
#endif
void fast_xfer()
@@ -371,7 +371,9 @@ unsigned char manage_monitor = 255;
if(HEATER_0_PIN > -1) WRITE(HEATER_0_PIN,LOW);
if(HEATER_1_PIN > -1) WRITE(HEATER_1_PIN,LOW);
+ #ifdef PIDTEMP
g_heater_pwm_val = 0;
+ #endif
lastxferchar = 1;
xferbytes = 0;