Closed PatONeil closed 9 years ago
This line
if (isr_soft_pwm[i] < pwm_count) digitalWrite(e_pins[i][HEATER_PIN],0);
should be outside if(pwm_count == 0)
block, not inside.
By the way, it's better to use <=
instead of <
here, see explanation in this commit: https://github.com/AlexeyKruglov/Marlin/commit/d4427ee55f26a11044eb2a3362f465bc4980a033
Alexey,
Thanks again for your time to look at the code. If you want the .h file, let me know.
Pat
From: Alexey Kruglov Sent: Wednesday, July 09, 2014 3:00 AM To: ErikZalm/Marlin Cc: PatONeil Subject: Re: [Marlin] Multiple extruders (6) with temperature.cpp (#995)
This line
if (isr_soft_pwm[i] < pwm_count) digitalWrite(e_pins[i][HEATER_PIN],0); should be outside if(pwm_count == 0) block, not inside.
By the way, it's better to use <= instead of < here, see explanation in this commit: AlexeyKruglov@d4427ee
— Reply to this email directly or view it on GitHub.
was this one solved?
please open a new issue if this is still present in the current bug fixing branch
https://github.com/ErikZalm/Marlin/tree/Marlin-v1-bug-fixing
This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
I have rewritten temperature.cpp to handle a variable number of extruders. I am currently using 6 extruders and the code seems to be working fine.
However, I am having trouble keeping temperatures within a tolerable range. Can anyone suggest why (even after pid tuning), I cannot manage temperatures within 20 degrees . The modified code is:
include "Marlin.h"
include "ultralcd.h"
include "temperature.h"
include "watchdog.h"
//=========================================================================== //=============================public variables============================ //=========================================================================== int target_temperature[EXTRUDERS] = { 0 }; int target_temperature_bed = 0; int current_temperature_raw[EXTRUDERS] = { 0 }; float current_temperature[EXTRUDERS] = { 0.0 }; int current_temperature_bed_raw = 0; float current_temperature_bed = 0.0;
ifdef TEMP_SENSOR_1_AS_REDUNDANT
int redundant_temperature_raw = 0; float redundant_temperature = 0.0;
endif
ifdef PIDTEMP
float Kp=DEFAULT_Kp; float Ki=(DEFAULT_Ki*PID_dT); float Kd=(DEFAULT_Kd/PID_dT);
ifdef PID_ADD_EXTRUSION_RATE
endif
endif //PIDTEMP
ifdef PIDTEMPBED
float bedKp=DEFAULT_bedKp; float bedKi=(DEFAULT_bedKi*PID_dT); float bedKd=(DEFAULT_bedKd/PID_dT);
endif //PIDTEMPBED
ifdef FAN_SOFT_PWM
unsigned char fanSpeedSoftPwm;
endif
unsigned char soft_pwm_bed;
ifdef BABYSTEPPING
volatile int babystepsTodo[3]={0,0,0};
endif
//=========================================================================== //=============================private variables============================ //=========================================================================== static volatile bool temp_meas_ready = false;
ifdef PIDTEMP
//static cannot be external: 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[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 PIDTEMPBED
//static cannot be external: static float temp_iState_bed = { 0 }; static float temp_dState_bed = { 0 }; static float pTerm_bed; static float iTerm_bed; static float dTerm_bed; //int output; static float pid_error_bed; static float temp_iState_min_bed; static float temp_iState_max_bed;
else //PIDTEMPBED
endif //PIDTEMPBED
static unsigned char soft_pwm[EXTRUDERS];
ifdef FAN_SOFT_PWM
static unsigned char soft_pwm_fan;
endif
if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
static unsigned long extruder_autofan_last_check;
endif
//static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; /* No bed mintemp error implemented?!? */
ifdef BED_MAXTEMP
static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP;
endif
static float analog2temp(int raw, uint8_t e); static float analog2tempBed(int raw); static void updateTemperaturesFromRawValues();
ifndef SOFT_PWM_SCALE
define SOFT_PWM_SCALE 0
endif
//=========================================================================== //============================= functions ============================ //===========================================================================
void PID_autotune(float temp, int extruder, int ncycles) { float input = 0.0; int cycles=0; bool heating = true;
unsigned long temp_millis = millis(); unsigned long t1=temp_millis; unsigned long t2=temp_millis; long t_high = 0; long t_low = 0;
long bias, d; float Ku, Tu; float Kp, Ki, Kd; float max = 0, min = 10000;
if ((extruder > EXTRUDERS)
if (TEMP_BED_PIN <= -1)
endif
SERIAL_ECHOLN("PID Autotune start");
disable_heater(); // switch off all heaters.
if (extruder<0) { soft_pwm_bed = (MAX_BED_POWER)/2; bias = d = (MAX_BED_POWER)/2; } else { soft_pwm[extruder] = (PID_MAX)/2; bias = d = (PID_MAX)/2; }
for(;;) {
} }
void updatePID() {
ifdef PIDTEMP
for(int e = 0; e < EXTRUDERS; e++) { temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
}
endif
ifdef PIDTEMPBED
temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
endif
}
int getHeaterPower(int heater) { if (heater<0) return soft_pwm_bed; return soft_pwm[heater]; }
if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
if defined(FAN_PIN) && FAN_PIN > -1
endif
void setExtruderAutoFanState(int pin, bool state) { unsigned char newFanSpeed = (state != 0) ? EXTRUDER_AUTO_FAN_SPEED : 0; // this idiom allows both digital and PWM fan outputs (see M42 handling). pinMode(pin, OUTPUT); digitalWrite(pin, newFanSpeed); analogWrite(pin, newFanSpeed); }
void checkExtruderAutoFans() { uint8_t fanState = 0;
// which fan pins need to be turned on?
if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
endif
if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
endif
if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
endif
// update extruder auto fan states
if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
endif
if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
endif
if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
endif
}
endif // any extruder auto fan pins set
void manage_heater() { float pid_input; float pid_output;
if(temp_meas_ready != true) //better readability return;
updateTemperaturesFromRawValues();
for(int e = 0; e < EXTRUDERS; e++) {
ifdef PIDTEMP
else /* PID off */
endif
} // End extruder for loop
if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
if(millis() - extruder_autofan_last_check > 2500) // only need to check fan state very infrequently { checkExtruderAutoFans(); extruder_autofan_last_check = millis(); }
endif
ifndef PIDTEMPBED
if(millis() - previous_millis_bed_heater < BED_CHECK_INTERVAL) return; previous_millis_bed_heater = millis();
endif
if TEMP_SENSOR_BED != 0
ifdef PIDTEMPBED
endif
}
define PGM_RD_W(x) (short)pgm_read_word(&x)
// Derived from RepRap FiveD extruder::getTemperature() // For hot end temperature measurement. static float analog2temp(int raw, uint8_t e) {
ifdef TEMP_SENSOR_1_AS_REDUNDANT
if(e > EXTRUDERS)
else
if(e >= EXTRUDERS)
endif
{ SERIAL_ERROR_START;
ifdef CAROUSEL_CARRIAGE
endif
}
ifdef HEATER_0_USES_MAX6675
endif
if(heater_ttbl_map[e] != NULL) { float celsius = 0; uint8_t i; short (tt)[][2] = (short ()[][2])(heater_ttbl_map[e]);
} return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET; }
// Derived from RepRap FiveD extruder::getTemperature() // For bed temperature measurement. static float analog2tempBed(int raw) {
ifdef BED_USES_THERMISTOR
elif defined BED_USES_AD595
else
endif
}
/* Called to get the raw values into the the actual temperatures. The raw values are created in interrupt context, and this function is called from normal context as it is too slow to run in interrupts and will block the stepper routine otherwise */ static void updateTemperaturesFromRawValues() { for(uint8_t e=0;e<EXTRUDERS;e++) { if (e>8) { SERIAL_ERROR_START; SERIAL_ECHOPAIR("updateTemperaturesFromRawValues Extruders=",(unsigned long)EXTRUDERS); SERIAL_ECHOPAIR(" but requested extruder=",(unsigned long)(e)); SERIAL_ERROR((int)e); SERIAL_ERRORLNPGM(" - Invalid extruder number !"); kill(); } current_temperature[e] = analog2temp(current_temperature_raw[e], e); } current_temperature_bed = analog2tempBed(current_temperature_bed_raw);
ifdef TEMP_SENSOR_1_AS_REDUNDANT
}
void tp_init() { // Support for multiple extruders without complicated code. SERIAL_ECHO_START; for (int8_t i = 0;i<EXTRUDERS;i++) { SERIAL_ECHOPAIR(" Extruder=",(unsigned long)(i)); SERIAL_ECHOPAIR(", heatPin=",(unsigned long)(e_pins[i][HEATER_PIN])); SERIAL_ECHOPAIR(", tempPin=",(unsigned long)(e_pins[i][TEMP_PIN])); minttemp_raw[i] = e_pins[i][HEATER_RAW_LO_TEMP]; SERIAL_ECHOPAIR(", minttemp_raw=",(unsigned long)(minttemp_raw[i])); maxttemp_raw[i] = e_pins[i][HEATER_RAW_HI_TEMP]; SERIAL_ECHOPAIR(", maxttemp_raw=",(unsigned long)(maxttemp_raw[i])); minttemp[i] = 0; SERIAL_ECHOPAIR(", minttemp=",(unsigned long)(minttemp[i])); maxttemp[i] = 16383; SERIAL_ECHOPAIR(", maxttemp=",(unsigned long)(maxttemp[i])); heater_ttbl_map[i] = (void *)e_pins[i][HEATER_TEMPTABLE]; SERIAL_ECHOPAIR(", heater_ttbl_map=",(unsigned long)(heater_ttbl_map[i])); heater_ttbllen_map[i] = e_pins[i][HEATER_TEMPTABLE_LEN]; SERIAL_ECHOPAIR(", heater_ttbllen_map=",(unsigned long)(heater_ttbllen_map[i])); watch_start_temp[i] = 0; watchmillis[i] = 0; SERIAL_ECHOLN(" "); // populate with the first value
ifdef PIDTEMP
endif //PIDTEMP
ifdef PIDTEMPBED
endif //PIDTEMPBED
}
if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1)
endif
if defined(FAN_PIN) && (FAN_PIN > -1)
endif
ifdef HEATER_0_USES_MAX6675
endif
// Set analog inputs ADCSRA = 1<<ADEN | 1<<ADSC | 1<<ADIF | 0x07; DIDR0 = 0;
ifdef DIDR2
endif
if defined(TEMP_BED_PIN) && (TEMP_BED_PIN > -1)
endif
// Use timer0 for temperature measurement // Interleave temperature interrupt with millies interrupt OCR0B = 128; TIMSK0 |= (1<<OCIE0B);
ifdef BED_MINTEMP
/* No bed MINTEMP error implemented?!? / / while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
else
endif
} */
endif //BED_MINTEMP
ifdef BED_MAXTEMP
while(analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
else
endif
}
endif //BED_MAXTEMP
}
void setWatch() {
ifdef WATCH_TEMP_PERIOD
for (int e = 0; e < EXTRUDERS; e++) { if(degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE * 2)) { watch_start_temp[e] = degHotend(e); watchmillis[e] = millis(); } }
endif
}
void disable_heater() { for(int i=0;i<EXTRUDERS;i++) { setTargetHotend(0,i); if (e_pins[i][TEMP_PIN] > -1) { target_temperature[i]=0; soft_pwm[i]=0; if (e_pins[i][HEATER_PIN] > -1) digitalWrite(e_pins[i][HEATER_PIN],LOW); }
}
void max_temp_error(uint8_t e) { disable_heater(); if(IsStopped() == false) { SERIAL_ERROR_START; SERIAL_ERRORLN((int)e); SERIAL_ERRORLNPGM(": Extruder switched off. MAXTEMP triggered !"); LCD_ALERTMESSAGEPGM("Err: MAXTEMP"); }
ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
Stop();
endif
}
void min_temp_error(uint8_t e) { disable_heater(); if(IsStopped() == false) { SERIAL_ERROR_START; SERIAL_ERRORLN((int)e); SERIAL_ERRORLNPGM(": Extruder switched off. MINTEMP triggered !"); LCD_ALERTMESSAGEPGM("Err: MINTEMP"); }
ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
Stop();
endif
}
void bed_max_temp_error(void) {
if HEATER_BED_PIN > -1
WRITE(HEATER_BED_PIN, 0);
endif
if(IsStopped() == false) { SERIAL_ERROR_START; SERIAL_ERRORLNPGM("Temperature heated bed switched off. MAXTEMP triggered !!"); LCD_ALERTMESSAGEPGM("Err: MAXTEMP BED"); }
ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
Stop();
endif
}
ifdef HEATER_0_USES_MAX6675
define MAX6675_HEAT_INTERVAL 250
long max6675_previous_millis = -HEAT_INTERVAL; int max6675_temp = 2000;
int read_max6675() { if (millis() - max6675_previous_millis < MAX6675_HEAT_INTERVAL) return max6675_temp;
max6675_previous_millis = millis(); max6675_temp = 0;
ifdef PRR
elif defined PRR0
endif
SPCR = (1<<MSTR) | (1<<SPE) | (1<<SPR0);
// enable TT_MAX6675 WRITE(MAX6675_SS, 0);
// ensure 100ns delay - a bit extra is fine asm("nop");//50ns on 20Mhz, 62.5ns on 16Mhz asm("nop");//50ns on 20Mhz, 62.5ns on 16Mhz
// read MSB SPDR = 0; for (;(SPSR & (1<<SPIF)) == 0;); max6675_temp = SPDR; max6675_temp <<= 8;
// read LSB SPDR = 0; for (;(SPSR & (1<<SPIF)) == 0;); max6675_temp |= SPDR;
// disable TT_MAX6675 WRITE(MAX6675_SS, 1);
if (max6675_temp & 4) { // thermocouple open max6675_temp = 2000; } else { max6675_temp = max6675_temp >> 3; }
return max6675_temp; }
endif
// Timer 0 is shared with millies ISR(TIMER0_COMPB_vect) { //these variables are only accesible from the ISR, but static, so they don't lose their value static unsigned char temp_count = 0; static unsigned long raw_temp_value[EXTRUDERS]={0}; static unsigned long raw_temp_bed_value = 0; static unsigned char temp_state = 0; static unsigned char pwm_count = (1 << SOFT_PWM_SCALE); static unsigned char isr_soft_pwm[EXTRUDERS]={0};
if HEATER_BED_PIN > -1
// }
}
ifdef PIDTEMP
// Apply the scale factors to the PID values
float scalePID_i(float i) { return i*PID_dT; }
float unscalePID_i(float i) { return i/PID_dT; }
float scalePID_d(float d) { return d/PID_dT; }
float unscalePID_d(float d) { return d*PID_dT; }