3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94 from PavelSindler/PID_cal_update

Browse Source 
PID calibration temp runaway
This commit is contained in:
XPila 2017-11-22 02:58:25 +01:00 committed by GitHub
commit ed379275a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Firmware/temperature.cpp
View File

@ -226,6 +226,9 @@ unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0);
long bias, d; long bias, d;
float Ku, Tu; float Ku, Tu;
float max = 0, min = 10000; float max = 0, min = 10000;
uint8_t safety_check_cycles = 0;
const uint8_t safety_check_cycles_count = (extruder < 0) ? 45 : 10; //10 cycles / 20s delay for extruder and 45 cycles / 90s for heatbed
float temp_ambient;
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \ #if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \ (defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
@ -366,7 +369,28 @@ unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0);
SERIAL_PROTOCOL(input); SERIAL_PROTOCOL(input);
SERIAL_PROTOCOLPGM(" @:"); SERIAL_PROTOCOLPGM(" @:");
SERIAL_PROTOCOLLN(p); SERIAL_PROTOCOLLN(p);
if (safety_check_cycles == 0) { //save ambient temp
temp_ambient = input;
//SERIAL_ECHOPGM("Ambient T: ");
//MYSERIAL.println(temp_ambient);
safety_check_cycles++;
}
else if (safety_check_cycles < safety_check_cycles_count) { //delay
safety_check_cycles++;
}
else if (safety_check_cycles == safety_check_cycles_count){ //check that temperature is rising
safety_check_cycles++;
//SERIAL_ECHOPGM("Time from beginning: ");
//MYSERIAL.print(safety_check_cycles_count * 2);
//SERIAL_ECHOPGM("s. Difference between current and ambient T: ");
//MYSERIAL.println(input - temp_ambient);
if (abs(input - temp_ambient) < 5.0) {
temp_runaway_stop(false, (extruder<0));
pid_tuning_finished = true;
return;
}
}
temp_millis = millis(); temp_millis = millis();
} }
if(((millis() - t1) + (millis() - t2)) > (10L*60L*1000L*2L)) { if(((millis() - t1) + (millis() - t2)) > (10L*60L*1000L*2L)) {

5
Firmware/ultralcd.cpp
View File

@ -1291,6 +1291,7 @@ void lcd_commands()
pid_tuning_finished = false; pid_tuning_finished = false;
custom_message_state = 0; custom_message_state = 0;
lcd_setstatuspgm(MSG_PID_FINISHED); lcd_setstatuspgm(MSG_PID_FINISHED);
if (_Kp != 0 || _Ki != 0 || _Kd != 0) {
strcpy(cmd1, "M301 P"); strcpy(cmd1, "M301 P");
strcat(cmd1, ftostr32(_Kp)); strcat(cmd1, ftostr32(_Kp));
strcat(cmd1, " I"); strcat(cmd1, " I");
@ -1299,6 +1300,10 @@ void lcd_commands()
strcat(cmd1, ftostr32(_Kd)); strcat(cmd1, ftostr32(_Kd));
enquecommand(cmd1); enquecommand(cmd1);
enquecommand_P(PSTR("M500")); enquecommand_P(PSTR("M500"));
}
else {
SERIAL_ECHOPGM("Invalid PID cal. results. Not stored to EEPROM.");
}
display_time = millis(); display_time = millis();
lcd_commands_step = 1; lcd_commands_step = 1;
} }