|
@@ -2670,81 +2670,47 @@ void Temperature::isr() {
|
2670
|
2670
|
break;
|
2671
|
2671
|
|
2672
|
2672
|
#if HAS_TEMP_ADC_0
|
2673
|
|
- case PrepareTemp_0:
|
2674
|
|
- HAL_START_ADC(TEMP_0_PIN);
|
2675
|
|
- break;
|
2676
|
|
- case MeasureTemp_0:
|
2677
|
|
- ACCUMULATE_ADC(temp_hotend[0]);
|
2678
|
|
- break;
|
|
2673
|
+ case PrepareTemp_0: HAL_START_ADC(TEMP_0_PIN); break;
|
|
2674
|
+ case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
|
2679
|
2675
|
#endif
|
2680
|
2676
|
|
2681
|
2677
|
#if HAS_HEATED_BED
|
2682
|
|
- case PrepareTemp_BED:
|
2683
|
|
- HAL_START_ADC(TEMP_BED_PIN);
|
2684
|
|
- break;
|
2685
|
|
- case MeasureTemp_BED:
|
2686
|
|
- ACCUMULATE_ADC(temp_bed);
|
2687
|
|
- break;
|
|
2678
|
+ case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
|
|
2679
|
+ case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
|
2688
|
2680
|
#endif
|
2689
|
2681
|
|
2690
|
2682
|
#if HAS_TEMP_CHAMBER
|
2691
|
|
- case PrepareTemp_CHAMBER:
|
2692
|
|
- HAL_START_ADC(TEMP_CHAMBER_PIN);
|
2693
|
|
- break;
|
2694
|
|
- case MeasureTemp_CHAMBER:
|
2695
|
|
- ACCUMULATE_ADC(temp_chamber);
|
2696
|
|
- break;
|
|
2683
|
+ case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
|
|
2684
|
+ case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
|
2697
|
2685
|
#endif
|
2698
|
2686
|
|
2699
|
2687
|
#if HAS_TEMP_ADC_1
|
2700
|
|
- case PrepareTemp_1:
|
2701
|
|
- HAL_START_ADC(TEMP_1_PIN);
|
2702
|
|
- break;
|
2703
|
|
- case MeasureTemp_1:
|
2704
|
|
- ACCUMULATE_ADC(temp_hotend[1]);
|
2705
|
|
- break;
|
|
2688
|
+ case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
|
|
2689
|
+ case MeasureTemp_1: ACCUMULATE_ADC(temp_hotend[1]); break;
|
2706
|
2690
|
#endif
|
2707
|
2691
|
|
2708
|
2692
|
#if HAS_TEMP_ADC_2
|
2709
|
|
- case PrepareTemp_2:
|
2710
|
|
- HAL_START_ADC(TEMP_2_PIN);
|
2711
|
|
- break;
|
2712
|
|
- case MeasureTemp_2:
|
2713
|
|
- ACCUMULATE_ADC(temp_hotend[2]);
|
2714
|
|
- break;
|
|
2693
|
+ case PrepareTemp_2: HAL_START_ADC(TEMP_2_PIN); break;
|
|
2694
|
+ case MeasureTemp_2: ACCUMULATE_ADC(temp_hotend[2]); break;
|
2715
|
2695
|
#endif
|
2716
|
2696
|
|
2717
|
2697
|
#if HAS_TEMP_ADC_3
|
2718
|
|
- case PrepareTemp_3:
|
2719
|
|
- HAL_START_ADC(TEMP_3_PIN);
|
2720
|
|
- break;
|
2721
|
|
- case MeasureTemp_3:
|
2722
|
|
- ACCUMULATE_ADC(temp_hotend[3]);
|
2723
|
|
- break;
|
|
2698
|
+ case PrepareTemp_3: HAL_START_ADC(TEMP_3_PIN); break;
|
|
2699
|
+ case MeasureTemp_3: ACCUMULATE_ADC(temp_hotend[3]); break;
|
2724
|
2700
|
#endif
|
2725
|
2701
|
|
2726
|
2702
|
#if HAS_TEMP_ADC_4
|
2727
|
|
- case PrepareTemp_4:
|
2728
|
|
- HAL_START_ADC(TEMP_4_PIN);
|
2729
|
|
- break;
|
2730
|
|
- case MeasureTemp_4:
|
2731
|
|
- ACCUMULATE_ADC(temp_hotend[4]);
|
2732
|
|
- break;
|
|
2703
|
+ case PrepareTemp_4: HAL_START_ADC(TEMP_4_PIN); break;
|
|
2704
|
+ case MeasureTemp_4: ACCUMULATE_ADC(temp_hotend[4]); break;
|
2733
|
2705
|
#endif
|
2734
|
2706
|
|
2735
|
2707
|
#if HAS_TEMP_ADC_5
|
2736
|
|
- case PrepareTemp_5:
|
2737
|
|
- HAL_START_ADC(TEMP_5_PIN);
|
2738
|
|
- break;
|
2739
|
|
- case MeasureTemp_5:
|
2740
|
|
- ACCUMULATE_ADC(temp_hotend[5]);
|
2741
|
|
- break;
|
|
2708
|
+ case PrepareTemp_5: HAL_START_ADC(TEMP_5_PIN); break;
|
|
2709
|
+ case MeasureTemp_5: ACCUMULATE_ADC(temp_hotend[5]); break;
|
2742
|
2710
|
#endif
|
2743
|
2711
|
|
2744
|
2712
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
2745
|
|
- case Prepare_FILWIDTH:
|
2746
|
|
- HAL_START_ADC(FILWIDTH_PIN);
|
2747
|
|
- break;
|
|
2713
|
+ case Prepare_FILWIDTH: HAL_START_ADC(FILWIDTH_PIN); break;
|
2748
|
2714
|
case Measure_FILWIDTH:
|
2749
|
2715
|
if (!HAL_ADC_READY())
|
2750
|
2716
|
next_sensor_state = adc_sensor_state; // redo this state
|
|
@@ -2756,9 +2722,7 @@ void Temperature::isr() {
|
2756
|
2722
|
#endif
|
2757
|
2723
|
|
2758
|
2724
|
#if HAS_ADC_BUTTONS
|
2759
|
|
- case Prepare_ADC_KEY:
|
2760
|
|
- HAL_START_ADC(ADC_KEYPAD_PIN);
|
2761
|
|
- break;
|
|
2725
|
+ case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
|
2762
|
2726
|
case Measure_ADC_KEY:
|
2763
|
2727
|
if (!HAL_ADC_READY())
|
2764
|
2728
|
next_sensor_state = adc_sensor_state; // redo this state
|