|
@@ -1477,9 +1477,11 @@ void Temperature::set_current_temp_raw() {
|
1477
|
1477
|
* in OCR0B above (128 or halfway between OVFs).
|
1478
|
1478
|
*
|
1479
|
1479
|
* - Manage PWM to all the heaters and fan
|
1480
|
|
- * - Update the raw temperature values
|
1481
|
|
- * - Check new temperature values for MIN/MAX errors
|
|
1480
|
+ * - Prepare or Measure one of the raw ADC sensor values
|
|
1481
|
+ * - Check new temperature values for MIN/MAX errors (kill on error)
|
1482
|
1482
|
* - Step the babysteps value for each axis towards 0
|
|
1483
|
+ * - For PINS_DEBUGGING, monitor and report endstop pins
|
|
1484
|
+ * - For ENDSTOP_INTERRUPTS_FEATURE check endstops if flagged
|
1483
|
1485
|
*/
|
1484
|
1486
|
ISR(TIMER0_COMPB_vect) { Temperature::isr(); }
|
1485
|
1487
|
|
|
@@ -1535,37 +1537,37 @@ void Temperature::isr() {
|
1535
|
1537
|
*/
|
1536
|
1538
|
if (pwm_count == 0) {
|
1537
|
1539
|
soft_pwm_0 = soft_pwm[0];
|
1538
|
|
- WRITE_HEATER_0(soft_pwm_0 > 0 ? 1 : 0);
|
|
1540
|
+ WRITE_HEATER_0(soft_pwm_0 > 0 ? HIGH : LOW);
|
1539
|
1541
|
#if HOTENDS > 1
|
1540
|
1542
|
soft_pwm_1 = soft_pwm[1];
|
1541
|
|
- WRITE_HEATER_1(soft_pwm_1 > 0 ? 1 : 0);
|
|
1543
|
+ WRITE_HEATER_1(soft_pwm_1 > 0 ? HIGH : LOW);
|
1542
|
1544
|
#if HOTENDS > 2
|
1543
|
1545
|
soft_pwm_2 = soft_pwm[2];
|
1544
|
|
- WRITE_HEATER_2(soft_pwm_2 > 0 ? 1 : 0);
|
|
1546
|
+ WRITE_HEATER_2(soft_pwm_2 > 0 ? HIGH : LOW);
|
1545
|
1547
|
#if HOTENDS > 3
|
1546
|
1548
|
soft_pwm_3 = soft_pwm[3];
|
1547
|
|
- WRITE_HEATER_3(soft_pwm_3 > 0 ? 1 : 0);
|
|
1549
|
+ WRITE_HEATER_3(soft_pwm_3 > 0 ? HIGH : LOW);
|
1548
|
1550
|
#endif
|
1549
|
1551
|
#endif
|
1550
|
1552
|
#endif
|
1551
|
1553
|
|
1552
|
1554
|
#if HAS_HEATER_BED
|
1553
|
1555
|
soft_pwm_BED = soft_pwm_bed;
|
1554
|
|
- WRITE_HEATER_BED(soft_pwm_BED > 0 ? 1 : 0);
|
|
1556
|
+ WRITE_HEATER_BED(soft_pwm_BED > 0 ? HIGH : LOW);
|
1555
|
1557
|
#endif
|
1556
|
1558
|
|
1557
|
1559
|
#if ENABLED(FAN_SOFT_PWM)
|
1558
|
1560
|
#if HAS_FAN0
|
1559
|
1561
|
soft_pwm_fan[0] = fanSpeedSoftPwm[0] >> 1;
|
1560
|
|
- WRITE_FAN(soft_pwm_fan[0] > 0 ? 1 : 0);
|
|
1562
|
+ WRITE_FAN(soft_pwm_fan[0] > 0 ? HIGH : LOW);
|
1561
|
1563
|
#endif
|
1562
|
1564
|
#if HAS_FAN1
|
1563
|
1565
|
soft_pwm_fan[1] = fanSpeedSoftPwm[1] >> 1;
|
1564
|
|
- WRITE_FAN1(soft_pwm_fan[1] > 0 ? 1 : 0);
|
|
1566
|
+ WRITE_FAN1(soft_pwm_fan[1] > 0 ? HIGH : LOW);
|
1565
|
1567
|
#endif
|
1566
|
1568
|
#if HAS_FAN2
|
1567
|
1569
|
soft_pwm_fan[2] = fanSpeedSoftPwm[2] >> 1;
|
1568
|
|
- WRITE_FAN2(soft_pwm_fan[2] > 0 ? 1 : 0);
|
|
1570
|
+ WRITE_FAN2(soft_pwm_fan[2] > 0 ? HIGH : LOW);
|
1569
|
1571
|
#endif
|
1570
|
1572
|
#endif
|
1571
|
1573
|
}
|
|
@@ -1683,15 +1685,15 @@ void Temperature::isr() {
|
1683
|
1685
|
if (pwm_count == 0) {
|
1684
|
1686
|
#if HAS_FAN0
|
1685
|
1687
|
soft_pwm_fan[0] = fanSpeedSoftPwm[0] >> 1;
|
1686
|
|
- WRITE_FAN(soft_pwm_fan[0] > 0 ? 1 : 0);
|
|
1688
|
+ WRITE_FAN(soft_pwm_fan[0] > 0 ? HIGH : LOW);
|
1687
|
1689
|
#endif
|
1688
|
1690
|
#if HAS_FAN1
|
1689
|
1691
|
soft_pwm_fan[1] = fanSpeedSoftPwm[1] >> 1;
|
1690
|
|
- WRITE_FAN1(soft_pwm_fan[1] > 0 ? 1 : 0);
|
|
1692
|
+ WRITE_FAN1(soft_pwm_fan[1] > 0 ? HIGH : LOW);
|
1691
|
1693
|
#endif
|
1692
|
1694
|
#if HAS_FAN2
|
1693
|
1695
|
soft_pwm_fan[2] = fanSpeedSoftPwm[2] >> 1;
|
1694
|
|
- WRITE_FAN2(soft_pwm_fan[2] > 0 ? 1 : 0);
|
|
1696
|
+ WRITE_FAN2(soft_pwm_fan[2] > 0 ? HIGH : LOW);
|
1695
|
1697
|
#endif
|
1696
|
1698
|
}
|
1697
|
1699
|
#if HAS_FAN0
|