From 82e221e3c759fc6fec4d2034b487ab446f6fe798 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 4 Jul 2022 22:34:34 +0200 Subject: [PATCH] Remove ADC pullup checks Setting pullups on the ADC should trigger the model-based check, making this redundant and wasteful. Keep the DEBUG_PULLUP_CRASH menu so that we can verify this behavior in the future. --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 4 ---- Firmware/stepper.cpp | 9 --------- Firmware/temperature.cpp | 10 ---------- 4 files changed, 24 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 26a892636..0e2427f97 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -477,7 +477,6 @@ void raise_z_above(float target, bool plan=true); extern "C" void softReset(); void stack_error(); -void pullup_error(bool fromTempISR); extern uint32_t IP_address; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2e88c1420..2fc467d3e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1693,10 +1693,6 @@ void stack_error() { crash_and_burn(dump_crash_reason::stack_error); } -void pullup_error(bool fromTempISR) { - crash_and_burn(fromTempISR ? dump_crash_reason::bad_pullup_temp_isr : dump_crash_reason::bad_pullup_step_isr); -} - #ifdef PRUSA_M28 void trace(); diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 34fc19ad2..0b221911d 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -287,15 +287,6 @@ ISR(TIMER1_COMPA_vect) { if (sp < SP_min) SP_min = sp; #endif //DEBUG_STACK_MONITOR -#ifdef DEBUG_PULLUP_CRASH - // check for faulty pull-ups enabled on thermistor inputs - if ((PORTF & (uint8_t)(ADC_DIDR_MSK & 0xff)) || (PORTK & (uint8_t)((ADC_DIDR_MSK >> 8) & 0xff))) - pullup_error(false); -#else - PORTF &= ~(uint8_t)(ADC_DIDR_MSK & 0xff); - PORTK &= ~(uint8_t)((ADC_DIDR_MSK >> 8) & 0xff); -#endif // DEBUG_PULLUP_CRASH - #ifdef LIN_ADVANCE advance_isr_scheduler(); #else diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 382af4bc1..c5012a852 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1400,16 +1400,6 @@ void adc_ready(void) //callback from adc when sampling finished FORCE_INLINE static void temperature_isr() { -#ifdef DEBUG_PULLUP_CRASH - // check for faulty pull-ups enabled on thermistor inputs - if ((PORTF & (uint8_t)(ADC_DIDR_MSK & 0xff)) || (PORTK & (uint8_t)((ADC_DIDR_MSK >> 8) & 0xff))) - pullup_error(true); -#else - PORTF &= ~(uint8_t)(ADC_DIDR_MSK & 0xff); - PORTK &= ~(uint8_t)((ADC_DIDR_MSK >> 8) & 0xff); -#endif // DEBUG_PULLUP_CRASH - - if (!temp_meas_ready) adc_cycle(); lcd_buttons_update();