From e9adfa27b5c65f53c3f71e4348ccb51e7950c935 Mon Sep 17 00:00:00 2001
From: Bernhard Kubicek <kubicek@gmx.at>
Date: Sat, 12 Nov 2011 20:37:28 +0100
Subject: [PATCH] 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 "@:"
---
Marlin/Marlin.pde | 52 +++++++++++++++++++++++-------------------
Marlin/temperature.cpp | 1 +
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 672591a72..4c1ece07e 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -647,33 +647,24 @@ inline void process_commands()
break;
case 105: // M105
//SERIAL_ECHOLN(freeMemory());
- #if (TEMP_0_PIN > -1) || defined (HEATER_USES_AD595)
- tt = degHotend0();
- #endif
- #if TEMP_1_PIN > -1
- bt = degBed();
- #endif
+
#if (TEMP_0_PIN > -1) || defined (HEATER_USES_AD595)
SERIAL_PROTOCOLPGM("ok T:");
- SERIAL_PROTOCOL(tt);
+ SERIAL_PROTOCOL( degHotend0());
#if TEMP_1_PIN > -1
- #ifdef PIDTEMP
- SERIAL_PROTOCOL(" B:");
- #if TEMP_1_PIN > -1
- SERIAL_PROTOCOLLN(bt);
- #else
- SERIAL_PROTOCOLLN(HeaterPower);
- #endif
- #else //not PIDTEMP
- SERIAL_PROTOCOLLN("");
- #endif //PIDTEMP
- #else
- SERIAL_PROTOCOLLN("");
- #endif //TEMP_1_PIN
- #else
- SERIAL_ERROR_START;
- SERIAL_ERRORLNPGM("No thermistors - no temp");
+ SERIAL_PROTOCOLPGM(" B:");
+ SERIAL_PROTOCOL(degBed());
+ #endif //TEMP_1_PIN
+ #else
+ SERIAL_ERROR_START;
+ SERIAL_ERRORLNPGM("No thermistors - no temp");
#endif
+ #ifdef PIDTEMP
+ SERIAL_PROTOCOLPGM(" @:");
+ SERIAL_PROTOCOL( HeaterPower);
+
+ #endif
+ SERIAL_PROTOCOLLN("");
return;
break;
case 109:
@@ -901,6 +892,21 @@ inline void process_commands()
if(code_seen('P')) Kp = code_value();
if(code_seen('I')) Ki = code_value()*PID_dT;
if(code_seen('D')) Kd = code_value()/PID_dT;
+ #ifdef PID_ADD_EXTRUSION_RATE
+ if(code_seen('C')) Kc = code_value();
+ #endif
+ SERIAL_PROTOCOL("ok p:");
+ SERIAL_PROTOCOL(Kp);
+ SERIAL_PROTOCOL(" i:");
+ SERIAL_PROTOCOL(Ki/PID_dT);
+ SERIAL_PROTOCOL(" d:");
+ SERIAL_PROTOCOL(Kd*PID_dT);
+ #ifdef PID_ADD_EXTRUSION_RATE
+ SERIAL_PROTOCOL(" c:");
+ SERIAL_PROTOCOL(Kc*PID_dT);
+ #endif
+ SERIAL_PROTOCOLLN("");
+
break;
#endif //PIDTEMP
case 500: // Store settings in EEPROM
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 83c173b28..0772cb324 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -156,6 +156,7 @@ void manage_heater()
pTerm+=Kc*current_block->speed_e; //additional heating if extrusion speed is high
#endif
pid_output = constrain(pTerm + iTerm - dTerm, 0, PID_MAX);
+ HeaterPower=pid_output;
}
#endif //PID_OPENLOOP
#ifdef PID_DEBUG