q3k
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up and changes from testing

hackerspace-green
Mark Finn 2012-09-17 19:18:09 -05:00
parent eb06a886c4
commit d197f8504b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Marlin.pde
View File

@ -1000,14 +1000,13 @@ void process_commands()
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
#endif
#ifdef PIDTEMP
SERIAL_PROTOCOLPGM(" @:");
SERIAL_PROTOCOL(getHeaterPower(tmp_extruder));
#endif
#ifdef PIDTEMPBED
SERIAL_PROTOCOLPGM(" B@:");
SERIAL_PROTOCOL(getHeaterPower(-1));
#endif
SERIAL_PROTOCOLLN("");
return;
break;

6
Marlin/temperature.cpp
View File

@ -99,6 +99,8 @@ static volatile bool temp_meas_ready = false;
static float pid_error_bed;
static float temp_iState_min_bed;
static float temp_iState_max_bed;
#else //PIDTEMPBED
static unsigned long previous_millis_bed_heater;
#endif //PIDTEMPBED
static unsigned char soft_pwm[EXTRUDERS];
static unsigned char soft_pwm_bed;
@ -640,9 +642,11 @@ void tp_init()
#ifdef PIDTEMP
temp_iState_min[e] = 0.0;
temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
#endif //PIDTEMP
#ifdef PIDTEMPBED
temp_iState_min_bed = 0.0;
temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
#endif //PIDTEMP
#endif //PIDTEMPBED
}
#if (HEATER_0_PIN > -1)