thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PID now per extruder. Fixed typo

Browse Source
This commit is contained in:
Erik vd Zalm
2013-01-06 14:26:23 +01:00
parent 0ac452e252
commit 6752cb2d9c
7 changed files with 125 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -1401,20 +1401,23 @@ void process_commands()
#ifdef PIDTEMP
case 301: // M301
{
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;
if(setTargetedHotend(301)){
break;
}
if(code_seen('P')) Kp[tmp_extruder] = code_value();
if(code_seen('I')) Ki[tmp_extruder] = code_value()*PID_dT;
if(code_seen('D')) Kd[tmp_extruder] = code_value()/PID_dT;
#ifdef PID_ADD_EXTRUSION_RATE
if(code_seen('C')) Kc = code_value();
#endif
updatePID();
SERIAL_PROTOCOL(MSG_OK);
SERIAL_PROTOCOL(" p:");
SERIAL_PROTOCOL(Kp);
SERIAL_PROTOCOL(Kp[tmp_extruder]);
SERIAL_PROTOCOL(" i:");
SERIAL_PROTOCOL(Ki/PID_dT);
SERIAL_PROTOCOL(Ki[tmp_extruder]/PID_dT);
SERIAL_PROTOCOL(" d:");
SERIAL_PROTOCOL(Kd*PID_dT);
SERIAL_PROTOCOL(Kd[tmp_extruder]*PID_dT);
#ifdef PID_ADD_EXTRUSION_RATE
SERIAL_PROTOCOL(" c:");
SERIAL_PROTOCOL(Kc*PID_dT);
@@ -1936,6 +1939,9 @@ bool setTargetedHotend(int code){
case 109:
SERIAL_ECHO(MSG_M109_INVALID_EXTRUDER);
break;
case 301:
SERIAL_ECHO(MSG_M301_INVALID_EXTRUDER);
break;
}
SERIAL_ECHOLN(tmp_extruder);
return true;