From 383319dbac4ebf56e4a7649f6a06615fc7e75837 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 15 May 2022 00:50:03 +0200 Subject: [PATCH] Rename temperature_isr to soft_pwm_isr --- Firmware/temperature.cpp | 10 +++++----- Firmware/temperature.h | 8 ++++---- Firmware/xyzcal.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 0c86f28b0..a1741eddd 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -875,7 +875,7 @@ void tp_init() // timer2 already enabled earlier in the code // now enable the COMPB temperature interrupt OCR2B = 128; - ENABLE_TEMPERATURE_INTERRUPT(); + ENABLE_SOFT_PWM_INTERRUPT(); timer4_init(); //for tone and Extruder fan PWM @@ -1401,7 +1401,7 @@ void adc_ready(void) //callback from adc when sampling finished temp_meas_ready = true; } -FORCE_INLINE static void temperature_isr() +FORCE_INLINE static void soft_pwm_isr() { lcd_buttons_update(); @@ -1779,11 +1779,11 @@ ISR(TIMER2_COMPB_vect) ISR(TIMER0_COMPB_vect) #endif //SYSTEM_TIMER_2 { - DISABLE_TEMPERATURE_INTERRUPT(); + DISABLE_SOFT_PWM_INTERRUPT(); sei(); - temperature_isr(); + soft_pwm_isr(); cli(); - ENABLE_TEMPERATURE_INTERRUPT(); + ENABLE_SOFT_PWM_INTERRUPT(); } void check_max_temp() diff --git a/Firmware/temperature.h b/Firmware/temperature.h index ee94d04c7..eb2670580 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -27,13 +27,13 @@ #ifdef SYSTEM_TIMER_2 -#define ENABLE_TEMPERATURE_INTERRUPT() TIMSK2 |= (1<-1)) DISABLE_FANCHECK_INTERRUPT(); #endif //(defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) @@ -156,7 +156,7 @@ void xyzcal_meassure_leave(void) { DBG(_n("xyzcal_meassure_leave\n")); planner_abort_hard(); - ENABLE_TEMPERATURE_INTERRUPT(); + ENABLE_SOFT_PWM_INTERRUPT(); #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) ENABLE_FANCHECK_INTERRUPT(); #endif //(defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1))