@ -41,17 +41,14 @@
//===========================================================================
//=============================public variables============================
//===========================================================================
int target_raw [ 3 ] = { 0 , 0 , 0 } ;
int current_raw [ 3 ] = { 0 , 0 , 0 } ;
int heatingtarget_raw [ 3 ] = { 0 , 0 , 0 } ;
int target_raw [ EXTRUDERS ] = { 0 } ;
int target_raw_bed = 0 ;
int current_raw [ EXTRUDERS ] = { 0 } ;
int current_raw_bed = 0 ;
# ifdef PIDTEMP
// probably used external
float HeaterPower ;
float pid_setpoint = 0.0 ;
// used external
float pid_setpoint [ EXTRUDERS ] = { 0.0 } ;
float Kp = DEFAULT_Kp ;
float Ki = DEFAULT_Ki ;
@ -72,42 +69,74 @@ static unsigned long previous_millis_bed_heater;
# ifdef PIDTEMP
//static cannot be external:
static float temp_iState = 0 ;
static float temp_dState = 0 ;
static float pTerm ;
static float iTerm ;
static float dTerm ;
static float temp_iState [ EXTRUDERS ] = { 0 } ;
static float temp_dState [ EXTRUDERS ] = { 0 } ;
static float pTerm [ EXTRUDERS ] ;
static float iTerm [ EXTRUDERS ] ;
static float dTerm [ EXTRUDERS ] ;
//int output;
static float pid_error ;
static float temp_iState_min ;
static float temp_iState_max ;
// static float pid_input;
// static float pid_output;
static bool pid_reset ;
static float pid_error [ EXTRUDERS ] ;
static float temp_iState_min [ EXTRUDERS ] ;
static float temp_iState_max [ EXTRUDERS ] ;
// static float pid_input[EXTRUDERS];
// static float pid_output[EXTRUDERS];
static bool pid_reset [ EXTRUDERS ] ;
# endif //PIDTEMP
# ifdef WATCHPERIOD
static int watch_raw [ 3 ] = { - 1000 , - 1000 , - 1000 } ;
static int watch_raw [ EXTRUDERS ] = { - 1000 } ; // the first value used for all
static unsigned long watchmillis = 0 ;
# endif //WATCHPERIOD
// Init min and max temp with extreme values to prevent false errors during startup
static int minttemp_0 = 0 ;
static int maxttemp_0 = 16383 ;
//static int minttemp_1 = 0;
//static int maxttemp_1 = 16383;
static int minttemp [ EXTRUDERS ] = { 0 } ;
static int maxttemp [ EXTRUDERS ] = { 16383 } ; // the first value used for all
static int bed_minttemp = 0 ;
static int bed_maxttemp = 16383 ;
static int heater_pin_map [ EXTRUDERS ] = { HEATER_0_PIN
# if EXTRUDERS > 1
, HEATER_1_PIN
# endif
# if EXTRUDERS > 2
, HEATER_2_PIN
# endif
# if EXTRUDERS > 3
# error Unsupported number of extruders
# endif
} ;
static void * heater_ttbl_map [ EXTRUDERS ] = { ( void * ) heater_0_temptable
# if EXTRUDERS > 1
, ( void * ) heater_1_temptable
# endif
# if EXTRUDERS > 2
, ( void * ) heater_2_temptable
# endif
# if EXTRUDERS > 3
# error Unsupported number of extruders
# endif
} ;
static int heater_ttbllen_map [ EXTRUDERS ] = { heater_0_temptable_len
# if EXTRUDERS > 1
, heater_1_temptable_len
# endif
# if EXTRUDERS > 2
, heater_2_temptable_len
# endif
# if EXTRUDERS > 3
# error Unsupported number of extruders
# endif
} ;
//===========================================================================
//=============================functions ============================
//============================= functions ============================
//===========================================================================
void updatePID ( )
{
# ifdef PIDTEMP
temp_iState_max = PID_INTEGRAL_DRIVE_MAX / Ki ;
for ( int e = 0 ; e < EXTRUDERS ; e + + ) {
temp_iState_max [ e ] = PID_INTEGRAL_DRIVE_MAX / Ki ;
}
# endif
}
@ -119,6 +148,7 @@ void manage_heater()
float pid_input ;
float pid_output ;
if ( temp_meas_ready ! = true ) //better readability
return ;
@ -126,85 +156,77 @@ void manage_heater()
temp_meas_ready = false ;
CRITICAL_SECTION_END ;
for ( int e = 0 ; e < EXTRUDERS ; e + + )
{
# ifdef PIDTEMP
pid_input = analog2temp ( current_raw [ TEMPSENSOR_HOTEND_0 ] ) ;
pid_input = analog2temp ( current_raw [ e ] , e ) ;
# ifndef PID_OPENLOOP
pid_error = pid_setpoint - pid_input ;
if ( pid_error > 10 ) {
pid_error [ e ] = pid_setpoint [ e ] - pid_input ;
if ( pid_error [ e ] > 10 ) {
pid_output = PID_MAX ;
pid_reset = true ;
pid_reset [ e ] = true ;
}
else if ( pid_error < - 10 ) {
else if ( pid_error [ e ] < - 10 ) {
pid_output = 0 ;
pid_reset = true ;
pid_reset [ e ] = true ;
}
else {
if ( pid_reset = = true ) {
temp_iState = 0.0 ;
pid_reset = false ;
}
pTerm = Kp * pid_error ;
temp_iState + = pid_error ;
temp_iState = constrain ( temp_iState , temp_iState_min , temp_iState_max ) ;
iTerm = Ki * temp_iState ;
if ( pid_reset [ e ] = = true ) {
temp_iState [ e ] = 0.0 ;
pid_reset [ e ] = false ;
}
pTerm [ e ] = Kp * pid_error [ e ] ;
temp_iState [ e ] + = pid_error [ e ] ;
temp_iState [ e ] = constrain ( temp_iState [ e ] , temp_iState_min [ e ] , temp_iState_max [ e ] ) ;
iTerm [ e ] = Ki * temp_iState [ e ] ;
//K1 defined in Configuration.h in the PID settings
# define K2 (1.0-K1)
dTerm = ( Kd * ( pid_input - temp_dState ) ) * K2 + ( K1 * dTerm ) ;
temp_dState = pid_input ;
// #ifdef PID_ADD_EXTRUSION_RATE
// pTerm+=Kc*current_block->speed_e; //additional heating if extrusion speed is high
// #endif
pid_output = constrain ( pTerm + iTerm - dTerm , 0 , PID_MAX ) ;
dTerm [ e ] = ( Kd * ( pid_input - temp_dState [ e ] ) ) * K2 + ( K1 * dTerm [ e ] ) ;
temp_dState [ e ] = pid_input ;
pid_output = constrain ( pTerm [ e ] + iTerm [ e ] - dTerm [ e ] , 0 , PID_MAX ) ;
}
# endif //PID_OPENLOOP
# ifdef PID_DEBUG
//SERIAL_ECHOLN(" PIDDEBUG Input "<<pid_input<<" Output "<<pid_output" pTerm "<<pTerm<<" iTerm "<<iTerm<<" dTerm "<<dTerm);
SERIAL_ECHOLN ( " PIDDEBUG " < < e < < " : Input " < < pid_input < < " Output " < < pid_output " pTerm " < < pTerm [ e ] < < " iTerm " < < iTerm [ e ] < < " dTerm " < < dTerm [ e ] ) ;
# endif //PID_DEBUG
HeaterPower = pid_output ;
// Check if temperature is within the correct range
if ( ( current_raw [ TEMPSENSOR_HOTEND_0 ] > minttemp_0 ) & & ( current_raw [ TEMPSENSOR_HOTEND_0 ] < maxttemp_0 ) ) {
analogWrite ( HEATER_0_PIN , pid_output ) ;
}
else {
analogWrite ( HEATER_0_PIN , 0 ) ;
# else /* PID off */
pid_output = 0 ;
if ( current_raw [ e ] < target_raw [ e ] ) {
pid_output = PID_MAX ;
}
# endif //PIDTEMP
# endif
# ifndef PIDTEMP
// Check if temperature is within the correct range
if ( ( current_raw [ TEMPSENSOR_HOTEND_0 ] > minttemp_0 ) & & ( current_raw [ TEMPSENSOR_HOTEND_0 ] < maxttemp_0 ) ) {
if ( current_raw [ TEMPSENSOR_HOTEND_0 ] > = target_raw [ TEMPSENSOR_HOTEND_0 ] ) {
WRITE ( HEATER_0_PIN , LOW ) ;
}
else {
WRITE ( HEATER_0_PIN , HIGH ) ;
}
if ( ( current_raw [ e ] > minttemp [ e ] ) & & ( current_raw [ e ] < maxttemp [ e ] ) )
{
analogWrite ( heater_pin_map [ e ] , pid_output ) ;
}
else {
WRITE ( HEATER_0_PIN , LOW ) ;
analogWrite ( heater_pin_map [ e ] , 0 ) ;
}
# endif
} // End extruder for loop
if ( millis ( ) - previous_millis_bed_heater < BED_CHECK_INTERVAL )
return ;
previous_millis_bed_heater = millis ( ) ;
# if TEMP_1 _PIN > -1
# if TEMP_BED _PIN > -1
// Check if temperature is within the correct range
if ( ( current_raw [ TEMPSENSOR_BED ] > bed_minttemp ) & & ( current_raw [ TEMPSENSOR_BED ] < bed_maxttemp ) ) {
if ( current_raw [ TEMPSENSOR_BED ] > = target_raw [ TEMPSENSOR_BED ] )
if ( ( current_raw_bed > bed_minttemp ) & & ( current_raw_bed < bed_maxttemp ) ) {
if ( current_raw_bed > = target_raw_bed )
{
WRITE ( HEATER_1 _PIN , LOW ) ;
WRITE ( HEATER_BED _PIN , LOW ) ;
}
else
{
WRITE ( HEATER_1 _PIN , HIGH ) ;
WRITE ( HEATER_BED _PIN , HIGH ) ;
}
}
else {
WRITE ( HEATER_1 _PIN , LOW ) ;
WRITE ( HEATER_BED _PIN , LOW ) ;
}
# endif
}
@ -214,30 +236,38 @@ void manage_heater()
// For a thermistor, it uses the RepRap thermistor temp table.
// This is needed because PID in hydra firmware hovers around a given analog value, not a temp value.
// This function is derived from inversing the logic from a portion of getTemperature() in FiveD RepRap firmware.
int temp2analog ( int celsius ) {
# ifdef HEATER_0_USES_THERMISTOR
int temp2analog ( int celsius , uint8_t e ) {
if ( e > = EXTRUDERS )
{
SERIAL_ERROR_START ;
SERIAL_ERROR ( ( int ) e ) ;
SERIAL_ERRORLNPGM ( " - Invalid extruder number! " ) ;
kill ( ) ;
}
if ( heater_ttbl_map [ e ] ! = 0 )
{
int raw = 0 ;
byte i ;
short ( * tt ) [ ] [ 2 ] = ( short ( * ) [ ] [ 2 ] ) ( heater_ttbl_map [ e ] ) ;
for ( i = 1 ; i < NUMTEMPS_HEATER_0 ; i + + )
for ( i = 1 ; i < heater_ttbllen_map [ e ] ; i + + )
{
if ( PGM_RD_W ( heater_0_temptable [ i ] [ 1 ] ) < celsius )
if ( PGM_RD_W ( ( * tt ) [ i ] [ 1 ] ) < celsius )
{
raw = PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 0 ] ) +
( celsius - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 1 ] ) ) *
( PGM_RD_W ( heater_0_temptable [ i ] [ 0 ] ) - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 0 ] ) ) /
( PGM_RD_W ( heater_0_temptable [ i ] [ 1 ] ) - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 1 ] ) ) ;
raw = PGM_RD_W ( ( * tt ) [ i - 1 ] [ 0 ] ) +
( celsius - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 1 ] ) ) *
( PGM_RD_W ( ( * tt ) [ i ] [ 0 ] ) - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 0 ] ) ) /
( PGM_RD_W ( ( * tt ) [ i ] [ 1 ] ) - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 1 ] ) ) ;
break ;
}
}
// Overflow: Set to last value in the table
if ( i = = NUMTEMPS_HEATER_0 ) raw = PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 0 ] ) ;
if ( i = = heater_ttbllen_map [ e ] ) raw = PGM_RD_W ( ( * tt ) [ i - 1 ] [ 0 ] ) ;
return ( 1023 * OVERSAMPLENR ) - raw ;
# elif defined HEATER_0_USES_AD595
}
return celsius * ( 1024.0 / ( 5.0 * 100.0 ) ) * OVERSAMPLENR ;
# endif
}
// Takes bed temperature value as input and returns corresponding raw value.
@ -245,12 +275,11 @@ int temp2analog(int celsius) {
// This is needed because PID in hydra firmware hovers around a given analog value, not a temp value.
// This function is derived from inversing the logic from a portion of getTemperature() in FiveD RepRap firmware.
int temp2analogBed ( int celsius ) {
# ifdef BED_USES_THERMISTOR
# ifdef BED_USES_THERMISTOR
int raw = 0 ;
byte i ;
for ( i = 1 ; i < BNUMTEMPS ; i + + )
for ( i = 1 ; i < bedtemptable_len ; i + + )
{
if ( PGM_RD_W ( bedtemptable [ i ] [ 1 ] ) < celsius )
{
@ -264,45 +293,52 @@ int temp2analogBed(int celsius) {
}
// Overflow: Set to last value in the table
if ( i = = BNUMTEMPS ) raw = PGM_RD_W ( bedtemptable [ i - 1 ] [ 0 ] ) ;
if ( i = = bedtemptable_len ) raw = PGM_RD_W ( bedtemptable [ i - 1 ] [ 0 ] ) ;
return ( 1023 * OVERSAMPLENR ) - raw ;
# elif defined BED_USES_AD595
# elif defined BED_USES_AD595
return lround ( celsius * ( 1024.0 * OVERSAMPLENR / ( 5.0 * 100.0 ) ) ) ;
# else
# else
# warning No heater-type defined for the bed.
# endif
return 0 ;
# endif
}
// Derived from RepRap FiveD extruder::getTemperature()
// For hot end temperature measurement.
float analog2temp ( int raw ) {
# ifdef HEATER_0_USES_THERMISTOR
float analog2temp ( int raw , uint8_t e ) {
if ( e > = EXTRUDERS )
{
SERIAL_ERROR_START ;
SERIAL_ERROR ( ( int ) e ) ;
SERIAL_ERRORLNPGM ( " - Invalid extruder number ! " ) ;
kill ( ) ;
}
if ( heater_ttbl_map [ e ] ! = 0 )
{
float celsius = 0 ;
byte i ;
short ( * tt ) [ ] [ 2 ] = ( short ( * ) [ ] [ 2 ] ) ( heater_ttbl_map [ e ] ) ;
raw = ( 1023 * OVERSAMPLENR ) - raw ;
for ( i = 1 ; i < NUMTEMPS_HEATER_0 ; i + + )
for ( i = 1 ; i < heater_ttbllen_map [ e ] ; i + + )
{
if ( PGM_RD_W ( heater_0_temptable [ i ] [ 0 ] ) > raw )
if ( PGM_RD_W ( ( * tt ) [ i ] [ 0 ] ) > raw )
{
celsius = PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 1 ] ) +
( raw - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 0 ] ) ) *
( float ) ( PGM_RD_W ( heater_0_temptable [ i ] [ 1 ] ) - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 1 ] ) ) /
( float ) ( PGM_RD_W ( heater_0_temptable [ i ] [ 0 ] ) - PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 0 ] ) ) ;
celsius = PGM_RD_W ( ( * tt ) [ i - 1 ] [ 1 ] ) +
( raw - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 0 ] ) ) *
( float ) ( PGM_RD_W ( ( * tt ) [ i ] [ 1 ] ) - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 1 ] ) ) /
( float ) ( PGM_RD_W ( ( * tt ) [ i ] [ 0 ] ) - PGM_RD_W ( ( * tt ) [ i - 1 ] [ 0 ] ) ) ;
break ;
}
}
// Overflow: Set to last value in the table
if ( i = = NUMTEMPS_HEATER_0 ) celsius = PGM_RD_W ( heater_0_temptable [ i - 1 ] [ 1 ] ) ;
if ( i = = heater_ttbllen_map [ e ] ) celsius = PGM_RD_W ( ( * tt ) [ i - 1 ] [ 1 ] ) ;
return celsius ;
# elif defined HEATER_0_USES_AD595
}
return raw * ( ( 5.0 * 100.0 ) / 1024.0 ) / OVERSAMPLENR ;
# else
# error PLEASE DEFINE HEATER TYPE
# endif
}
// Derived from RepRap FiveD extruder::getTemperature()
@ -314,7 +350,7 @@ float analog2tempBed(int raw) {
raw = ( 1023 * OVERSAMPLENR ) - raw ;
for ( i = 1 ; i < BNUMTEMPS ; i + + )
for ( i = 1 ; i < bedtemptable_len ; i + + )
{
if ( PGM_RD_W ( bedtemptable [ i ] [ 0 ] ) > raw )
{
@ -328,7 +364,7 @@ float analog2tempBed(int raw) {
}
// Overflow: Set to last value in the table
if ( i = = BNUMTEMPS ) celsius = PGM_RD_W ( bedtemptable [ i - 1 ] [ 1 ] ) ;
if ( i = = bedtemptable_len ) celsius = PGM_RD_W ( bedtemptable [ i - 1 ] [ 1 ] ) ;
return celsius ;
@ -342,6 +378,19 @@ float analog2tempBed(int raw) {
void tp_init ( )
{
// Finish init of mult extruder arrays
for ( int e = 0 ; e < EXTRUDERS ; e + + ) {
// populate with the first value
# ifdef WATCHPERIOD
watch_raw [ e ] = watch_raw [ 0 ] ;
# endif
maxttemp [ e ] = maxttemp [ 0 ] ;
# ifdef PIDTEMP
temp_iState_min [ e ] = 0.0 ;
temp_iState_max [ e ] = PID_INTEGRAL_DRIVE_MAX / Ki ;
# endif //PIDTEMP
}
# if (HEATER_0_PIN > -1)
SET_OUTPUT ( HEATER_0_PIN ) ;
# endif
@ -351,11 +400,12 @@ void tp_init()
# if (HEATER_2_PIN > -1)
SET_OUTPUT ( HEATER_2_PIN ) ;
# endif
# ifdef PIDTEMP
temp_iState_min = 0.0 ;
temp_iState_max = PID_INTEGRAL_DRIVE_MAX / Ki ;
# endif //PIDTEMP
# if (HEATER_BED_PIN > -1)
SET_OUTPUT ( HEATER_BED_PIN ) ;
# endif
# if (FAN_PIN > -1)
SET_OUTPUT ( FAN_PIN ) ;
# endif
// Set analog inputs
ADCSRA = 1 < < ADEN | 1 < < ADSC | 1 < < ADIF | 0x07 ;
@ -387,6 +437,14 @@ void tp_init()
ADCSRB = 1 < < MUX5 ;
# endif
# endif
# if (TEMP_BED_PIN > -1)
# if TEMP_BED_PIN < 8
DIDR0 | = 1 < < TEMP_BED_PIN ;
# else
DIDR2 | = 1 < < ( TEMP_BED_PIN - 8 ) ;
ADCSRB = 1 < < MUX5 ;
# endif
# endif
// Use timer0 for temperature measurement
// Interleave temperature interrupt with millies interrupt
@ -394,27 +452,34 @@ void tp_init()
TIMSK0 | = ( 1 < < OCIE0B ) ;
// Wait for temperature measurement to settle
delay ( 20 0 ) ;
delay ( 25 0 ) ;
# ifdef HEATER_0_MINTEMP
minttemp_0 = temp2analog ( HEATER_0_MINTEMP ) ;
minttemp [ 0 ] = temp2analog ( HEATER_0_MINTEMP , 0 ) ;
# endif //MINTEMP
# ifdef HEATER_0_MAXTEMP
maxttemp_0 = temp2analog ( HEATER_0_MAXTEMP ) ;
maxttemp [ 0 ] = temp2analog ( HEATER_0_MAXTEMP , 0 ) ;
# endif //MAXTEMP
# ifdef HEATER_1_MINTEMP
minttemp_1 = temp2analog ( HEATER_1_MINTEMP ) ;
# endif //MINTEMP
# ifdef HEATER_1_MAXTEMP
maxttemp_1 = temp2analog ( HEATER_1_MAXTEMP ) ;
# endif //MAXTEMP
# if (EXTRUDERS > 1) && defined(HEATER_1_MINTEMP)
minttemp [ 1 ] = temp2analog ( HEATER_1_MINTEMP , 1 ) ;
# endif // MINTEMP 1
# if (EXTRUDERS > 1) && defined(HEATER_1_MAXTEMP)
maxttemp [ 1 ] = temp2analog ( HEATER_1_MAXTEMP , 1 ) ;
# endif //MAXTEMP 1
# if (EXTRUDERS > 2) && defined(HEATER_2_MINTEMP)
minttemp [ 2 ] = temp2analog ( HEATER_2_MINTEMP , 2 ) ;
# endif //MINTEMP 2
# if (EXTRUDERS > 2) && defined(HEATER_2_MAXTEMP)
maxttemp [ 2 ] = temp2analog ( HEATER_2_MAXTEMP , 2 ) ;
# endif //MAXTEMP 2
# ifdef BED_MINTEMP
bed_minttemp = temp2analog ( BED_MINTEMP ) ;
bed_minttemp = temp2analogBed ( BED_MINTEMP ) ;
# endif //BED_MINTEMP
# ifdef BED_MAXTEMP
bed_maxttemp = temp2analog ( BED_MAXTEMP ) ;
bed_maxttemp = temp2analogBed ( BED_MAXTEMP ) ;
# endif //BED_MAXTEMP
}
@ -423,15 +488,16 @@ void tp_init()
void setWatch ( )
{
# ifdef WATCHPERIOD
if ( isHeatingHotend0 ( ) )
int t = 0 ;
for ( int e = 0 ; e < EXTRUDERS ; e + + )
{
watchmillis = max ( 1 , millis ( ) ) ;
watch_raw [ TEMPSENSOR_HOTEND_0 ] = current_raw [ TEMPSENSOR_HOTEND_0 ] ;
}
else
if ( isHeatingHotend ( e ) )
{
watchmillis = 0 ;
t = max ( t , millis ( ) ) ;
watch_raw [ e ] = current_raw [ e ] ;
}
}
watchmillis = t ;
# endif
}
@ -458,6 +524,13 @@ void disable_heater()
digitalWrite ( HEATER_2_PIN , LOW ) ;
# endif
# endif
# if TEMP_BED_PIN > -1
target_raw_bed = 0 ;
# if HEATER_BED_PIN > -1
digitalWrite ( HEATER_BED_PIN , LOW ) ;
# endif
# endif
}
// Timer 0 is shared with millies
@ -468,6 +541,7 @@ ISR(TIMER0_COMPB_vect)
static unsigned long raw_temp_0_value = 0 ;
static unsigned long raw_temp_1_value = 0 ;
static unsigned long raw_temp_2_value = 0 ;
static unsigned long raw_temp_bed_value = 0 ;
static unsigned char temp_state = 0 ;
switch ( temp_state ) {
@ -492,7 +566,26 @@ ISR(TIMER0_COMPB_vect)
# endif
temp_state = 2 ;
break ;
case 2 : // Prepare TEMP_1
case 2 : // Prepare TEMP_BED
# if (TEMP_BED_PIN > -1)
# if TEMP_BED_PIN > 7
ADCSRB = 1 < < MUX5 ;
# endif
ADMUX = ( ( 1 < < REFS0 ) | ( TEMP_BED_PIN & 0x07 ) ) ;
ADCSRA | = 1 < < ADSC ; // Start conversion
# endif
# ifdef ULTIPANEL
buttons_check ( ) ;
# endif
temp_state = 3 ;
break ;
case 3 : // Measure TEMP_BED
# if (TEMP_BED_PIN > -1)
raw_temp_bed_value + = ADC ;
# endif
temp_state = 4 ;
break ;
case 4 : // Prepare TEMP_1
# if (TEMP_1_PIN > -1)
# if TEMP_1_PIN > 7
ADCSRB = 1 < < MUX5 ;
@ -505,15 +598,15 @@ ISR(TIMER0_COMPB_vect)
# ifdef ULTIPANEL
buttons_check ( ) ;
# endif
temp_state = 3 ;
temp_state = 5 ;
break ;
case 3 : // Measure TEMP_1
case 5 : // Measure TEMP_1
# if (TEMP_1_PIN > -1)
raw_temp_1_value + = ADC ;
# endif
temp_state = 4 ;
temp_state = 6 ;
break ;
case 4 : // Prepare TEMP_2
case 6 : // Prepare TEMP_2
# if (TEMP_2_PIN > -1)
# if TEMP_2_PIN > 7
ADCSRB = 1 < < MUX5 ;
@ -526,9 +619,9 @@ ISR(TIMER0_COMPB_vect)
# ifdef ULTIPANEL
buttons_check ( ) ;
# endif
temp_state = 5 ;
temp_state = 7 ;
break ;
case 5 : // Measure TEMP_2
case 7 : // Measure TEMP_2
# if (TEMP_2_PIN > -1)
raw_temp_2_value + = ADC ;
# endif
@ -541,7 +634,7 @@ ISR(TIMER0_COMPB_vect)
break ;
}
if ( temp_count > = 16 ) // 6 ms * 16 = 96 ms.
if ( temp_count > = 16 ) // 8 ms * 16 = 128 ms.
{
# ifdef HEATER_0_USES_AD595
current_raw [ 0 ] = raw_temp_0_value ;
@ -549,16 +642,26 @@ ISR(TIMER0_COMPB_vect)
current_raw [ 0 ] = 16383 - raw_temp_0_value ;
# endif
# if EXTRUDERS > 1
# ifdef HEATER_1_USES_AD595
current_raw [ 1 ] = raw_temp_1_value ;
# else
current_raw [ 1 ] = 16383 - raw_temp_1_value ;
# endif
# endif
# if EXTRUDERS > 2
# ifdef HEATER_2_USES_AD595
current_raw [ 2 ] = raw_temp_2_value ;
# else
current_raw [ 2 ] = 16383 - raw_temp_2_value ;
# endif
# endif
# ifdef BED_USES_AD595
current_raw [ 1 ] = raw_temp_1_value ;
current_raw_bed = raw_temp_bed _value ;
# else
current_raw [ 1 ] = 16383 - raw_temp_1 _value ;
current_raw_bed = 16383 - raw_temp_bed _value ;
# endif
temp_meas_ready = true ;
@ -566,77 +669,36 @@ ISR(TIMER0_COMPB_vect)
raw_temp_0_value = 0 ;
raw_temp_1_value = 0 ;
raw_temp_2_value = 0 ;
# ifdef HEATER_0_MAXTEMP
# if (HEATER_0_PIN > -1)
if ( current_raw [ TEMPSENSOR_HOTEND_0 ] > = maxttemp_0 ) {
target_raw [ TEMPSENSOR_HOTEND_0 ] = 0 ;
digitalWrite ( HEATER_0_PIN , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperature extruder 0 switched off. MAXTEMP triggered !! " ) ;
kill ( ) ;
}
# endif
# endif
# ifdef HEATER_1_MAXTEMP
# if (HEATER_1_PIN > -1)
if ( current_raw [ TEMPSENSOR_HOTEND_1 ] > = maxttemp_1 ) {
target_raw [ TEMPSENSOR_HOTEND_1 ] = 0 ;
digitalWrite ( HEATER_2_PIN , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperature extruder 1 switched off. MAXTEMP triggered !! " ) ;
kill ( ) ;
}
# endif
# endif //MAXTEMP
raw_temp_bed_value = 0 ;
# ifdef HEATER_0_MINTEMP
# if (HEATER_0_PIN > -1)
if ( current_raw [ TEMPSENSOR_HOTEND_0 ] < = minttemp_0 ) {
target_raw [ TEMPSENSOR_HOTEND_0 ] = 0 ;
digitalWrite ( HEATER_0_PIN , 0 ) ;
for ( int e = 0 ; e < EXTRUDERS ; e + + ) {
if ( current_raw [ e ] > = maxttemp [ e ] ) {
target_raw [ e ] = 0 ;
digitalWrite ( heater_pin_map [ e ] , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperature extruder 0 switched off. MINTEMP triggered !! " ) ;
SERIAL_ERRORLN ( ( int ) e ) ;
SERIAL_ERRORLNPGM ( " : Extruder switched off. MAXTEMP triggered ! " ) ;
kill ( ) ;
}
# endif
# endif
# ifdef HEATER_1_MINTEMP
# if (HEATER_2_PIN > -1)
if ( current_raw [ TEMPSENSOR_HOTEND_1 ] < = minttemp_1 ) {
target_raw [ TEMPSENSOR_HOTEND_1 ] = 0 ;
digitalWrite ( HEATER_2_PIN , 0 ) ;
if ( current_raw [ e ] < = minttemp [ e ] ) {
target_raw [ e ] = 0 ;
digitalWrite ( heater_pin_map [ e ] , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperature extruder 1 switched off. MINTEMP triggered !! " ) ;
SERIAL_ERRORLN ( e ) ;
SERIAL_ERRORLNPGM ( " : Extruder switched off. MINTEMP triggered ! " ) ;
kill ( ) ;
}
# endif
# endif //MAXTEMP
# ifdef BED_MINTEMP
# if (HEATER_1_PIN > -1)
if ( current_raw [ 1 ] < = bed_minttemp ) {
target_raw [ 1 ] = 0 ;
digitalWrite ( HEATER_1_PIN , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperatur heated bed switched off. MINTEMP triggered !! " ) ;
kill ( ) ;
}
# endif
# endif
# ifdef BED_MAXTEMP
# if (HEATER_1_PIN > -1)
if ( current_raw [ 1 ] > = bed_maxttemp ) {
target_raw [ 1 ] = 0 ;
digitalWrite ( HEATER_1_PIN , 0 ) ;
# if defined(BED_MAXTEMP) && (HEATER_BED_PIN > -1)
if ( current_raw_bed > = bed_maxttemp ) {
target_raw_bed = 0 ;
digitalWrite ( HEATER_BED_PIN , 0 ) ;
SERIAL_ERROR_START ;
SERIAL_ERRORLNPGM ( " Temperature heated bed switched off. MAXTEMP triggered !! " ) ;
kill ( ) ;
}
# endif
# endif
# endif
}
}
Erik van der Zalm
13 years ago