josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lcd_buttons_update in interrupt

This commit is contained in:
PavelSindler 2017-03-20 11:50:30 +01:00
parent fb8ba9c151
commit 0dc93b91bc
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/temperature.cpp
View File

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

22
Firmware/ultralcd.cpp
View File

@ -4284,27 +4284,9 @@ static void lcd_quick_feedback()
{ {
lcdDrawUpdate = 2; lcdDrawUpdate = 2;
blocking_enc = millis() + 500; 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;
/*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(); lcd_implementation_quick_feedback();
} }