소스 검색

lcd_buttons_update in interrupt

PavelSindler 8 년 전
부모
커밋
0dc93b91bc
2개의 변경된 파일7개의 추가작업 그리고 25개의 파일을 삭제
  1. 5 5
      Firmware/temperature.cpp
  2. 2 20
      Firmware/ultralcd.cpp

+ 5 - 5
Firmware/temperature.cpp

@@ -1705,7 +1705,7 @@ ISR(TIMER0_COMPB_vect)
         ADMUX = ((1 << REFS0) | (TEMP_0_PIN & 0x07));
         ADCSRA |= 1<<ADSC; // Start conversion
       #endif
-      //lcd_buttons_update();
+      lcd_buttons_update();
       temp_state = 1;
       break;
     case 1: // Measure TEMP_0
@@ -1727,7 +1727,7 @@ ISR(TIMER0_COMPB_vect)
         ADMUX = ((1 << REFS0) | (TEMP_BED_PIN & 0x07));
         ADCSRA |= 1<<ADSC; // Start conversion
       #endif
-     // lcd_buttons_update();
+      lcd_buttons_update();
       temp_state = 3;
       break;
     case 3: // Measure TEMP_BED
@@ -1746,7 +1746,7 @@ ISR(TIMER0_COMPB_vect)
         ADMUX = ((1 << REFS0) | (TEMP_1_PIN & 0x07));
         ADCSRA |= 1<<ADSC; // Start conversion
       #endif
-     // lcd_buttons_update();
+      lcd_buttons_update();
       temp_state = 5;
       break;
     case 5: // Measure TEMP_1
@@ -1765,7 +1765,7 @@ ISR(TIMER0_COMPB_vect)
         ADMUX = ((1 << REFS0) | (TEMP_2_PIN & 0x07));
         ADCSRA |= 1<<ADSC; // Start conversion
       #endif
-     // lcd_buttons_update();
+      lcd_buttons_update();
       temp_state = 7;
       break;
     case 7: // Measure TEMP_2
@@ -1785,7 +1785,7 @@ ISR(TIMER0_COMPB_vect)
       ADMUX = ((1 << REFS0) | (FILWIDTH_PIN & 0x07)); 
       ADCSRA |= 1<<ADSC; // Start conversion 
      #endif 
-    // lcd_buttons_update();       
+     lcd_buttons_update();       
      temp_state = 9; 
      break; 
     case 9:   //Measure FILWIDTH 

+ 2 - 20
Firmware/ultralcd.cpp

@@ -4284,27 +4284,9 @@ static void lcd_quick_feedback()
 {
   lcdDrawUpdate = 2;
   blocking_enc = millis() + 500;
-  if (button_pressed && long_press_active) long_press_active = false;
+  //if (button_pressed && long_press_active) long_press_active = false;
   button_pressed = false;
-	  /*button_pressed = false;
-		else if (button_pressed) {
-			if (long_press_active == false) {
-				newbutton |= EN_C;
-			}
-			else {
-				long_press_active = false;
-			}
-		}*/
-	 /* if (long_press_active)
-	  {
-		  long_press_active = false;
-	  }
-	  else {
-		  newbutton |= EN_C;
-	  }
-  }*/
-  //button_pressed = false;
- // long_press_count = 0;
+
   lcd_implementation_quick_feedback();
 }