|
@@ -130,11 +130,11 @@ static volatile bool temp_meas_ready = false;
|
130
|
130
|
|
131
|
131
|
#ifdef PIDTEMP
|
132
|
132
|
#ifdef PID_PARAMS_PER_EXTRUDER
|
133
|
|
- float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp);
|
134
|
|
- float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT);
|
135
|
|
- float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT);
|
|
133
|
+ float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kp);
|
|
134
|
+ float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Ki*PID_dT);
|
|
135
|
+ float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kd / PID_dT);
|
136
|
136
|
#ifdef PID_ADD_EXTRUSION_RATE
|
137
|
|
- float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc);
|
|
137
|
+ float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kc);
|
138
|
138
|
#endif // PID_ADD_EXTRUSION_RATE
|
139
|
139
|
#else //PID_PARAMS_PER_EXTRUDER
|
140
|
140
|
float Kp = DEFAULT_Kp;
|
|
@@ -150,7 +150,7 @@ static volatile bool temp_meas_ready = false;
|
150
|
150
|
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);
|
151
|
151
|
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);
|
152
|
152
|
static int minttemp[EXTRUDERS] = { 0 };
|
153
|
|
-static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383, 16383 );
|
|
153
|
+static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(16383);
|
154
|
154
|
#ifdef BED_MINTEMP
|
155
|
155
|
static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
|
156
|
156
|
#endif
|