|
@@ -1286,9 +1286,7 @@ void Temperature::disable_all_heaters() {
|
1286
|
1286
|
}
|
1287
|
1287
|
|
1288
|
1288
|
#if HAS_TEMP_HOTEND
|
1289
|
|
- setTargetHotend(0, 0);
|
1290
|
|
- soft_pwm[0] = 0;
|
1291
|
|
- WRITE_HEATER_0P(LOW); // Should HEATERS_PARALLEL apply here? Then change to DISABLE_HEATER(0)
|
|
1289
|
+ DISABLE_HEATER(0);
|
1292
|
1290
|
#endif
|
1293
|
1291
|
|
1294
|
1292
|
#if HOTENDS > 1 && HAS_TEMP_1
|
|
@@ -1431,7 +1429,7 @@ void Temperature::isr() {
|
1431
|
1429
|
|
1432
|
1430
|
// Statics per heater
|
1433
|
1431
|
ISR_STATICS(0);
|
1434
|
|
- #if (HOTENDS > 1) || ENABLED(HEATERS_PARALLEL)
|
|
1432
|
+ #if HOTENDS > 1
|
1435
|
1433
|
ISR_STATICS(1);
|
1436
|
1434
|
#if HOTENDS > 2
|
1437
|
1435
|
ISR_STATICS(2);
|
|
@@ -1450,15 +1448,11 @@ void Temperature::isr() {
|
1450
|
1448
|
|
1451
|
1449
|
#if DISABLED(SLOW_PWM_HEATERS)
|
1452
|
1450
|
/**
|
1453
|
|
- * standard PWM modulation
|
|
1451
|
+ * Standard PWM modulation
|
1454
|
1452
|
*/
|
1455
|
1453
|
if (pwm_count == 0) {
|
1456
|
1454
|
soft_pwm_0 = soft_pwm[0];
|
1457
|
|
- if (soft_pwm_0 > 0) {
|
1458
|
|
- WRITE_HEATER_0(1);
|
1459
|
|
- }
|
1460
|
|
- else WRITE_HEATER_0P(0); // If HEATERS_PARALLEL should apply, change to WRITE_HEATER_0
|
1461
|
|
-
|
|
1455
|
+ WRITE_HEATER_0(soft_pwm_0 > 0 ? 1 : 0);
|
1462
|
1456
|
#if HOTENDS > 1
|
1463
|
1457
|
soft_pwm_1 = soft_pwm[1];
|
1464
|
1458
|
WRITE_HEATER_1(soft_pwm_1 > 0 ? 1 : 0);
|
|
@@ -1535,7 +1529,7 @@ void Temperature::isr() {
|
1535
|
1529
|
#define MIN_STATE_TIME 16 // MIN_STATE_TIME * 65.5 = time in milliseconds
|
1536
|
1530
|
#endif
|
1537
|
1531
|
|
1538
|
|
- // Macros for Slow PWM timer logic - HEATERS_PARALLEL applies
|
|
1532
|
+ // Macros for Slow PWM timer logic
|
1539
|
1533
|
#define _SLOW_PWM_ROUTINE(NR, src) \
|
1540
|
1534
|
soft_pwm_ ## NR = src; \
|
1541
|
1535
|
if (soft_pwm_ ## NR > 0) { \
|