ソースを参照

Rename temperature_isr to soft_pwm_isr

Yuri D'Elia 2 年 前
コミット
383319dbac
3 ファイル変更11 行追加11 行削除
  1. 5 5
      Firmware/temperature.cpp
  2. 4 4
      Firmware/temperature.h
  3. 2 2
      Firmware/xyzcal.cpp

+ 5 - 5
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()

+ 4 - 4
Firmware/temperature.h

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

+ 2 - 2
Firmware/xyzcal.cpp

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