|
@@ -1169,8 +1169,11 @@ void Planner::recalculate() {
|
1169
|
1169
|
* Maintain fans, paste extruder pressure,
|
1170
|
1170
|
*/
|
1171
|
1171
|
void Planner::check_axes_activity() {
|
1172
|
|
- uint8_t axis_active[NUM_AXIS] = { 0 },
|
1173
|
|
- tail_fan_speed[FAN_COUNT];
|
|
1172
|
+ uint8_t axis_active[NUM_AXIS] = { 0 };
|
|
1173
|
+
|
|
1174
|
+ #if FAN_COUNT > 0
|
|
1175
|
+ uint8_t tail_fan_speed[FAN_COUNT];
|
|
1176
|
+ #endif
|
1174
|
1177
|
|
1175
|
1178
|
#if ENABLED(BARICUDA)
|
1176
|
1179
|
#if HAS_HEATER_1
|
|
@@ -1182,15 +1185,18 @@ void Planner::check_axes_activity() {
|
1182
|
1185
|
#endif
|
1183
|
1186
|
|
1184
|
1187
|
if (has_blocks_queued()) {
|
|
1188
|
+ block_t* block;
|
|
1189
|
+
|
|
1190
|
+ #if FAN_COUNT > 0 || ENABLED(BARICUDA)
|
|
1191
|
+ block = &block_buffer[block_buffer_tail];
|
|
1192
|
+ #endif
|
|
1193
|
+
|
1185
|
1194
|
#if FAN_COUNT > 0
|
1186
|
1195
|
FANS_LOOP(i)
|
1187
|
|
- tail_fan_speed[i] = thermalManager.scaledFanSpeed(i, block_buffer[block_buffer_tail].fan_speed[i]);
|
|
1196
|
+ tail_fan_speed[i] = thermalManager.scaledFanSpeed(i, block->fan_speed[i]);
|
1188
|
1197
|
#endif
|
1189
|
1198
|
|
1190
|
|
- block_t* block;
|
1191
|
|
-
|
1192
|
1199
|
#if ENABLED(BARICUDA)
|
1193
|
|
- block = &block_buffer[block_buffer_tail];
|
1194
|
1200
|
#if HAS_HEATER_1
|
1195
|
1201
|
tail_valve_pressure = block->valve_pressure;
|
1196
|
1202
|
#endif
|
|
@@ -1236,30 +1242,19 @@ void Planner::check_axes_activity() {
|
1236
|
1242
|
#if FAN_COUNT > 0
|
1237
|
1243
|
|
1238
|
1244
|
#if FAN_KICKSTART_TIME > 0
|
1239
|
|
-
|
1240
|
1245
|
static millis_t fan_kick_end[FAN_COUNT] = { 0 };
|
1241
|
|
-
|
1242
|
|
- #define KICKSTART_FAN(f) \
|
1243
|
|
- if (tail_fan_speed[f]) { \
|
1244
|
|
- millis_t ms = millis(); \
|
1245
|
|
- if (fan_kick_end[f] == 0) { \
|
|
1246
|
+ #define KICKSTART_FAN(f) \
|
|
1247
|
+ if (tail_fan_speed[f]) { \
|
|
1248
|
+ millis_t ms = millis(); \
|
|
1249
|
+ if (fan_kick_end[f] == 0) { \
|
1246
|
1250
|
fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \
|
1247
|
|
- tail_fan_speed[f] = 255; \
|
1248
|
|
- } else if (PENDING(ms, fan_kick_end[f])) \
|
1249
|
|
- tail_fan_speed[f] = 255; \
|
|
1251
|
+ tail_fan_speed[f] = 255; \
|
|
1252
|
+ } else if (PENDING(ms, fan_kick_end[f])) \
|
|
1253
|
+ tail_fan_speed[f] = 255; \
|
1250
|
1254
|
} else fan_kick_end[f] = 0
|
1251
|
|
-
|
1252
|
|
- #if HAS_FAN0
|
1253
|
|
- KICKSTART_FAN(0);
|
1254
|
|
- #endif
|
1255
|
|
- #if HAS_FAN1
|
1256
|
|
- KICKSTART_FAN(1);
|
1257
|
|
- #endif
|
1258
|
|
- #if HAS_FAN2
|
1259
|
|
- KICKSTART_FAN(2);
|
1260
|
|
- #endif
|
1261
|
|
-
|
1262
|
|
- #endif // FAN_KICKSTART_TIME > 0
|
|
1255
|
+ #else
|
|
1256
|
+ #define KICKSTART_FAN(f) NOOP
|
|
1257
|
+ #endif
|
1263
|
1258
|
|
1264
|
1259
|
#if FAN_MIN_PWM != 0 || FAN_MAX_PWM != 255
|
1265
|
1260
|
#define CALC_FAN_SPEED(f) (tail_fan_speed[f] ? map(tail_fan_speed[f], 1, 255, FAN_MIN_PWM, FAN_MAX_PWM) : 0)
|
|
@@ -1268,43 +1263,24 @@ void Planner::check_axes_activity() {
|
1268
|
1263
|
#endif
|
1269
|
1264
|
|
1270
|
1265
|
#if ENABLED(FAN_SOFT_PWM)
|
1271
|
|
-
|
1272
|
|
- #if HAS_FAN0
|
1273
|
|
- thermalManager.soft_pwm_amount_fan[0] = CALC_FAN_SPEED(0);
|
1274
|
|
- #endif
|
1275
|
|
- #if HAS_FAN1
|
1276
|
|
- thermalManager.soft_pwm_amount_fan[1] = CALC_FAN_SPEED(1);
|
1277
|
|
- #endif
|
1278
|
|
- #if HAS_FAN2
|
1279
|
|
- thermalManager.soft_pwm_amount_fan[2] = CALC_FAN_SPEED(2);
|
1280
|
|
- #endif
|
1281
|
|
-
|
|
1266
|
+ #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
|
1282
|
1267
|
#elif ENABLED(FAST_PWM_FAN)
|
1283
|
|
-
|
1284
|
|
- #if HAS_FAN0
|
1285
|
|
- set_pwm_duty(FAN_PIN, CALC_FAN_SPEED(0));
|
1286
|
|
- #endif
|
1287
|
|
- #if HAS_FAN1
|
1288
|
|
- set_pwm_duty(FAN1_PIN, CALC_FAN_SPEED(1));
|
1289
|
|
- #endif
|
1290
|
|
- #if HAS_FAN2
|
1291
|
|
- set_pwm_duty(FAN2_PIN, CALC_FAN_SPEED(2));
|
1292
|
|
- #endif
|
1293
|
|
-
|
|
1268
|
+ #define _FAN_SET(F) set_pwm_duty(FAN##F##_PIN, CALC_FAN_SPEED(F));
|
1294
|
1269
|
#else
|
|
1270
|
+ #define _FAN_SET(F) analogWrite(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
|
|
1271
|
+ #endif
|
|
1272
|
+ #define FAN_SET(F) do{ KICKSTART_FAN(F); _FAN_SET(F); }while(0)
|
1295
|
1273
|
|
1296
|
|
- #if HAS_FAN0
|
1297
|
|
- analogWrite(pin_t(FAN_PIN), CALC_FAN_SPEED(0));
|
1298
|
|
- #endif
|
1299
|
|
- #if HAS_FAN1
|
1300
|
|
- analogWrite(pin_t(FAN1_PIN), CALC_FAN_SPEED(1));
|
1301
|
|
- #endif
|
1302
|
|
- #if HAS_FAN2
|
1303
|
|
- analogWrite(pin_t(FAN2_PIN), CALC_FAN_SPEED(2));
|
1304
|
|
- #endif
|
|
1274
|
+ #if HAS_FAN0
|
|
1275
|
+ FAN_SET(0);
|
1305
|
1276
|
#endif
|
1306
|
|
- #else
|
1307
|
|
- UNUSED(tail_fan_speed);
|
|
1277
|
+ #if HAS_FAN1
|
|
1278
|
+ FAN_SET(1);
|
|
1279
|
+ #endif
|
|
1280
|
+ #if HAS_FAN2
|
|
1281
|
+ FAN_SET(2);
|
|
1282
|
+ #endif
|
|
1283
|
+
|
1308
|
1284
|
#endif // FAN_COUNT > 0
|
1309
|
1285
|
|
1310
|
1286
|
#if ENABLED(AUTOTEMP)
|