2011-11-15 21:50:43 +00:00
|
|
|
/*
|
|
|
|
|
temperature.c - temperature control
|
|
|
|
|
Part of Marlin
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
This firmware is a mashup between Sprinter and grbl.
|
|
|
|
|
(https://github.com/kliment/Sprinter)
|
|
|
|
|
(https://github.com/simen/grbl/tree)
|
|
|
|
|
|
|
|
|
|
It has preliminary support for Matthew Roberts advance algorithm
|
|
|
|
|
http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
2011-12-22 11:38:50 +00:00
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
#include "Marlin.h"
|
|
|
|
|
#include "ultralcd.h"
|
|
|
|
|
#include "temperature.h"
|
|
|
|
|
#include "watchdog.h"
|
|
|
|
|
|
2015-01-15 23:52:10 +00:00
|
|
|
#include "Sd2PinMap.h"
|
|
|
|
|
|
2014-07-05 05:17:17 +00:00
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
//===========================================================================
|
2015-01-25 16:56:14 +00:00
|
|
|
//============================= public variables ============================
|
2011-11-15 21:50:43 +00:00
|
|
|
//===========================================================================
|
2015-01-25 16:56:14 +00:00
|
|
|
|
|
|
|
|
// Sampling period of the temperature routine
|
|
|
|
|
#ifdef PID_dT
|
|
|
|
|
#undef PID_dT
|
|
|
|
|
#endif
|
|
|
|
|
#define PID_dT ((OVERSAMPLENR * 12.0)/(F_CPU / 64.0 / 256.0))
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
int target_temperature[EXTRUDERS] = { 0 };
|
|
|
|
|
int target_temperature_bed = 0;
|
|
|
|
|
int current_temperature_raw[EXTRUDERS] = { 0 };
|
2013-06-06 22:49:25 +00:00
|
|
|
float current_temperature[EXTRUDERS] = { 0.0 };
|
2012-12-09 22:00:06 +00:00
|
|
|
int current_temperature_bed_raw = 0;
|
2013-06-06 22:49:25 +00:00
|
|
|
float current_temperature_bed = 0.0;
|
|
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
int redundant_temperature_raw = 0;
|
|
|
|
|
float redundant_temperature = 0.0;
|
|
|
|
|
#endif
|
2012-09-13 02:01:31 +00:00
|
|
|
|
|
|
|
|
#ifdef PIDTEMPBED
|
|
|
|
|
float bedKp=DEFAULT_bedKp;
|
|
|
|
|
float bedKi=(DEFAULT_bedKi*PID_dT);
|
|
|
|
|
float bedKd=(DEFAULT_bedKd/PID_dT);
|
|
|
|
|
#endif //PIDTEMPBED
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2013-06-09 10:52:49 +00:00
|
|
|
#ifdef FAN_SOFT_PWM
|
|
|
|
|
unsigned char fanSpeedSoftPwm;
|
|
|
|
|
#endif
|
2013-11-28 01:23:06 +00:00
|
|
|
|
|
|
|
|
unsigned char soft_pwm_bed;
|
2011-11-15 21:50:43 +00:00
|
|
|
|
Add the socalled "Babystepping" feature.
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
2013-10-06 19:14:51 +00:00
|
|
|
#ifdef BABYSTEPPING
|
|
|
|
|
volatile int babystepsTodo[3]={0,0,0};
|
|
|
|
|
#endif
|
2014-08-07 00:30:57 +00:00
|
|
|
|
|
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
|
|
int current_raw_filwidth = 0; //Holds measured filament diameter - one extruder only
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
//===========================================================================
|
|
|
|
|
//=============================private variables============================
|
|
|
|
|
//===========================================================================
|
2012-03-08 20:43:21 +00:00
|
|
|
static volatile bool temp_meas_ready = false;
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
#ifdef PIDTEMP
|
|
|
|
|
//static cannot be external:
|
2011-12-06 04:33:33 +00:00
|
|
|
static float temp_iState[EXTRUDERS] = { 0 };
|
|
|
|
|
static float temp_dState[EXTRUDERS] = { 0 };
|
|
|
|
|
static float pTerm[EXTRUDERS];
|
|
|
|
|
static float iTerm[EXTRUDERS];
|
|
|
|
|
static float dTerm[EXTRUDERS];
|
2011-11-15 21:50:43 +00:00
|
|
|
//int output;
|
2011-12-06 04:33:33 +00:00
|
|
|
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];
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif //PIDTEMP
|
2012-09-13 02:01:31 +00:00
|
|
|
#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;
|
2012-09-18 00:18:09 +00:00
|
|
|
#else //PIDTEMPBED
|
|
|
|
|
static unsigned long previous_millis_bed_heater;
|
2012-09-13 02:01:31 +00:00
|
|
|
#endif //PIDTEMPBED
|
2011-12-12 18:34:37 +00:00
|
|
|
static unsigned char soft_pwm[EXTRUDERS];
|
2013-11-28 01:23:06 +00:00
|
|
|
|
2012-12-16 00:36:57 +00:00
|
|
|
#ifdef FAN_SOFT_PWM
|
|
|
|
|
static unsigned char soft_pwm_fan;
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#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_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
|
|
|
|
static unsigned long extruder_autofan_last_check;
|
|
|
|
|
#endif
|
2012-12-16 00:36:57 +00:00
|
|
|
|
2015-01-23 22:13:06 +00:00
|
|
|
#if EXTRUDERS > 4
|
2013-06-06 22:49:25 +00:00
|
|
|
# error Unsupported number of extruders
|
2015-01-23 22:13:06 +00:00
|
|
|
#elif EXTRUDERS > 3
|
|
|
|
|
# define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1, v2, v3, v4 }
|
2012-12-05 18:54:01 +00:00
|
|
|
#elif EXTRUDERS > 2
|
2015-01-23 22:13:06 +00:00
|
|
|
# define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1, v2, v3 }
|
2012-12-05 18:54:01 +00:00
|
|
|
#elif EXTRUDERS > 1
|
2015-01-23 22:13:06 +00:00
|
|
|
# define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1, v2 }
|
2012-12-05 18:54:01 +00:00
|
|
|
#else
|
2015-01-23 22:13:06 +00:00
|
|
|
# define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1 }
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
2012-12-05 18:54:01 +00:00
|
|
|
|
Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
2015-01-10 03:46:08 +00:00
|
|
|
#ifdef PIDTEMP
|
2015-01-11 02:50:17 +00:00
|
|
|
#ifdef PID_PARAMS_PER_EXTRUDER
|
Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
2015-01-10 03:46:08 +00:00
|
|
|
float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp);
|
|
|
|
|
float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT);
|
|
|
|
|
float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT);
|
2015-01-11 02:50:17 +00:00
|
|
|
#ifdef PID_ADD_EXTRUSION_RATE
|
|
|
|
|
float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc);
|
|
|
|
|
#endif // PID_ADD_EXTRUSION_RATE
|
|
|
|
|
#else //PID_PARAMS_PER_EXTRUDER
|
|
|
|
|
float Kp = DEFAULT_Kp;
|
|
|
|
|
float Ki = DEFAULT_Ki * PID_dT;
|
|
|
|
|
float Kd = DEFAULT_Kd / PID_dT;
|
|
|
|
|
#ifdef PID_ADD_EXTRUSION_RATE
|
|
|
|
|
float Kc = DEFAULT_Kc;
|
|
|
|
|
#endif // PID_ADD_EXTRUSION_RATE
|
|
|
|
|
#endif // PID_PARAMS_PER_EXTRUDER
|
Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
2015-01-10 03:46:08 +00:00
|
|
|
#endif //PIDTEMP
|
|
|
|
|
|
2012-12-05 18:54:01 +00:00
|
|
|
// Init min and max temp with extreme values to prevent false errors during startup
|
2015-01-23 22:13:06 +00:00
|
|
|
static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP, HEATER_3_RAW_LO_TEMP);
|
|
|
|
|
static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP);
|
|
|
|
|
static int minttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 0, 0, 0, 0 );
|
|
|
|
|
static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383, 16383 );
|
2012-12-09 22:00:06 +00:00
|
|
|
//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
|
2013-06-06 22:49:25 +00:00
|
|
|
|
|
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
static void *heater_ttbl_map[2] = {(void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE };
|
|
|
|
|
static uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN };
|
|
|
|
|
#else
|
2015-01-23 22:13:06 +00:00
|
|
|
static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE, (void *)HEATER_3_TEMPTABLE );
|
|
|
|
|
static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN, HEATER_3_TEMPTABLE_LEN );
|
2013-06-06 22:49:25 +00:00
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
|
|
|
|
|
static float analog2temp(int raw, uint8_t e);
|
|
|
|
|
static float analog2tempBed(int raw);
|
|
|
|
|
static void updateTemperaturesFromRawValues();
|
2012-12-05 18:54:01 +00:00
|
|
|
|
2012-12-06 09:36:07 +00:00
|
|
|
#ifdef WATCH_TEMP_PERIOD
|
2015-01-23 22:13:06 +00:00
|
|
|
int watch_start_temp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0,0);
|
|
|
|
|
unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0,0);
|
2012-12-06 09:36:07 +00:00
|
|
|
#endif //WATCH_TEMP_PERIOD
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2013-06-09 10:52:49 +00:00
|
|
|
#ifndef SOFT_PWM_SCALE
|
|
|
|
|
#define SOFT_PWM_SCALE 0
|
|
|
|
|
#endif
|
|
|
|
|
|
2014-08-07 00:30:57 +00:00
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
|
|
static int meas_shift_index; //used to point to a delayed sample in buffer for filament width sensor
|
|
|
|
|
#endif
|
2015-01-23 18:37:39 +00:00
|
|
|
|
|
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
|
|
|
|
static int read_max6675();
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
//===========================================================================
|
2011-12-06 04:33:33 +00:00
|
|
|
//============================= functions ============================
|
2011-11-15 21:50:43 +00:00
|
|
|
//===========================================================================
|
2012-03-08 20:43:21 +00:00
|
|
|
|
2012-09-13 02:01:31 +00:00
|
|
|
void PID_autotune(float temp, int extruder, int ncycles)
|
2012-03-08 20:43:21 +00:00
|
|
|
{
|
2012-11-06 11:06:41 +00:00
|
|
|
float input = 0.0;
|
2012-03-08 20:43:21 +00:00
|
|
|
int cycles=0;
|
|
|
|
|
bool heating = true;
|
|
|
|
|
|
|
|
|
|
unsigned long temp_millis = millis();
|
|
|
|
|
unsigned long t1=temp_millis;
|
|
|
|
|
unsigned long t2=temp_millis;
|
2012-11-06 11:06:41 +00:00
|
|
|
long t_high = 0;
|
|
|
|
|
long t_low = 0;
|
2012-03-08 20:43:21 +00:00
|
|
|
|
2012-09-17 19:17:24 +00:00
|
|
|
long bias, d;
|
2012-03-08 20:43:21 +00:00
|
|
|
float Ku, Tu;
|
|
|
|
|
float Kp, Ki, Kd;
|
2012-11-06 11:06:41 +00:00
|
|
|
float max = 0, min = 10000;
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2014-12-24 04:35:54 +00:00
|
|
|
#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) || \
|
2015-01-23 22:13:06 +00:00
|
|
|
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1) || \
|
|
|
|
|
(defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1)
|
2014-12-24 04:35:54 +00:00
|
|
|
unsigned long extruder_autofan_last_check = millis();
|
|
|
|
|
#endif
|
|
|
|
|
|
Fixed error found by the free coverity tool (https://scan.coverity.com/)
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
2014-05-14 19:59:48 +00:00
|
|
|
if ((extruder >= EXTRUDERS)
|
2012-09-13 02:01:31 +00:00
|
|
|
#if (TEMP_BED_PIN <= -1)
|
2013-06-06 22:49:25 +00:00
|
|
|
||(extruder < 0)
|
|
|
|
|
#endif
|
|
|
|
|
){
|
|
|
|
|
SERIAL_ECHOLN("PID Autotune failed. Bad extruder number.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2012-03-08 20:43:21 +00:00
|
|
|
SERIAL_ECHOLN("PID Autotune start");
|
2012-04-10 19:57:57 +00:00
|
|
|
|
2012-04-15 17:17:33 +00:00
|
|
|
disable_heater(); // switch off all heaters.
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2013-06-06 22:49:25 +00:00
|
|
|
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;
|
2012-09-17 19:17:24 +00:00
|
|
|
}
|
2012-09-13 02:01:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for(;;) {
|
2012-03-08 20:43:21 +00:00
|
|
|
|
|
|
|
|
if(temp_meas_ready == true) { // temp sample ready
|
2012-12-09 22:00:06 +00:00
|
|
|
updateTemperaturesFromRawValues();
|
|
|
|
|
|
|
|
|
|
input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2012-03-08 20:43:21 +00:00
|
|
|
max=max(max,input);
|
|
|
|
|
min=min(min,input);
|
2014-12-24 04:35:54 +00:00
|
|
|
|
|
|
|
|
#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) || \
|
2015-01-23 22:13:06 +00:00
|
|
|
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1) || \
|
|
|
|
|
(defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1)
|
2014-12-24 04:35:54 +00:00
|
|
|
if(millis() - extruder_autofan_last_check > 2500) {
|
|
|
|
|
checkExtruderAutoFans();
|
|
|
|
|
extruder_autofan_last_check = millis();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-03-08 20:43:21 +00:00
|
|
|
if(heating == true && input > temp) {
|
|
|
|
|
if(millis() - t2 > 5000) {
|
|
|
|
|
heating=false;
|
2013-06-06 22:49:25 +00:00
|
|
|
if (extruder<0)
|
|
|
|
|
soft_pwm_bed = (bias - d) >> 1;
|
|
|
|
|
else
|
|
|
|
|
soft_pwm[extruder] = (bias - d) >> 1;
|
2012-03-08 20:43:21 +00:00
|
|
|
t1=millis();
|
|
|
|
|
t_high=t1 - t2;
|
|
|
|
|
max=temp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(heating == false && input < temp) {
|
|
|
|
|
if(millis() - t1 > 5000) {
|
|
|
|
|
heating=true;
|
|
|
|
|
t2=millis();
|
|
|
|
|
t_low=t2 - t1;
|
|
|
|
|
if(cycles > 0) {
|
|
|
|
|
bias += (d*(t_high - t_low))/(t_low + t_high);
|
2012-09-17 19:23:49 +00:00
|
|
|
bias = constrain(bias, 20 ,(extruder<0?(MAX_BED_POWER):(PID_MAX))-20);
|
|
|
|
|
if(bias > (extruder<0?(MAX_BED_POWER):(PID_MAX))/2) d = (extruder<0?(MAX_BED_POWER):(PID_MAX)) - 1 - bias;
|
2012-03-08 20:43:21 +00:00
|
|
|
else d = bias;
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM(" bias: "); SERIAL_PROTOCOL(bias);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" d: "); SERIAL_PROTOCOL(d);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" min: "); SERIAL_PROTOCOL(min);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" max: "); SERIAL_PROTOCOLLN(max);
|
|
|
|
|
if(cycles > 2) {
|
|
|
|
|
Ku = (4.0*d)/(3.14159*(max-min)/2.0);
|
|
|
|
|
Tu = ((float)(t_low + t_high)/1000.0);
|
2012-03-11 21:18:25 +00:00
|
|
|
SERIAL_PROTOCOLPGM(" Ku: "); SERIAL_PROTOCOL(Ku);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Tu: "); SERIAL_PROTOCOLLN(Tu);
|
2012-03-08 20:43:21 +00:00
|
|
|
Kp = 0.6*Ku;
|
|
|
|
|
Ki = 2*Kp/Tu;
|
|
|
|
|
Kd = Kp*Tu/8;
|
2014-02-18 17:50:12 +00:00
|
|
|
SERIAL_PROTOCOLLNPGM(" Classic PID ");
|
2012-03-11 21:18:25 +00:00
|
|
|
SERIAL_PROTOCOLPGM(" Kp: "); SERIAL_PROTOCOLLN(Kp);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Ki: "); SERIAL_PROTOCOLLN(Ki);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Kd: "); SERIAL_PROTOCOLLN(Kd);
|
2012-04-15 17:17:33 +00:00
|
|
|
/*
|
2012-03-11 21:18:25 +00:00
|
|
|
Kp = 0.33*Ku;
|
|
|
|
|
Ki = Kp/Tu;
|
|
|
|
|
Kd = Kp*Tu/3;
|
2014-04-25 08:05:05 +00:00
|
|
|
SERIAL_PROTOCOLLNPGM(" Some overshoot ");
|
2012-03-11 21:18:25 +00:00
|
|
|
SERIAL_PROTOCOLPGM(" Kp: "); SERIAL_PROTOCOLLN(Kp);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Ki: "); SERIAL_PROTOCOLLN(Ki);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Kd: "); SERIAL_PROTOCOLLN(Kd);
|
|
|
|
|
Kp = 0.2*Ku;
|
|
|
|
|
Ki = 2*Kp/Tu;
|
|
|
|
|
Kd = Kp*Tu/3;
|
2014-04-25 08:05:05 +00:00
|
|
|
SERIAL_PROTOCOLLNPGM(" No overshoot ");
|
2012-03-08 20:43:21 +00:00
|
|
|
SERIAL_PROTOCOLPGM(" Kp: "); SERIAL_PROTOCOLLN(Kp);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Ki: "); SERIAL_PROTOCOLLN(Ki);
|
|
|
|
|
SERIAL_PROTOCOLPGM(" Kd: "); SERIAL_PROTOCOLLN(Kd);
|
2012-04-15 17:17:33 +00:00
|
|
|
*/
|
2012-03-08 20:43:21 +00:00
|
|
|
}
|
|
|
|
|
}
|
2013-06-06 22:49:25 +00:00
|
|
|
if (extruder<0)
|
|
|
|
|
soft_pwm_bed = (bias + d) >> 1;
|
|
|
|
|
else
|
|
|
|
|
soft_pwm[extruder] = (bias + d) >> 1;
|
2012-03-08 20:43:21 +00:00
|
|
|
cycles++;
|
|
|
|
|
min=temp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(input > (temp + 20)) {
|
2013-05-02 16:22:58 +00:00
|
|
|
SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
|
2012-03-08 20:43:21 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if(millis() - temp_millis > 2000) {
|
2013-06-06 22:49:25 +00:00
|
|
|
int p;
|
|
|
|
|
if (extruder<0){
|
|
|
|
|
p=soft_pwm_bed;
|
|
|
|
|
SERIAL_PROTOCOLPGM("ok B:");
|
|
|
|
|
}else{
|
|
|
|
|
p=soft_pwm[extruder];
|
|
|
|
|
SERIAL_PROTOCOLPGM("ok T:");
|
|
|
|
|
}
|
2012-09-13 02:01:31 +00:00
|
|
|
|
|
|
|
|
SERIAL_PROTOCOL(input);
|
2012-03-08 20:43:21 +00:00
|
|
|
SERIAL_PROTOCOLPGM(" @:");
|
2012-09-13 02:01:31 +00:00
|
|
|
SERIAL_PROTOCOLLN(p);
|
|
|
|
|
|
|
|
|
|
temp_millis = millis();
|
2012-03-08 20:43:21 +00:00
|
|
|
}
|
2012-04-15 17:17:33 +00:00
|
|
|
if(((millis() - t1) + (millis() - t2)) > (10L*60L*1000L*2L)) {
|
|
|
|
|
SERIAL_PROTOCOLLNPGM("PID Autotune failed! timeout");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2012-09-13 02:01:31 +00:00
|
|
|
if(cycles > ncycles) {
|
2014-02-23 22:36:50 +00:00
|
|
|
SERIAL_PROTOCOLLNPGM("PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h");
|
2012-04-15 17:17:33 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2012-12-03 11:52:00 +00:00
|
|
|
lcd_update();
|
2012-03-08 20:43:21 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
void updatePID()
|
|
|
|
|
{
|
|
|
|
|
#ifdef PIDTEMP
|
2011-12-06 04:33:33 +00:00
|
|
|
for(int e = 0; e < EXTRUDERS; e++) {
|
2015-01-11 02:50:17 +00:00
|
|
|
temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / PID_PARAM(Ki,e);
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
2012-09-17 19:23:49 +00:00
|
|
|
#endif
|
|
|
|
|
#ifdef PIDTEMPBED
|
2012-09-13 02:01:31 +00:00
|
|
|
temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-12 18:34:37 +00:00
|
|
|
int getHeaterPower(int heater) {
|
2012-09-13 02:01:31 +00:00
|
|
|
if (heater<0)
|
|
|
|
|
return soft_pwm_bed;
|
2011-12-12 18:34:37 +00:00
|
|
|
return soft_pwm[heater];
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-06 22:49:25 +00:00
|
|
|
#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_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
|
|
|
|
|
|
|
|
|
#if defined(FAN_PIN) && FAN_PIN > -1
|
|
|
|
|
#if EXTRUDER_0_AUTO_FAN_PIN == FAN_PIN
|
|
|
|
|
#error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to FAN_PIN"
|
|
|
|
|
#endif
|
|
|
|
|
#if EXTRUDER_1_AUTO_FAN_PIN == FAN_PIN
|
|
|
|
|
#error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to FAN_PIN"
|
|
|
|
|
#endif
|
|
|
|
|
#if EXTRUDER_2_AUTO_FAN_PIN == FAN_PIN
|
|
|
|
|
#error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to FAN_PIN"
|
|
|
|
|
#endif
|
|
|
|
|
#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
|
|
|
|
|
if (current_temperature[0] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
|
|
|
|
fanState |= 1;
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
|
|
|
|
|
if (current_temperature[1] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
|
|
|
|
{
|
|
|
|
|
if (EXTRUDER_1_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 1;
|
|
|
|
|
else
|
|
|
|
|
fanState |= 2;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
|
|
|
|
|
if (current_temperature[2] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
|
|
|
|
{
|
|
|
|
|
if (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 1;
|
|
|
|
|
else if (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_1_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 2;
|
|
|
|
|
else
|
|
|
|
|
fanState |= 4;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#if defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1
|
|
|
|
|
if (current_temperature[3] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
|
|
|
|
{
|
|
|
|
|
if (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 1;
|
|
|
|
|
else if (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_1_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 2;
|
|
|
|
|
else if (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN)
|
|
|
|
|
fanState |= 4;
|
|
|
|
|
else
|
|
|
|
|
fanState |= 8;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
|
|
|
|
|
// update extruder auto fan states
|
|
|
|
|
#if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
|
|
|
|
|
setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, (fanState & 1) != 0);
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
|
|
|
|
|
if (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
|
|
|
|
|
setExtruderAutoFanState(EXTRUDER_1_AUTO_FAN_PIN, (fanState & 2) != 0);
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
|
|
|
|
|
if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
|
|
|
|
|
&& EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
|
|
|
|
|
setExtruderAutoFanState(EXTRUDER_2_AUTO_FAN_PIN, (fanState & 4) != 0);
|
2015-01-23 22:13:06 +00:00
|
|
|
#endif
|
|
|
|
|
#if defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1
|
|
|
|
|
if (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
|
|
|
|
|
&& EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
|
|
|
|
|
&& EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
|
|
|
|
|
setExtruderAutoFanState(EXTRUDER_3_AUTO_FAN_PIN, (fanState & 8) != 0);
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif // any extruder auto fan pins set
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
void manage_heater()
|
|
|
|
|
{
|
|
|
|
|
float pid_input;
|
|
|
|
|
float pid_output;
|
2011-12-06 04:33:33 +00:00
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
if(temp_meas_ready != true) //better readability
|
|
|
|
|
return;
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
updateTemperaturesFromRawValues();
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
|
|
|
|
if (current_temperature[0] > 1023 || current_temperature[0] > HEATER_0_MAXTEMP) {
|
|
|
|
|
max_temp_error(0);
|
|
|
|
|
}
|
|
|
|
|
if (current_temperature[0] == 0 || current_temperature[0] < HEATER_0_MINTEMP) {
|
|
|
|
|
min_temp_error(0);
|
|
|
|
|
}
|
|
|
|
|
#endif //HEATER_0_USES_MAX6675
|
|
|
|
|
|
2011-12-06 04:33:33 +00:00
|
|
|
for(int e = 0; e < EXTRUDERS; e++)
|
|
|
|
|
{
|
|
|
|
|
|
2014-12-20 16:33:43 +00:00
|
|
|
#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0
|
2014-06-30 18:22:37 +00:00
|
|
|
thermal_runaway_protection(&thermal_runaway_state_machine[e], &thermal_runaway_timer[e], current_temperature[e], target_temperature[e], e, THERMAL_RUNAWAY_PROTECTION_PERIOD, THERMAL_RUNAWAY_PROTECTION_HYSTERESIS);
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
#ifdef PIDTEMP
|
2012-12-09 22:00:06 +00:00
|
|
|
pid_input = current_temperature[e];
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
#ifndef PID_OPENLOOP
|
2012-12-09 22:00:06 +00:00
|
|
|
pid_error[e] = target_temperature[e] - pid_input;
|
2012-12-12 08:08:37 +00:00
|
|
|
if(pid_error[e] > PID_FUNCTIONAL_RANGE) {
|
2013-03-23 01:16:26 +00:00
|
|
|
pid_output = BANG_MAX;
|
2011-12-06 04:33:33 +00:00
|
|
|
pid_reset[e] = true;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
2013-03-23 01:16:26 +00:00
|
|
|
else if(pid_error[e] < -PID_FUNCTIONAL_RANGE || target_temperature[e] == 0) {
|
2011-11-15 21:50:43 +00:00
|
|
|
pid_output = 0;
|
2011-12-06 04:33:33 +00:00
|
|
|
pid_reset[e] = true;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2011-12-06 04:33:33 +00:00
|
|
|
if(pid_reset[e] == true) {
|
|
|
|
|
temp_iState[e] = 0.0;
|
|
|
|
|
pid_reset[e] = false;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
2015-01-11 02:50:17 +00:00
|
|
|
pTerm[e] = PID_PARAM(Kp,e) * pid_error[e];
|
2011-12-06 04:33:33 +00:00
|
|
|
temp_iState[e] += pid_error[e];
|
|
|
|
|
temp_iState[e] = constrain(temp_iState[e], temp_iState_min[e], temp_iState_max[e]);
|
2015-01-11 02:50:17 +00:00
|
|
|
iTerm[e] = PID_PARAM(Ki,e) * temp_iState[e];
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
//K1 defined in Configuration.h in the PID settings
|
|
|
|
|
#define K2 (1.0-K1)
|
2015-01-11 02:50:17 +00:00
|
|
|
dTerm[e] = (PID_PARAM(Kd,e) * (pid_input - temp_dState[e]))*K2 + (K1 * dTerm[e]);
|
2014-03-31 07:16:00 +00:00
|
|
|
pid_output = pTerm[e] + iTerm[e] - dTerm[e];
|
|
|
|
|
if (pid_output > PID_MAX) {
|
|
|
|
|
if (pid_error[e] > 0 ) temp_iState[e] -= pid_error[e]; // conditional un-integration
|
|
|
|
|
pid_output=PID_MAX;
|
|
|
|
|
} else if (pid_output < 0){
|
|
|
|
|
if (pid_error[e] < 0 ) temp_iState[e] -= pid_error[e]; // conditional un-integration
|
|
|
|
|
pid_output=0;
|
|
|
|
|
}
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
2013-08-01 12:12:30 +00:00
|
|
|
temp_dState[e] = pid_input;
|
2012-09-13 02:01:31 +00:00
|
|
|
#else
|
2012-12-09 22:00:06 +00:00
|
|
|
pid_output = constrain(target_temperature[e], 0, PID_MAX);
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif //PID_OPENLOOP
|
|
|
|
|
#ifdef PID_DEBUG
|
2014-02-26 05:44:22 +00:00
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHO(" PID_DEBUG ");
|
2012-12-09 22:50:12 +00:00
|
|
|
SERIAL_ECHO(e);
|
|
|
|
|
SERIAL_ECHO(": Input ");
|
|
|
|
|
SERIAL_ECHO(pid_input);
|
|
|
|
|
SERIAL_ECHO(" Output ");
|
|
|
|
|
SERIAL_ECHO(pid_output);
|
|
|
|
|
SERIAL_ECHO(" pTerm ");
|
|
|
|
|
SERIAL_ECHO(pTerm[e]);
|
|
|
|
|
SERIAL_ECHO(" iTerm ");
|
|
|
|
|
SERIAL_ECHO(iTerm[e]);
|
|
|
|
|
SERIAL_ECHO(" dTerm ");
|
2015-01-06 17:32:17 +00:00
|
|
|
SERIAL_ECHOLN(dTerm[e]);
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif //PID_DEBUG
|
2011-12-06 04:33:33 +00:00
|
|
|
#else /* PID off */
|
|
|
|
|
pid_output = 0;
|
2012-12-09 22:00:06 +00:00
|
|
|
if(current_temperature[e] < target_temperature[e]) {
|
2011-12-06 04:33:33 +00:00
|
|
|
pid_output = PID_MAX;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
|
2011-12-12 18:34:37 +00:00
|
|
|
// Check if temperature is within the correct range
|
2012-12-09 22:00:06 +00:00
|
|
|
if((current_temperature[e] > minttemp[e]) && (current_temperature[e] < maxttemp[e]))
|
2011-12-12 18:34:37 +00:00
|
|
|
{
|
|
|
|
|
soft_pwm[e] = (int)pid_output >> 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
soft_pwm[e] = 0;
|
|
|
|
|
}
|
2012-12-06 09:36:07 +00:00
|
|
|
|
|
|
|
|
#ifdef WATCH_TEMP_PERIOD
|
|
|
|
|
if(watchmillis[e] && millis() - watchmillis[e] > WATCH_TEMP_PERIOD)
|
|
|
|
|
{
|
|
|
|
|
if(degHotend(e) < watch_start_temp[e] + WATCH_TEMP_INCREASE)
|
|
|
|
|
{
|
|
|
|
|
setTargetHotend(0, e);
|
2011-12-09 16:06:56 +00:00
|
|
|
LCD_MESSAGEPGM("Heating failed");
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOLN("Heating failed");
|
|
|
|
|
}else{
|
2012-12-06 09:36:07 +00:00
|
|
|
watchmillis[e] = 0;
|
2011-12-09 16:06:56 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-12-06 09:36:07 +00:00
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
if(fabs(current_temperature[0] - redundant_temperature) > MAX_REDUNDANT_TEMP_SENSOR_DIFF) {
|
|
|
|
|
disable_heater();
|
|
|
|
|
if(IsStopped() == false) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM("Extruder switched off. Temperature difference between temp sensors is too high !");
|
|
|
|
|
LCD_ALERTMESSAGEPGM("Err: REDUNDANT TEMP ERROR");
|
|
|
|
|
}
|
|
|
|
|
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
|
|
|
|
Stop();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2012-12-06 09:36:07 +00:00
|
|
|
} // End extruder for loop
|
2012-08-11 06:17:47 +00:00
|
|
|
|
2013-06-06 22:49:25 +00:00
|
|
|
#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_2_AUTO_FAN_PIN) && EXTRUDER_2_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
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
#ifndef PIDTEMPBED
|
2011-11-15 21:50:43 +00:00
|
|
|
if(millis() - previous_millis_bed_heater < BED_CHECK_INTERVAL)
|
|
|
|
|
return;
|
|
|
|
|
previous_millis_bed_heater = millis();
|
2012-12-09 22:00:06 +00:00
|
|
|
#endif
|
2012-09-13 02:01:31 +00:00
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
#if TEMP_SENSOR_BED != 0
|
2011-12-22 10:45:52 +00:00
|
|
|
|
2015-01-23 10:20:07 +00:00
|
|
|
#if defined(THERMAL_RUNAWAY_PROTECTION_BED_PERIOD) && THERMAL_RUNAWAY_PROTECTION_BED_PERIOD > 0
|
2014-06-30 18:22:37 +00:00
|
|
|
thermal_runaway_protection(&thermal_runaway_bed_state_machine, &thermal_runaway_bed_timer, current_temperature_bed, target_temperature_bed, 9, THERMAL_RUNAWAY_PROTECTION_BED_PERIOD, THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS);
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
#ifdef PIDTEMPBED
|
|
|
|
|
pid_input = current_temperature_bed;
|
2012-08-11 06:17:47 +00:00
|
|
|
|
2012-09-13 02:01:31 +00:00
|
|
|
#ifndef PID_OPENLOOP
|
2012-12-09 22:00:06 +00:00
|
|
|
pid_error_bed = target_temperature_bed - pid_input;
|
2012-09-13 02:01:31 +00:00
|
|
|
pTerm_bed = bedKp * pid_error_bed;
|
|
|
|
|
temp_iState_bed += pid_error_bed;
|
|
|
|
|
temp_iState_bed = constrain(temp_iState_bed, temp_iState_min_bed, temp_iState_max_bed);
|
|
|
|
|
iTerm_bed = bedKi * temp_iState_bed;
|
|
|
|
|
|
|
|
|
|
//K1 defined in Configuration.h in the PID settings
|
|
|
|
|
#define K2 (1.0-K1)
|
|
|
|
|
dTerm_bed= (bedKd * (pid_input - temp_dState_bed))*K2 + (K1 * dTerm_bed);
|
|
|
|
|
temp_dState_bed = pid_input;
|
|
|
|
|
|
2014-06-08 05:05:11 +00:00
|
|
|
pid_output = pTerm_bed + iTerm_bed - dTerm_bed;
|
2015-01-23 22:13:06 +00:00
|
|
|
if (pid_output > MAX_BED_POWER) {
|
|
|
|
|
if (pid_error_bed > 0 ) temp_iState_bed -= pid_error_bed; // conditional un-integration
|
|
|
|
|
pid_output=MAX_BED_POWER;
|
|
|
|
|
} else if (pid_output < 0){
|
|
|
|
|
if (pid_error_bed < 0 ) temp_iState_bed -= pid_error_bed; // conditional un-integration
|
|
|
|
|
pid_output=0;
|
|
|
|
|
}
|
2012-09-13 02:01:31 +00:00
|
|
|
|
|
|
|
|
#else
|
2012-12-09 22:00:06 +00:00
|
|
|
pid_output = constrain(target_temperature_bed, 0, MAX_BED_POWER);
|
2012-09-13 02:01:31 +00:00
|
|
|
#endif //PID_OPENLOOP
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
if((current_temperature_bed > BED_MINTEMP) && (current_temperature_bed < BED_MAXTEMP))
|
2012-09-13 02:01:31 +00:00
|
|
|
{
|
|
|
|
|
soft_pwm_bed = (int)pid_output >> 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
soft_pwm_bed = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-13 09:25:29 +00:00
|
|
|
#elif !defined(BED_LIMIT_SWITCHING)
|
2011-12-22 10:45:52 +00:00
|
|
|
// Check if temperature is within the correct range
|
2012-12-13 09:25:29 +00:00
|
|
|
if((current_temperature_bed > BED_MINTEMP) && (current_temperature_bed < BED_MAXTEMP))
|
2012-12-09 22:00:06 +00:00
|
|
|
{
|
|
|
|
|
if(current_temperature_bed >= target_temperature_bed)
|
2011-12-22 10:45:52 +00:00
|
|
|
{
|
2012-12-09 22:00:06 +00:00
|
|
|
soft_pwm_bed = 0;
|
2011-12-22 10:45:52 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-12-09 22:00:06 +00:00
|
|
|
soft_pwm_bed = MAX_BED_POWER>>1;
|
2011-12-22 10:45:52 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-12-09 22:00:06 +00:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
soft_pwm_bed = 0;
|
2011-12-06 04:33:33 +00:00
|
|
|
WRITE(HEATER_BED_PIN,LOW);
|
2011-11-20 12:14:58 +00:00
|
|
|
}
|
2011-12-22 10:45:52 +00:00
|
|
|
#else //#ifdef BED_LIMIT_SWITCHING
|
|
|
|
|
// Check if temperature is within the correct band
|
2012-12-09 22:00:06 +00:00
|
|
|
if((current_temperature_bed > BED_MINTEMP) && (current_temperature_bed < BED_MAXTEMP))
|
|
|
|
|
{
|
|
|
|
|
if(current_temperature_bed > target_temperature_bed + BED_HYSTERESIS)
|
2011-12-22 10:45:52 +00:00
|
|
|
{
|
2012-12-09 22:00:06 +00:00
|
|
|
soft_pwm_bed = 0;
|
2011-12-22 10:45:52 +00:00
|
|
|
}
|
2012-12-09 22:00:06 +00:00
|
|
|
else if(current_temperature_bed <= target_temperature_bed - BED_HYSTERESIS)
|
2011-12-22 10:45:52 +00:00
|
|
|
{
|
2012-12-09 22:00:06 +00:00
|
|
|
soft_pwm_bed = MAX_BED_POWER>>1;
|
2011-12-22 10:45:52 +00:00
|
|
|
}
|
2011-11-20 12:14:58 +00:00
|
|
|
}
|
2012-12-09 22:00:06 +00:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
soft_pwm_bed = 0;
|
2011-12-22 10:45:52 +00:00
|
|
|
WRITE(HEATER_BED_PIN,LOW);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
2014-08-07 00:30:57 +00:00
|
|
|
|
|
|
|
|
//code for controlling the extruder rate based on the width sensor
|
|
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
|
|
if(filament_sensor)
|
|
|
|
|
{
|
|
|
|
|
meas_shift_index=delay_index1-meas_delay_cm;
|
|
|
|
|
if(meas_shift_index<0)
|
|
|
|
|
meas_shift_index = meas_shift_index + (MAX_MEASUREMENT_DELAY+1); //loop around buffer if needed
|
|
|
|
|
|
|
|
|
|
//get the delayed info and add 100 to reconstitute to a percent of the nominal filament diameter
|
|
|
|
|
//then square it to get an area
|
2014-08-16 11:50:13 +00:00
|
|
|
|
|
|
|
|
if(meas_shift_index<0)
|
|
|
|
|
meas_shift_index=0;
|
|
|
|
|
else if (meas_shift_index>MAX_MEASUREMENT_DELAY)
|
|
|
|
|
meas_shift_index=MAX_MEASUREMENT_DELAY;
|
|
|
|
|
|
|
|
|
|
volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM] = pow((float)(100+measurement_delay[meas_shift_index])/100.0,2);
|
|
|
|
|
if (volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM] <0.01)
|
|
|
|
|
volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]=0.01;
|
2014-08-07 00:30:57 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define PGM_RD_W(x) (short)pgm_read_word(&x)
|
|
|
|
|
// Derived from RepRap FiveD extruder::getTemperature()
|
|
|
|
|
// For hot end temperature measurement.
|
2012-12-09 22:00:06 +00:00
|
|
|
static float analog2temp(int raw, uint8_t e) {
|
2013-06-06 22:49:25 +00:00
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
if(e > EXTRUDERS)
|
|
|
|
|
#else
|
2011-12-06 04:33:33 +00:00
|
|
|
if(e >= EXTRUDERS)
|
2013-06-06 22:49:25 +00:00
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
{
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERROR((int)e);
|
|
|
|
|
SERIAL_ERRORLNPGM(" - Invalid extruder number !");
|
|
|
|
|
kill();
|
2014-05-15 20:09:50 +00:00
|
|
|
return 0.0;
|
2012-02-05 12:05:07 +00:00
|
|
|
}
|
|
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
|
|
|
|
if (e == 0)
|
|
|
|
|
{
|
|
|
|
|
return 0.25 * raw;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-12-03 11:13:20 +00:00
|
|
|
if(heater_ttbl_map[e] != NULL)
|
2011-12-06 04:33:33 +00:00
|
|
|
{
|
2011-11-15 21:50:43 +00:00
|
|
|
float celsius = 0;
|
2012-12-11 13:53:53 +00:00
|
|
|
uint8_t i;
|
2011-12-06 04:33:33 +00:00
|
|
|
short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
|
|
|
|
|
|
|
|
|
|
for (i=1; i<heater_ttbllen_map[e]; i++)
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2011-12-06 04:33:33 +00:00
|
|
|
if (PGM_RD_W((*tt)[i][0]) > raw)
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2011-12-06 04:33:33 +00:00
|
|
|
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]));
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Overflow: Set to last value in the table
|
2011-12-06 04:33:33 +00:00
|
|
|
if (i == heater_ttbllen_map[e]) celsius = PGM_RD_W((*tt)[i-1][1]);
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
return celsius;
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
2012-02-16 10:03:41 +00:00
|
|
|
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Derived from RepRap FiveD extruder::getTemperature()
|
|
|
|
|
// For bed temperature measurement.
|
2012-12-09 22:00:06 +00:00
|
|
|
static float analog2tempBed(int raw) {
|
2011-11-15 21:50:43 +00:00
|
|
|
#ifdef BED_USES_THERMISTOR
|
2012-03-03 01:15:21 +00:00
|
|
|
float celsius = 0;
|
2011-11-15 21:50:43 +00:00
|
|
|
byte i;
|
|
|
|
|
|
2012-12-11 13:53:53 +00:00
|
|
|
for (i=1; i<BEDTEMPTABLE_LEN; i++)
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2012-12-11 13:53:53 +00:00
|
|
|
if (PGM_RD_W(BEDTEMPTABLE[i][0]) > raw)
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2012-12-11 13:53:53 +00:00
|
|
|
celsius = PGM_RD_W(BEDTEMPTABLE[i-1][1]) +
|
|
|
|
|
(raw - PGM_RD_W(BEDTEMPTABLE[i-1][0])) *
|
|
|
|
|
(float)(PGM_RD_W(BEDTEMPTABLE[i][1]) - PGM_RD_W(BEDTEMPTABLE[i-1][1])) /
|
|
|
|
|
(float)(PGM_RD_W(BEDTEMPTABLE[i][0]) - PGM_RD_W(BEDTEMPTABLE[i-1][0]));
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Overflow: Set to last value in the table
|
2012-12-11 13:53:53 +00:00
|
|
|
if (i == BEDTEMPTABLE_LEN) celsius = PGM_RD_W(BEDTEMPTABLE[i-1][1]);
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
return celsius;
|
|
|
|
|
#elif defined BED_USES_AD595
|
2012-02-16 10:03:41 +00:00
|
|
|
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET;
|
2011-12-04 11:40:18 +00:00
|
|
|
#else
|
2012-03-03 01:15:21 +00:00
|
|
|
return 0;
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
/* 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()
|
|
|
|
|
{
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
|
|
|
|
current_temperature_raw[0] = read_max6675();
|
|
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
for(uint8_t e=0;e<EXTRUDERS;e++)
|
|
|
|
|
{
|
|
|
|
|
current_temperature[e] = analog2temp(current_temperature_raw[e], e);
|
|
|
|
|
}
|
|
|
|
|
current_temperature_bed = analog2tempBed(current_temperature_bed_raw);
|
2013-06-06 22:49:25 +00:00
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
redundant_temperature = analog2temp(redundant_temperature_raw, 1);
|
|
|
|
|
#endif
|
2014-12-20 16:33:43 +00:00
|
|
|
#if defined (FILAMENT_SENSOR) && (FILWIDTH_PIN > -1) //check if a sensor is supported
|
2014-08-16 11:50:13 +00:00
|
|
|
filament_width_meas = analog2widthFil();
|
|
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
//Reset the watchdog after we know we have a temperature measurement.
|
|
|
|
|
watchdog_reset();
|
|
|
|
|
|
|
|
|
|
CRITICAL_SECTION_START;
|
|
|
|
|
temp_meas_ready = false;
|
|
|
|
|
CRITICAL_SECTION_END;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-07 00:30:57 +00:00
|
|
|
|
|
|
|
|
// For converting raw Filament Width to milimeters
|
|
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
|
|
float analog2widthFil() {
|
|
|
|
|
return current_raw_filwidth/16383.0*5.0;
|
|
|
|
|
//return current_raw_filwidth;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-16 11:50:13 +00:00
|
|
|
// For converting raw Filament Width to a ratio
|
2014-08-07 00:30:57 +00:00
|
|
|
int widthFil_to_size_ratio() {
|
|
|
|
|
|
|
|
|
|
float temp;
|
2014-08-16 11:50:13 +00:00
|
|
|
|
2014-08-07 00:30:57 +00:00
|
|
|
temp=filament_width_meas;
|
|
|
|
|
if(filament_width_meas<MEASURED_LOWER_LIMIT)
|
|
|
|
|
temp=filament_width_nominal; //assume sensor cut out
|
|
|
|
|
else if (filament_width_meas>MEASURED_UPPER_LIMIT)
|
|
|
|
|
temp= MEASURED_UPPER_LIMIT;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return(filament_width_nominal/temp*100);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
void tp_init()
|
|
|
|
|
{
|
2014-12-18 20:02:36 +00:00
|
|
|
#if MB(RUMBA) && ((TEMP_SENSOR_0==-1)||(TEMP_SENSOR_1==-1)||(TEMP_SENSOR_2==-1)||(TEMP_SENSOR_BED==-1))
|
2013-06-06 22:49:25 +00:00
|
|
|
//disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
|
|
|
|
|
MCUCR=(1<<JTD);
|
|
|
|
|
MCUCR=(1<<JTD);
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-12-06 04:33:33 +00:00
|
|
|
// Finish init of mult extruder arrays
|
|
|
|
|
for(int e = 0; e < EXTRUDERS; e++) {
|
|
|
|
|
// populate with the first value
|
|
|
|
|
maxttemp[e] = maxttemp[0];
|
|
|
|
|
#ifdef PIDTEMP
|
|
|
|
|
temp_iState_min[e] = 0.0;
|
2015-01-11 02:50:17 +00:00
|
|
|
temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / PID_PARAM(Ki,e);
|
2012-09-18 00:18:09 +00:00
|
|
|
#endif //PIDTEMP
|
|
|
|
|
#ifdef PIDTEMPBED
|
2012-09-13 02:01:31 +00:00
|
|
|
temp_iState_min_bed = 0.0;
|
|
|
|
|
temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
|
2012-09-18 00:18:09 +00:00
|
|
|
#endif //PIDTEMPBED
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
|
|
|
|
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_0_PIN) && (HEATER_0_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
SET_OUTPUT(HEATER_0_PIN);
|
2015-01-23 22:13:06 +00:00
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_1_PIN) && (HEATER_1_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
SET_OUTPUT(HEATER_1_PIN);
|
2015-01-23 18:37:39 +00:00
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_2_PIN) && (HEATER_2_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
SET_OUTPUT(HEATER_2_PIN);
|
2015-01-23 22:13:06 +00:00
|
|
|
#endif
|
|
|
|
|
#if defined(HEATER_3_PIN) && (HEATER_3_PIN > -1)
|
|
|
|
|
SET_OUTPUT(HEATER_3_PIN);
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1)
|
2011-12-06 04:33:33 +00:00
|
|
|
SET_OUTPUT(HEATER_BED_PIN);
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(FAN_PIN) && (FAN_PIN > -1)
|
2011-12-06 04:33:33 +00:00
|
|
|
SET_OUTPUT(FAN_PIN);
|
2012-05-02 17:26:14 +00:00
|
|
|
#ifdef FAST_PWM_FAN
|
|
|
|
|
setPwmFrequency(FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
|
|
|
|
|
#endif
|
2012-12-16 00:36:57 +00:00
|
|
|
#ifdef FAN_SOFT_PWM
|
2013-06-09 10:52:49 +00:00
|
|
|
soft_pwm_fan = fanSpeedSoftPwm / 2;
|
|
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2012-02-05 12:05:07 +00:00
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
2015-01-23 18:37:39 +00:00
|
|
|
|
2012-02-05 12:05:07 +00:00
|
|
|
#ifndef SDSUPPORT
|
2014-07-05 05:17:17 +00:00
|
|
|
SET_OUTPUT(SCK_PIN);
|
|
|
|
|
WRITE(SCK_PIN,0);
|
2012-02-05 12:05:07 +00:00
|
|
|
|
2014-07-05 05:17:17 +00:00
|
|
|
SET_OUTPUT(MOSI_PIN);
|
|
|
|
|
WRITE(MOSI_PIN,1);
|
2012-02-05 12:05:07 +00:00
|
|
|
|
2014-07-05 05:17:17 +00:00
|
|
|
SET_INPUT(MISO_PIN);
|
|
|
|
|
WRITE(MISO_PIN,1);
|
2015-01-23 18:37:39 +00:00
|
|
|
#else
|
|
|
|
|
pinMode(SS_PIN, OUTPUT);
|
|
|
|
|
digitalWrite(SS_PIN, HIGH);
|
2012-02-05 12:05:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
2015-01-23 18:37:39 +00:00
|
|
|
SET_OUTPUT(MAX6675_SS);
|
|
|
|
|
WRITE(MAX6675_SS,1);
|
|
|
|
|
|
|
|
|
|
#endif //HEATER_0_USES_MAX6675
|
2012-02-05 12:05:07 +00:00
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
// Set analog inputs
|
|
|
|
|
ADCSRA = 1<<ADEN | 1<<ADSC | 1<<ADIF | 0x07;
|
2011-11-20 12:14:58 +00:00
|
|
|
DIDR0 = 0;
|
|
|
|
|
#ifdef DIDR2
|
|
|
|
|
DIDR2 = 0;
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_0_PIN) && (TEMP_0_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_0_PIN < 8
|
|
|
|
|
DIDR0 |= 1 << TEMP_0_PIN;
|
|
|
|
|
#else
|
|
|
|
|
DIDR2 |= 1<<(TEMP_0_PIN - 8);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_1_PIN) && (TEMP_1_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_1_PIN < 8
|
2015-01-23 22:13:06 +00:00
|
|
|
DIDR0 |= 1<<TEMP_1_PIN;
|
2011-11-20 12:14:58 +00:00
|
|
|
#else
|
2015-01-23 22:13:06 +00:00
|
|
|
DIDR2 |= 1<<(TEMP_1_PIN - 8);
|
2011-11-20 12:14:58 +00:00
|
|
|
#endif
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_2_PIN) && (TEMP_2_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_2_PIN < 8
|
2015-01-23 22:13:06 +00:00
|
|
|
DIDR0 |= 1 << TEMP_2_PIN;
|
|
|
|
|
#else
|
|
|
|
|
DIDR2 |= 1<<(TEMP_2_PIN - 8);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(TEMP_3_PIN) && (TEMP_3_PIN > -1)
|
|
|
|
|
#if TEMP_3_PIN < 8
|
|
|
|
|
DIDR0 |= 1 << TEMP_3_PIN;
|
2011-11-20 12:14:58 +00:00
|
|
|
#else
|
2015-01-23 22:13:06 +00:00
|
|
|
DIDR2 |= 1<<(TEMP_3_PIN - 8);
|
2011-11-20 12:14:58 +00:00
|
|
|
#endif
|
|
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_BED_PIN) && (TEMP_BED_PIN > -1)
|
2011-12-06 04:33:33 +00:00
|
|
|
#if TEMP_BED_PIN < 8
|
|
|
|
|
DIDR0 |= 1<<TEMP_BED_PIN;
|
|
|
|
|
#else
|
|
|
|
|
DIDR2 |= 1<<(TEMP_BED_PIN - 8);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2014-08-07 00:30:57 +00:00
|
|
|
//Added for Filament Sensor
|
|
|
|
|
#ifdef FILAMENT_SENSOR
|
2015-01-23 22:13:06 +00:00
|
|
|
#if defined(FILWIDTH_PIN) && (FILWIDTH_PIN > -1)
|
|
|
|
|
#if FILWIDTH_PIN < 8
|
|
|
|
|
DIDR0 |= 1<<FILWIDTH_PIN;
|
|
|
|
|
#else
|
|
|
|
|
DIDR2 |= 1<<(FILWIDTH_PIN - 8);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
2014-08-07 00:30:57 +00:00
|
|
|
#endif
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
// Use timer0 for temperature measurement
|
|
|
|
|
// Interleave temperature interrupt with millies interrupt
|
|
|
|
|
OCR0B = 128;
|
|
|
|
|
TIMSK0 |= (1<<OCIE0B);
|
2011-11-19 11:19:53 +00:00
|
|
|
|
|
|
|
|
// Wait for temperature measurement to settle
|
2011-12-06 04:33:33 +00:00
|
|
|
delay(250);
|
2011-11-19 11:19:53 +00:00
|
|
|
|
|
|
|
|
#ifdef HEATER_0_MINTEMP
|
2012-12-09 22:00:06 +00:00
|
|
|
minttemp[0] = HEATER_0_MINTEMP;
|
|
|
|
|
while(analog2temp(minttemp_raw[0], 0) < HEATER_0_MINTEMP) {
|
|
|
|
|
#if HEATER_0_RAW_LO_TEMP < HEATER_0_RAW_HI_TEMP
|
|
|
|
|
minttemp_raw[0] += OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
minttemp_raw[0] -= OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-11-19 11:19:53 +00:00
|
|
|
#endif //MINTEMP
|
|
|
|
|
#ifdef HEATER_0_MAXTEMP
|
2012-12-09 22:00:06 +00:00
|
|
|
maxttemp[0] = HEATER_0_MAXTEMP;
|
|
|
|
|
while(analog2temp(maxttemp_raw[0], 0) > HEATER_0_MAXTEMP) {
|
|
|
|
|
#if HEATER_0_RAW_LO_TEMP < HEATER_0_RAW_HI_TEMP
|
|
|
|
|
maxttemp_raw[0] -= OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
maxttemp_raw[0] += OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-11-19 11:19:53 +00:00
|
|
|
#endif //MAXTEMP
|
|
|
|
|
|
2011-12-06 04:33:33 +00:00
|
|
|
#if (EXTRUDERS > 1) && defined(HEATER_1_MINTEMP)
|
2012-12-09 22:00:06 +00:00
|
|
|
minttemp[1] = HEATER_1_MINTEMP;
|
2013-06-06 22:49:25 +00:00
|
|
|
while(analog2temp(minttemp_raw[1], 1) < HEATER_1_MINTEMP) {
|
2012-12-09 22:00:06 +00:00
|
|
|
#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP
|
|
|
|
|
minttemp_raw[1] += OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
minttemp_raw[1] -= OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif // MINTEMP 1
|
|
|
|
|
#if (EXTRUDERS > 1) && defined(HEATER_1_MAXTEMP)
|
2012-12-09 22:00:06 +00:00
|
|
|
maxttemp[1] = HEATER_1_MAXTEMP;
|
|
|
|
|
while(analog2temp(maxttemp_raw[1], 1) > HEATER_1_MAXTEMP) {
|
|
|
|
|
#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP
|
|
|
|
|
maxttemp_raw[1] -= OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
maxttemp_raw[1] += OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif //MAXTEMP 1
|
|
|
|
|
|
|
|
|
|
#if (EXTRUDERS > 2) && defined(HEATER_2_MINTEMP)
|
2012-12-09 22:00:06 +00:00
|
|
|
minttemp[2] = HEATER_2_MINTEMP;
|
2013-06-06 22:49:25 +00:00
|
|
|
while(analog2temp(minttemp_raw[2], 2) < HEATER_2_MINTEMP) {
|
2012-12-09 22:00:06 +00:00
|
|
|
#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP
|
|
|
|
|
minttemp_raw[2] += OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
minttemp_raw[2] -= OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif //MINTEMP 2
|
|
|
|
|
#if (EXTRUDERS > 2) && defined(HEATER_2_MAXTEMP)
|
2012-12-09 22:00:06 +00:00
|
|
|
maxttemp[2] = HEATER_2_MAXTEMP;
|
|
|
|
|
while(analog2temp(maxttemp_raw[2], 2) > HEATER_2_MAXTEMP) {
|
|
|
|
|
#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP
|
|
|
|
|
maxttemp_raw[2] -= OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
maxttemp_raw[2] += OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif //MAXTEMP 2
|
2011-11-19 11:19:53 +00:00
|
|
|
|
2015-01-23 22:13:06 +00:00
|
|
|
#if (EXTRUDERS > 3) && defined(HEATER_3_MINTEMP)
|
|
|
|
|
minttemp[3] = HEATER_3_MINTEMP;
|
|
|
|
|
while(analog2temp(minttemp_raw[3], 3) < HEATER_3_MINTEMP) {
|
|
|
|
|
#if HEATER_3_RAW_LO_TEMP < HEATER_3_RAW_HI_TEMP
|
|
|
|
|
minttemp_raw[3] += OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
minttemp_raw[3] -= OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif //MINTEMP 3
|
|
|
|
|
#if (EXTRUDERS > 3) && defined(HEATER_3_MAXTEMP)
|
|
|
|
|
maxttemp[3] = HEATER_3_MAXTEMP;
|
|
|
|
|
while(analog2temp(maxttemp_raw[3], 3) > HEATER_3_MAXTEMP) {
|
|
|
|
|
#if HEATER_3_RAW_LO_TEMP < HEATER_3_RAW_HI_TEMP
|
|
|
|
|
maxttemp_raw[3] -= OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
maxttemp_raw[3] += OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif // MAXTEMP 3
|
|
|
|
|
|
|
|
|
|
|
2011-11-19 11:19:53 +00:00
|
|
|
#ifdef BED_MINTEMP
|
2012-12-09 22:00:06 +00:00
|
|
|
/* No bed MINTEMP error implemented?!? */ /*
|
|
|
|
|
while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
|
|
|
|
|
#if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
|
|
|
|
|
bed_minttemp_raw += OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
bed_minttemp_raw -= OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
*/
|
2011-11-19 11:19:53 +00:00
|
|
|
#endif //BED_MINTEMP
|
|
|
|
|
#ifdef BED_MAXTEMP
|
2012-12-09 22:00:06 +00:00
|
|
|
while(analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
|
|
|
|
|
#if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
|
|
|
|
|
bed_maxttemp_raw -= OVERSAMPLENR;
|
|
|
|
|
#else
|
|
|
|
|
bed_maxttemp_raw += OVERSAMPLENR;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-11-19 11:19:53 +00:00
|
|
|
#endif //BED_MAXTEMP
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void setWatch()
|
|
|
|
|
{
|
2012-12-06 09:36:07 +00:00
|
|
|
#ifdef WATCH_TEMP_PERIOD
|
2011-12-06 04:33:33 +00:00
|
|
|
for (int e = 0; e < EXTRUDERS; e++)
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2012-12-06 09:36:07 +00:00
|
|
|
if(degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE * 2))
|
2011-12-06 04:33:33 +00:00
|
|
|
{
|
2012-12-06 09:36:07 +00:00
|
|
|
watch_start_temp[e] = degHotend(e);
|
|
|
|
|
watchmillis[e] = millis();
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-20 16:33:43 +00:00
|
|
|
#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0
|
2014-06-30 18:22:37 +00:00
|
|
|
void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
|
|
|
|
|
SERIAL_ECHO(heater_id);
|
|
|
|
|
SERIAL_ECHO(" ; State:");
|
|
|
|
|
SERIAL_ECHO(*state);
|
|
|
|
|
SERIAL_ECHO(" ; Timer:");
|
|
|
|
|
SERIAL_ECHO(*timer);
|
|
|
|
|
SERIAL_ECHO(" ; Temperature:");
|
|
|
|
|
SERIAL_ECHO(temperature);
|
|
|
|
|
SERIAL_ECHO(" ; Target Temp:");
|
|
|
|
|
SERIAL_ECHO(target_temperature);
|
|
|
|
|
SERIAL_ECHOLN("");
|
|
|
|
|
*/
|
|
|
|
|
if ((target_temperature == 0) || thermal_runaway)
|
|
|
|
|
{
|
|
|
|
|
*state = 0;
|
|
|
|
|
*timer = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
switch (*state)
|
|
|
|
|
{
|
|
|
|
|
case 0: // "Heater Inactive" state
|
|
|
|
|
if (target_temperature > 0) *state = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 1: // "First Heating" state
|
|
|
|
|
if (temperature >= target_temperature) *state = 2;
|
|
|
|
|
break;
|
|
|
|
|
case 2: // "Temperature Stable" state
|
|
|
|
|
if (temperature >= (target_temperature - hysteresis_degc))
|
|
|
|
|
{
|
|
|
|
|
*timer = millis();
|
|
|
|
|
}
|
2015-01-03 14:45:06 +00:00
|
|
|
else if ( (millis() - *timer) > ((unsigned long) period_seconds) * 1000)
|
2014-06-30 18:22:37 +00:00
|
|
|
{
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM("Thermal Runaway, system stopped! Heater_ID: ");
|
|
|
|
|
SERIAL_ERRORLN((int)heater_id);
|
|
|
|
|
LCD_ALERTMESSAGEPGM("THERMAL RUNAWAY");
|
|
|
|
|
thermal_runaway = true;
|
|
|
|
|
while(1)
|
|
|
|
|
{
|
|
|
|
|
disable_heater();
|
|
|
|
|
disable_x();
|
|
|
|
|
disable_y();
|
|
|
|
|
disable_z();
|
|
|
|
|
disable_e0();
|
|
|
|
|
disable_e1();
|
|
|
|
|
disable_e2();
|
2015-01-23 22:13:06 +00:00
|
|
|
disable_e3();
|
2014-06-30 18:22:37 +00:00
|
|
|
manage_heater();
|
|
|
|
|
lcd_update();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
void disable_heater()
|
|
|
|
|
{
|
2011-12-22 10:45:52 +00:00
|
|
|
for(int i=0;i<EXTRUDERS;i++)
|
|
|
|
|
setTargetHotend(0,i);
|
|
|
|
|
setTargetBed(0);
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_0_PIN) && TEMP_0_PIN > -1
|
2012-12-09 22:00:06 +00:00
|
|
|
target_temperature[0]=0;
|
2011-12-12 18:34:37 +00:00
|
|
|
soft_pwm[0]=0;
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
|
2012-04-15 17:17:33 +00:00
|
|
|
WRITE(HEATER_0_PIN,LOW);
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
Fixed error found by the free coverity tool (https://scan.coverity.com/)
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
2014-05-14 19:59:48 +00:00
|
|
|
#if defined(TEMP_1_PIN) && TEMP_1_PIN > -1 && EXTRUDERS > 1
|
2012-12-09 22:00:06 +00:00
|
|
|
target_temperature[1]=0;
|
2011-12-12 18:34:37 +00:00
|
|
|
soft_pwm[1]=0;
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
|
2012-04-15 17:17:33 +00:00
|
|
|
WRITE(HEATER_1_PIN,LOW);
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
Fixed error found by the free coverity tool (https://scan.coverity.com/)
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
2014-05-14 19:59:48 +00:00
|
|
|
#if defined(TEMP_2_PIN) && TEMP_2_PIN > -1 && EXTRUDERS > 2
|
2012-12-09 22:00:06 +00:00
|
|
|
target_temperature[2]=0;
|
2011-12-12 18:34:37 +00:00
|
|
|
soft_pwm[2]=0;
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_2_PIN) && HEATER_2_PIN > -1
|
2012-04-15 17:17:33 +00:00
|
|
|
WRITE(HEATER_2_PIN,LOW);
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if defined(TEMP_3_PIN) && TEMP_3_PIN > -1 && EXTRUDERS > 3
|
|
|
|
|
target_temperature[3]=0;
|
|
|
|
|
soft_pwm[3]=0;
|
|
|
|
|
#if defined(HEATER_3_PIN) && HEATER_3_PIN > -1
|
|
|
|
|
WRITE(HEATER_3_PIN,LOW);
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
|
2015-01-23 22:13:06 +00:00
|
|
|
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
|
2012-12-09 22:00:06 +00:00
|
|
|
target_temperature_bed=0;
|
2012-09-13 02:01:31 +00:00
|
|
|
soft_pwm_bed=0;
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
2012-04-15 17:17:33 +00:00
|
|
|
WRITE(HEATER_BED_PIN,LOW);
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
|
|
|
|
#endif
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
|
2011-12-12 18:34:37 +00:00
|
|
|
void max_temp_error(uint8_t e) {
|
2012-04-15 17:17:33 +00:00
|
|
|
disable_heater();
|
2012-03-25 12:36:51 +00:00
|
|
|
if(IsStopped() == false) {
|
|
|
|
|
SERIAL_ERROR_START;
|
2012-04-22 18:04:39 +00:00
|
|
|
SERIAL_ERRORLN((int)e);
|
2012-03-25 12:36:51 +00:00
|
|
|
SERIAL_ERRORLNPGM(": Extruder switched off. MAXTEMP triggered !");
|
2012-12-10 09:48:46 +00:00
|
|
|
LCD_ALERTMESSAGEPGM("Err: MAXTEMP");
|
2012-03-25 12:36:51 +00:00
|
|
|
}
|
2012-12-05 18:54:01 +00:00
|
|
|
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
|
|
|
|
Stop();
|
|
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void min_temp_error(uint8_t e) {
|
2012-04-15 17:17:33 +00:00
|
|
|
disable_heater();
|
2012-03-25 12:36:51 +00:00
|
|
|
if(IsStopped() == false) {
|
|
|
|
|
SERIAL_ERROR_START;
|
2012-04-22 18:04:39 +00:00
|
|
|
SERIAL_ERRORLN((int)e);
|
2012-03-25 12:36:51 +00:00
|
|
|
SERIAL_ERRORLNPGM(": Extruder switched off. MINTEMP triggered !");
|
2012-12-10 09:48:46 +00:00
|
|
|
LCD_ALERTMESSAGEPGM("Err: MINTEMP");
|
2012-03-25 12:36:51 +00:00
|
|
|
}
|
2012-12-05 18:54:01 +00:00
|
|
|
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
|
|
|
|
Stop();
|
|
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void bed_max_temp_error(void) {
|
2012-04-26 02:22:38 +00:00
|
|
|
#if HEATER_BED_PIN > -1
|
2012-04-15 17:17:33 +00:00
|
|
|
WRITE(HEATER_BED_PIN, 0);
|
2012-04-26 02:22:38 +00:00
|
|
|
#endif
|
2012-03-25 12:36:51 +00:00
|
|
|
if(IsStopped() == false) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM("Temperature heated bed switched off. MAXTEMP triggered !!");
|
2012-12-10 09:48:46 +00:00
|
|
|
LCD_ALERTMESSAGEPGM("Err: MAXTEMP BED");
|
2012-03-25 12:36:51 +00:00
|
|
|
}
|
2012-12-05 18:54:01 +00:00
|
|
|
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
|
|
|
|
Stop();
|
|
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
}
|
|
|
|
|
|
2012-02-05 12:05:07 +00:00
|
|
|
#ifdef HEATER_0_USES_MAX6675
|
2012-12-05 18:54:01 +00:00
|
|
|
#define MAX6675_HEAT_INTERVAL 250
|
2014-07-05 05:17:17 +00:00
|
|
|
long max6675_previous_millis = MAX6675_HEAT_INTERVAL;
|
2012-02-05 12:05:07 +00:00
|
|
|
int max6675_temp = 2000;
|
|
|
|
|
|
2015-01-23 18:37:39 +00:00
|
|
|
static int read_max6675()
|
2012-02-05 12:05:07 +00:00
|
|
|
{
|
2012-12-05 18:54:01 +00:00
|
|
|
if (millis() - max6675_previous_millis < MAX6675_HEAT_INTERVAL)
|
2012-02-05 12:05:07 +00:00
|
|
|
return max6675_temp;
|
|
|
|
|
|
|
|
|
|
max6675_previous_millis = millis();
|
|
|
|
|
max6675_temp = 0;
|
|
|
|
|
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifdef PRR
|
2012-02-05 12:05:07 +00:00
|
|
|
PRR &= ~(1<<PRSPI);
|
2015-01-23 18:37:39 +00:00
|
|
|
#elif defined(PRR0)
|
2012-02-05 12:05:07 +00:00
|
|
|
PRR0 &= ~(1<<PRSPI);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
SPCR = (1<<MSTR) | (1<<SPE) | (1<<SPR0);
|
|
|
|
|
|
|
|
|
|
// enable TT_MAX6675
|
|
|
|
|
WRITE(MAX6675_SS, 0);
|
|
|
|
|
|
|
|
|
|
// ensure 100ns delay - a bit extra is fine
|
2012-12-17 10:12:11 +00:00
|
|
|
asm("nop");//50ns on 20Mhz, 62.5ns on 16Mhz
|
|
|
|
|
asm("nop");//50ns on 20Mhz, 62.5ns on 16Mhz
|
2012-02-05 12:05:07 +00:00
|
|
|
|
|
|
|
|
// 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);
|
|
|
|
|
|
2015-01-23 18:37:39 +00:00
|
|
|
if (max6675_temp & 4)
|
2012-02-05 12:05:07 +00:00
|
|
|
{
|
|
|
|
|
// thermocouple open
|
2015-01-23 18:37:39 +00:00
|
|
|
max6675_temp = 4000;
|
2012-02-05 12:05:07 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
max6675_temp = max6675_temp >> 3;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return max6675_temp;
|
|
|
|
|
}
|
2015-01-23 18:37:39 +00:00
|
|
|
|
|
|
|
|
#endif //HEATER_0_USES_MAX6675
|
2012-02-05 12:05:07 +00:00
|
|
|
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
// Timer 0 is shared with millies
|
|
|
|
|
ISR(TIMER0_COMPB_vect)
|
|
|
|
|
{
|
2013-05-02 16:22:58 +00:00
|
|
|
//these variables are only accesible from the ISR, but static, so they don't lose their value
|
2011-11-15 21:50:43 +00:00
|
|
|
static unsigned char temp_count = 0;
|
|
|
|
|
static unsigned long raw_temp_0_value = 0;
|
|
|
|
|
static unsigned long raw_temp_1_value = 0;
|
|
|
|
|
static unsigned long raw_temp_2_value = 0;
|
2015-01-23 22:13:06 +00:00
|
|
|
static unsigned long raw_temp_3_value = 0;
|
2011-12-06 04:33:33 +00:00
|
|
|
static unsigned long raw_temp_bed_value = 0;
|
2015-01-23 22:13:06 +00:00
|
|
|
static unsigned char temp_state = 12;
|
2013-06-09 10:52:49 +00:00
|
|
|
static unsigned char pwm_count = (1 << SOFT_PWM_SCALE);
|
2011-12-12 18:34:37 +00:00
|
|
|
static unsigned char soft_pwm_0;
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifdef SLOW_PWM_HEATERS
|
|
|
|
|
static unsigned char slow_pwm_count = 0;
|
|
|
|
|
static unsigned char state_heater_0 = 0;
|
|
|
|
|
static unsigned char state_timer_heater_0 = 0;
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if (EXTRUDERS > 1) || defined(HEATERS_PARALLEL)
|
2011-12-12 18:34:37 +00:00
|
|
|
static unsigned char soft_pwm_1;
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifdef SLOW_PWM_HEATERS
|
|
|
|
|
static unsigned char state_heater_1 = 0;
|
|
|
|
|
static unsigned char state_timer_heater_1 = 0;
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#if EXTRUDERS > 2
|
2011-12-12 18:34:37 +00:00
|
|
|
static unsigned char soft_pwm_2;
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifdef SLOW_PWM_HEATERS
|
|
|
|
|
static unsigned char state_heater_2 = 0;
|
|
|
|
|
static unsigned char state_timer_heater_2 = 0;
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
static unsigned char soft_pwm_3;
|
|
|
|
|
#ifdef SLOW_PWM_HEATERS
|
|
|
|
|
static unsigned char state_heater_3 = 0;
|
|
|
|
|
static unsigned char state_timer_heater_3 = 0;
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if HEATER_BED_PIN > -1
|
2012-09-13 02:01:31 +00:00
|
|
|
static unsigned char soft_pwm_b;
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifdef SLOW_PWM_HEATERS
|
|
|
|
|
static unsigned char state_heater_b = 0;
|
|
|
|
|
static unsigned char state_timer_heater_b = 0;
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if defined(FILWIDTH_PIN) &&(FILWIDTH_PIN > -1)
|
|
|
|
|
static unsigned long raw_filwidth_value = 0; //added for filament width sensor
|
|
|
|
|
#endif
|
2014-08-07 00:30:57 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifndef SLOW_PWM_HEATERS
|
|
|
|
|
/*
|
|
|
|
|
* standard PWM modulation
|
|
|
|
|
*/
|
2011-12-12 18:34:37 +00:00
|
|
|
if(pwm_count == 0){
|
|
|
|
|
soft_pwm_0 = soft_pwm[0];
|
2013-11-17 12:29:02 +00:00
|
|
|
if(soft_pwm_0 > 0) {
|
|
|
|
|
WRITE(HEATER_0_PIN,1);
|
2015-01-06 17:32:17 +00:00
|
|
|
#ifdef HEATERS_PARALLEL
|
2013-11-17 12:29:02 +00:00
|
|
|
WRITE(HEATER_1_PIN,1);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
2013-11-27 20:13:38 +00:00
|
|
|
} else WRITE(HEATER_0_PIN,0);
|
2015-01-23 22:13:06 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if EXTRUDERS > 1
|
2011-12-12 18:34:37 +00:00
|
|
|
soft_pwm_1 = soft_pwm[1];
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_1 > 0) WRITE(HEATER_1_PIN,1); else WRITE(HEATER_1_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
|
|
|
|
#if EXTRUDERS > 2
|
2011-12-12 18:34:37 +00:00
|
|
|
soft_pwm_2 = soft_pwm[2];
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_2 > 0) WRITE(HEATER_2_PIN,1); else WRITE(HEATER_2_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
soft_pwm_3 = soft_pwm[3];
|
|
|
|
|
if(soft_pwm_3 > 0) WRITE(HEATER_3_PIN,1); else WRITE(HEATER_3_PIN,0);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
2012-09-13 02:01:31 +00:00
|
|
|
soft_pwm_b = soft_pwm_bed;
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
|
|
|
|
#ifdef FAN_SOFT_PWM
|
2013-06-09 10:52:49 +00:00
|
|
|
soft_pwm_fan = fanSpeedSoftPwm / 2;
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_fan > 0) WRITE(FAN_PIN,1); else WRITE(FAN_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
}
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_0 < pwm_count) {
|
2015-01-06 17:32:17 +00:00
|
|
|
WRITE(HEATER_0_PIN,0);
|
|
|
|
|
#ifdef HEATERS_PARALLEL
|
|
|
|
|
WRITE(HEATER_1_PIN,0);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2015-01-23 22:13:06 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if EXTRUDERS > 1
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_1 < pwm_count) WRITE(HEATER_1_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
|
|
|
|
#if EXTRUDERS > 2
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_2 < pwm_count) WRITE(HEATER_2_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
if(soft_pwm_3 < pwm_count) WRITE(HEATER_3_PIN,0);
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_b < pwm_count) WRITE(HEATER_BED_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
|
|
|
|
#ifdef FAN_SOFT_PWM
|
2013-11-27 20:13:38 +00:00
|
|
|
if(soft_pwm_fan < pwm_count) WRITE(FAN_PIN,0);
|
2015-01-06 17:32:17 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
pwm_count += (1 << SOFT_PWM_SCALE);
|
|
|
|
|
pwm_count &= 0x7f;
|
|
|
|
|
|
|
|
|
|
#else //ifndef SLOW_PWM_HEATERS
|
|
|
|
|
/*
|
|
|
|
|
* SLOW PWM HEATERS
|
|
|
|
|
*
|
|
|
|
|
* for heaters drived by relay
|
|
|
|
|
*/
|
|
|
|
|
#ifndef MIN_STATE_TIME
|
|
|
|
|
#define MIN_STATE_TIME 16 // MIN_STATE_TIME * 65.5 = time in milliseconds
|
|
|
|
|
#endif
|
|
|
|
|
if (slow_pwm_count == 0) {
|
|
|
|
|
// EXTRUDER 0
|
|
|
|
|
soft_pwm_0 = soft_pwm[0];
|
|
|
|
|
if (soft_pwm_0 > 0) {
|
|
|
|
|
// turn ON heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_0 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_0 == 0) {
|
|
|
|
|
state_timer_heater_0 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_0 = 1;
|
|
|
|
|
WRITE(HEATER_0_PIN, 1);
|
|
|
|
|
#ifdef HEATERS_PARALLEL
|
|
|
|
|
WRITE(HEATER_1_PIN, 1);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_0 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_0 == 1) {
|
|
|
|
|
state_timer_heater_0 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_0 = 0;
|
|
|
|
|
WRITE(HEATER_0_PIN, 0);
|
|
|
|
|
#ifdef HEATERS_PARALLEL
|
|
|
|
|
WRITE(HEATER_1_PIN, 0);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
// EXTRUDER 1
|
|
|
|
|
soft_pwm_1 = soft_pwm[1];
|
|
|
|
|
if (soft_pwm_1 > 0) {
|
|
|
|
|
// turn ON heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_1 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_1 == 0) {
|
|
|
|
|
state_timer_heater_1 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_1 = 1;
|
|
|
|
|
WRITE(HEATER_1_PIN, 1);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_1 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_1 == 1) {
|
|
|
|
|
state_timer_heater_1 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_1 = 0;
|
|
|
|
|
WRITE(HEATER_1_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
// EXTRUDER 2
|
|
|
|
|
soft_pwm_2 = soft_pwm[2];
|
|
|
|
|
if (soft_pwm_2 > 0) {
|
|
|
|
|
// turn ON heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_2 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_2 == 0) {
|
|
|
|
|
state_timer_heater_2 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_2 = 1;
|
|
|
|
|
WRITE(HEATER_2_PIN, 1);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_2 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_2 == 1) {
|
|
|
|
|
state_timer_heater_2 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_2 = 0;
|
|
|
|
|
WRITE(HEATER_2_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
// EXTRUDER 3
|
|
|
|
|
soft_pwm_3 = soft_pwm[3];
|
|
|
|
|
if (soft_pwm_3 > 0) {
|
|
|
|
|
// turn ON heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_3 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_3 == 0) {
|
|
|
|
|
state_timer_heater_3 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_3 = 1;
|
|
|
|
|
WRITE(HEATER_3_PIN, 1);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_3 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_3 == 1) {
|
|
|
|
|
state_timer_heater_3 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_3 = 0;
|
|
|
|
|
WRITE(HEATER_3_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
|
|
|
|
// BED
|
|
|
|
|
soft_pwm_b = soft_pwm_bed;
|
|
|
|
|
if (soft_pwm_b > 0) {
|
|
|
|
|
// turn ON heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_b == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_b == 0) {
|
|
|
|
|
state_timer_heater_b = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_b = 1;
|
|
|
|
|
WRITE(HEATER_BED_PIN, 1);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_b == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_b == 1) {
|
|
|
|
|
state_timer_heater_b = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_b = 0;
|
|
|
|
|
WRITE(HEATER_BED_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
} // if (slow_pwm_count == 0)
|
|
|
|
|
|
|
|
|
|
// EXTRUDER 0
|
|
|
|
|
if (soft_pwm_0 < slow_pwm_count) {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_0 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_0 == 1) {
|
|
|
|
|
state_timer_heater_0 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_0 = 0;
|
|
|
|
|
WRITE(HEATER_0_PIN, 0);
|
|
|
|
|
#ifdef HEATERS_PARALLEL
|
|
|
|
|
WRITE(HEATER_1_PIN, 0);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
// EXTRUDER 1
|
|
|
|
|
if (soft_pwm_1 < slow_pwm_count) {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_1 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_1 == 1) {
|
|
|
|
|
state_timer_heater_1 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_1 = 0;
|
|
|
|
|
WRITE(HEATER_1_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
// EXTRUDER 2
|
|
|
|
|
if (soft_pwm_2 < slow_pwm_count) {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_2 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_2 == 1) {
|
|
|
|
|
state_timer_heater_2 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_2 = 0;
|
|
|
|
|
WRITE(HEATER_2_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
// EXTRUDER 3
|
|
|
|
|
if (soft_pwm_3 < slow_pwm_count) {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_3 == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_3 == 1) {
|
|
|
|
|
state_timer_heater_3 = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_3 = 0;
|
|
|
|
|
WRITE(HEATER_3_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-01-06 17:32:17 +00:00
|
|
|
|
|
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
|
|
|
|
// BED
|
|
|
|
|
if (soft_pwm_b < slow_pwm_count) {
|
|
|
|
|
// turn OFF heather only if the minimum time is up
|
|
|
|
|
if (state_timer_heater_b == 0) {
|
|
|
|
|
// if change state set timer
|
|
|
|
|
if (state_heater_b == 1) {
|
|
|
|
|
state_timer_heater_b = MIN_STATE_TIME;
|
|
|
|
|
}
|
|
|
|
|
state_heater_b = 0;
|
|
|
|
|
WRITE(HEATER_BED_PIN, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef FAN_SOFT_PWM
|
|
|
|
|
if (pwm_count == 0){
|
|
|
|
|
soft_pwm_fan = fanSpeedSoftPwm / 2;
|
|
|
|
|
if (soft_pwm_fan > 0) WRITE(FAN_PIN,1); else WRITE(FAN_PIN,0);
|
|
|
|
|
}
|
|
|
|
|
if (soft_pwm_fan < pwm_count) WRITE(FAN_PIN,0);
|
|
|
|
|
#endif
|
2011-12-12 18:34:37 +00:00
|
|
|
|
2013-06-09 10:52:49 +00:00
|
|
|
pwm_count += (1 << SOFT_PWM_SCALE);
|
2011-12-12 18:34:37 +00:00
|
|
|
pwm_count &= 0x7f;
|
2011-11-15 21:50:43 +00:00
|
|
|
|
2015-01-06 17:32:17 +00:00
|
|
|
// increment slow_pwm_count only every 64 pwm_count circa 65.5ms
|
|
|
|
|
if ((pwm_count % 64) == 0) {
|
|
|
|
|
slow_pwm_count++;
|
|
|
|
|
slow_pwm_count &= 0x7f;
|
|
|
|
|
|
|
|
|
|
// Extruder 0
|
|
|
|
|
if (state_timer_heater_0 > 0) {
|
|
|
|
|
state_timer_heater_0--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
// Extruder 1
|
|
|
|
|
if (state_timer_heater_1 > 0)
|
|
|
|
|
state_timer_heater_1--;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
// Extruder 2
|
|
|
|
|
if (state_timer_heater_2 > 0)
|
|
|
|
|
state_timer_heater_2--;
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
// Extruder 3
|
|
|
|
|
if (state_timer_heater_3 > 0)
|
|
|
|
|
state_timer_heater_3--;
|
|
|
|
|
#endif
|
2015-01-06 17:32:17 +00:00
|
|
|
|
|
|
|
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
|
|
|
|
// Bed
|
|
|
|
|
if (state_timer_heater_b > 0)
|
|
|
|
|
state_timer_heater_b--;
|
|
|
|
|
#endif
|
|
|
|
|
} //if ((pwm_count % 64) == 0) {
|
|
|
|
|
|
|
|
|
|
#endif //ifndef SLOW_PWM_HEATERS
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
switch(temp_state) {
|
|
|
|
|
case 0: // Prepare TEMP_0
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_0_PIN) && (TEMP_0_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_0_PIN > 7
|
2011-11-15 21:50:43 +00:00
|
|
|
ADCSRB = 1<<MUX5;
|
2011-11-28 16:42:49 +00:00
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (TEMP_0_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
2012-12-03 11:52:00 +00:00
|
|
|
lcd_buttons_update();
|
2011-11-15 21:50:43 +00:00
|
|
|
temp_state = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 1: // Measure TEMP_0
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_0_PIN) && (TEMP_0_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
raw_temp_0_value += ADC;
|
|
|
|
|
#endif
|
|
|
|
|
temp_state = 2;
|
|
|
|
|
break;
|
2011-12-06 04:33:33 +00:00
|
|
|
case 2: // Prepare TEMP_BED
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_BED_PIN) && (TEMP_BED_PIN > -1)
|
2011-12-06 04:33:33 +00:00
|
|
|
#if TEMP_BED_PIN > 7
|
|
|
|
|
ADCSRB = 1<<MUX5;
|
2012-09-09 23:06:02 +00:00
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (TEMP_BED_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
2012-12-03 11:52:00 +00:00
|
|
|
lcd_buttons_update();
|
2011-12-06 04:33:33 +00:00
|
|
|
temp_state = 3;
|
|
|
|
|
break;
|
|
|
|
|
case 3: // Measure TEMP_BED
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_BED_PIN) && (TEMP_BED_PIN > -1)
|
2011-12-06 04:33:33 +00:00
|
|
|
raw_temp_bed_value += ADC;
|
|
|
|
|
#endif
|
|
|
|
|
temp_state = 4;
|
|
|
|
|
break;
|
|
|
|
|
case 4: // Prepare TEMP_1
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_1_PIN) && (TEMP_1_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_1_PIN > 7
|
2011-11-15 21:50:43 +00:00
|
|
|
ADCSRB = 1<<MUX5;
|
2011-11-28 16:42:49 +00:00
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (TEMP_1_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
2012-12-03 11:52:00 +00:00
|
|
|
lcd_buttons_update();
|
2011-12-06 04:33:33 +00:00
|
|
|
temp_state = 5;
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
2011-12-06 04:33:33 +00:00
|
|
|
case 5: // Measure TEMP_1
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_1_PIN) && (TEMP_1_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
raw_temp_1_value += ADC;
|
|
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
temp_state = 6;
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
2011-12-06 04:33:33 +00:00
|
|
|
case 6: // Prepare TEMP_2
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_2_PIN) && (TEMP_2_PIN > -1)
|
2011-11-20 12:14:58 +00:00
|
|
|
#if TEMP_2_PIN > 7
|
2011-11-15 21:50:43 +00:00
|
|
|
ADCSRB = 1<<MUX5;
|
2011-11-28 16:42:49 +00:00
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
2011-11-15 21:50:43 +00:00
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (TEMP_2_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
2012-12-03 11:52:00 +00:00
|
|
|
lcd_buttons_update();
|
2011-12-06 04:33:33 +00:00
|
|
|
temp_state = 7;
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
2011-12-06 04:33:33 +00:00
|
|
|
case 7: // Measure TEMP_2
|
2013-06-06 22:49:25 +00:00
|
|
|
#if defined(TEMP_2_PIN) && (TEMP_2_PIN > -1)
|
2011-11-15 21:50:43 +00:00
|
|
|
raw_temp_2_value += ADC;
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
temp_state = 8;
|
2011-11-15 21:50:43 +00:00
|
|
|
break;
|
2015-01-23 22:13:06 +00:00
|
|
|
case 8: // Prepare TEMP_3
|
|
|
|
|
#if defined(TEMP_3_PIN) && (TEMP_3_PIN > -1)
|
|
|
|
|
#if TEMP_3_PIN > 7
|
|
|
|
|
ADCSRB = 1<<MUX5;
|
|
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
|
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (TEMP_3_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
|
|
|
|
lcd_buttons_update();
|
|
|
|
|
temp_state = 9;
|
|
|
|
|
break;
|
|
|
|
|
case 9: // Measure TEMP_3
|
|
|
|
|
#if defined(TEMP_3_PIN) && (TEMP_3_PIN > -1)
|
|
|
|
|
raw_temp_3_value += ADC;
|
|
|
|
|
#endif
|
|
|
|
|
temp_state = 10; //change so that Filament Width is also measured
|
|
|
|
|
break;
|
|
|
|
|
case 10: //Prepare FILWIDTH
|
2014-08-07 00:30:57 +00:00
|
|
|
#if defined(FILWIDTH_PIN) && (FILWIDTH_PIN> -1)
|
|
|
|
|
#if FILWIDTH_PIN>7
|
|
|
|
|
ADCSRB = 1<<MUX5;
|
|
|
|
|
#else
|
|
|
|
|
ADCSRB = 0;
|
|
|
|
|
#endif
|
|
|
|
|
ADMUX = ((1 << REFS0) | (FILWIDTH_PIN & 0x07));
|
|
|
|
|
ADCSRA |= 1<<ADSC; // Start conversion
|
|
|
|
|
#endif
|
|
|
|
|
lcd_buttons_update();
|
2015-01-23 22:13:06 +00:00
|
|
|
temp_state = 11;
|
2014-08-07 00:30:57 +00:00
|
|
|
break;
|
2015-01-23 22:13:06 +00:00
|
|
|
case 11: //Measure FILWIDTH
|
2014-08-07 00:30:57 +00:00
|
|
|
#if defined(FILWIDTH_PIN) &&(FILWIDTH_PIN > -1)
|
|
|
|
|
//raw_filwidth_value += ADC; //remove to use an IIR filter approach
|
|
|
|
|
if(ADC>102) //check that ADC is reading a voltage > 0.5 volts, otherwise don't take in the data.
|
|
|
|
|
{
|
|
|
|
|
raw_filwidth_value= raw_filwidth_value-(raw_filwidth_value>>7); //multipliy raw_filwidth_value by 127/128
|
|
|
|
|
|
|
|
|
|
raw_filwidth_value= raw_filwidth_value + ((unsigned long)ADC<<7); //add new ADC reading
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
temp_state = 0;
|
|
|
|
|
|
|
|
|
|
temp_count++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
2015-01-23 22:13:06 +00:00
|
|
|
case 12: //Startup, delay initial temp reading a tiny bit so the hardware can settle.
|
2014-01-06 10:20:03 +00:00
|
|
|
temp_state = 0;
|
|
|
|
|
break;
|
2011-12-12 18:34:37 +00:00
|
|
|
// default:
|
|
|
|
|
// SERIAL_ERROR_START;
|
|
|
|
|
// SERIAL_ERRORLNPGM("Temp measurement error!");
|
|
|
|
|
// break;
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
|
|
|
|
|
2014-08-07 00:30:57 +00:00
|
|
|
if(temp_count >= OVERSAMPLENR) // 10 * 16 * 1/(16000000/64/256) = 164ms.
|
2011-11-15 21:50:43 +00:00
|
|
|
{
|
2012-12-09 22:00:06 +00:00
|
|
|
if (!temp_meas_ready) //Only update the raw values if they have been read. Else we could be updating them during reading.
|
|
|
|
|
{
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifndef HEATER_0_USES_MAX6675
|
2012-12-09 22:00:06 +00:00
|
|
|
current_temperature_raw[0] = raw_temp_0_value;
|
2015-01-23 18:37:39 +00:00
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
#if EXTRUDERS > 1
|
2012-12-10 09:48:46 +00:00
|
|
|
current_temperature_raw[1] = raw_temp_1_value;
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
2013-06-06 22:49:25 +00:00
|
|
|
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
|
|
|
|
|
redundant_temperature_raw = raw_temp_1_value;
|
|
|
|
|
#endif
|
2011-12-06 04:33:33 +00:00
|
|
|
#if EXTRUDERS > 2
|
2012-12-10 09:48:46 +00:00
|
|
|
current_temperature_raw[2] = raw_temp_2_value;
|
2015-01-23 22:13:06 +00:00
|
|
|
#endif
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
current_temperature_raw[3] = raw_temp_3_value;
|
2011-12-06 04:33:33 +00:00
|
|
|
#endif
|
2012-12-12 20:56:17 +00:00
|
|
|
current_temperature_bed_raw = raw_temp_bed_value;
|
2012-12-09 22:00:06 +00:00
|
|
|
}
|
2014-08-07 00:30:57 +00:00
|
|
|
|
|
|
|
|
//Add similar code for Filament Sensor - can be read any time since IIR filtering is used
|
|
|
|
|
#if defined(FILWIDTH_PIN) &&(FILWIDTH_PIN > -1)
|
|
|
|
|
current_raw_filwidth = raw_filwidth_value>>10; //need to divide to get to 0-16384 range since we used 1/128 IIR filter approach
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-11-15 21:50:43 +00:00
|
|
|
|
|
|
|
|
temp_meas_ready = true;
|
|
|
|
|
temp_count = 0;
|
|
|
|
|
raw_temp_0_value = 0;
|
|
|
|
|
raw_temp_1_value = 0;
|
|
|
|
|
raw_temp_2_value = 0;
|
2015-01-23 22:13:06 +00:00
|
|
|
raw_temp_3_value = 0;
|
2011-12-06 04:33:33 +00:00
|
|
|
raw_temp_bed_value = 0;
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
#if HEATER_0_RAW_LO_TEMP > HEATER_0_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[0] <= maxttemp_raw[0]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[0] >= maxttemp_raw[0]) {
|
|
|
|
|
#endif
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifndef HEATER_0_USES_MAX6675
|
2012-12-09 22:00:06 +00:00
|
|
|
max_temp_error(0);
|
2015-01-23 18:37:39 +00:00
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
}
|
|
|
|
|
#if HEATER_0_RAW_LO_TEMP > HEATER_0_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[0] >= minttemp_raw[0]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[0] <= minttemp_raw[0]) {
|
|
|
|
|
#endif
|
2015-01-23 18:37:39 +00:00
|
|
|
#ifndef HEATER_0_USES_MAX6675
|
2012-12-09 22:00:06 +00:00
|
|
|
min_temp_error(0);
|
2015-01-23 18:37:39 +00:00
|
|
|
#endif
|
2012-12-09 22:00:06 +00:00
|
|
|
}
|
2015-01-23 22:13:06 +00:00
|
|
|
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
#if HEATER_1_RAW_LO_TEMP > HEATER_1_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[1] <= maxttemp_raw[1]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[1] >= maxttemp_raw[1]) {
|
|
|
|
|
#endif
|
|
|
|
|
max_temp_error(1);
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
2012-12-09 22:00:06 +00:00
|
|
|
#if HEATER_1_RAW_LO_TEMP > HEATER_1_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[1] >= minttemp_raw[1]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[1] <= minttemp_raw[1]) {
|
|
|
|
|
#endif
|
|
|
|
|
min_temp_error(1);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
#if HEATER_2_RAW_LO_TEMP > HEATER_2_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[2] <= maxttemp_raw[2]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[2] >= maxttemp_raw[2]) {
|
|
|
|
|
#endif
|
|
|
|
|
max_temp_error(2);
|
|
|
|
|
}
|
|
|
|
|
#if HEATER_2_RAW_LO_TEMP > HEATER_2_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[2] >= minttemp_raw[2]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[2] <= minttemp_raw[2]) {
|
|
|
|
|
#endif
|
|
|
|
|
min_temp_error(2);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-01-23 22:13:06 +00:00
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
#if HEATER_3_RAW_LO_TEMP > HEATER_3_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[3] <= maxttemp_raw[3]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[3] >= maxttemp_raw[3]) {
|
|
|
|
|
#endif
|
|
|
|
|
max_temp_error(3);
|
|
|
|
|
}
|
|
|
|
|
#if HEATER_3_RAW_LO_TEMP > HEATER_3_RAW_HI_TEMP
|
|
|
|
|
if(current_temperature_raw[3] >= minttemp_raw[3]) {
|
|
|
|
|
#else
|
|
|
|
|
if(current_temperature_raw[3] <= minttemp_raw[3]) {
|
|
|
|
|
#endif
|
|
|
|
|
min_temp_error(3);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2012-12-09 22:00:06 +00:00
|
|
|
/* No bed MINTEMP error? */
|
|
|
|
|
#if defined(BED_MAXTEMP) && (TEMP_SENSOR_BED != 0)
|
|
|
|
|
# if HEATER_BED_RAW_LO_TEMP > HEATER_BED_RAW_HI_TEMP
|
2012-12-12 22:06:17 +00:00
|
|
|
if(current_temperature_bed_raw <= bed_maxttemp_raw) {
|
2012-12-09 22:00:06 +00:00
|
|
|
#else
|
2012-12-12 22:06:17 +00:00
|
|
|
if(current_temperature_bed_raw >= bed_maxttemp_raw) {
|
2012-12-09 22:00:06 +00:00
|
|
|
#endif
|
|
|
|
|
target_temperature_bed = 0;
|
2011-12-12 18:34:37 +00:00
|
|
|
bed_max_temp_error();
|
2011-12-06 04:33:33 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
Add the socalled "Babystepping" feature.
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
2013-10-06 19:14:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef BABYSTEPPING
|
|
|
|
|
for(uint8_t axis=0;axis<3;axis++)
|
|
|
|
|
{
|
|
|
|
|
int curTodo=babystepsTodo[axis]; //get rid of volatile for performance
|
|
|
|
|
|
|
|
|
|
if(curTodo>0)
|
|
|
|
|
{
|
|
|
|
|
babystep(axis,/*fwd*/true);
|
|
|
|
|
babystepsTodo[axis]--; //less to do next time
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
if(curTodo<0)
|
|
|
|
|
{
|
|
|
|
|
babystep(axis,/*fwd*/false);
|
|
|
|
|
babystepsTodo[axis]++; //less to do next time
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif //BABYSTEPPING
|
2011-11-15 21:50:43 +00:00
|
|
|
}
|
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
2013-03-19 14:05:11 +00:00
|
|
|
|
|
|
|
|
#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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif //PIDTEMP
|