3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename temperature_isr to soft_pwm_isr

Browse source
This commit is contained in:
Yuri D'Elia 2022-05-15 00:50:03 +02:00
parent 16b9acf8bc
commit 383319dbac
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Firmware/temperature.cpp
View file

@ -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()

8
Firmware/temperature.h
View file

@ -27,13 +27,13 @@
#ifdef SYSTEM_TIMER_2
#define ENABLE_TEMPERATURE_INTERRUPT() TIMSK2 |= (1<<OCIE2B)
#define DISABLE_TEMPERATURE_INTERRUPT() TIMSK2 &= ~(1<<OCIE2B)
#define ENABLE_SOFT_PWM_INTERRUPT() TIMSK2 |= (1<<OCIE2B)
#define DISABLE_SOFT_PWM_INTERRUPT() TIMSK2 &= ~(1<<OCIE2B)
#else //SYSTEM_TIMER_2
#define ENABLE_TEMPERATURE_INTERRUPT() TIMSK0 |= (1<<OCIE0B)
#define DISABLE_TEMPERATURE_INTERRUPT() TIMSK0 &= ~(1<<OCIE0B)
#define ENABLE_SOFT_PWM_INTERRUPT() TIMSK0 |= (1<<OCIE0B)
#define DISABLE_SOFT_PWM_INTERRUPT() TIMSK0 &= ~(1<<OCIE0B)
#endif //SYSTEM_TIMER_2

4
Firmware/xyzcal.cpp
View file

@ -139,7 +139,7 @@ void xyzcal_meassure_enter(void)
{
DBG(_n("xyzcal_meassure_enter\n"));
disable_heater();
DISABLE_TEMPERATURE_INTERRUPT();
DISABLE_SOFT_PWM_INTERRUPT();
#if (defined(FANCHECK) && defined(TACH_1) && (TACH_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))