bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix LCD compile error, etc. (#12472)

Browse Source
This commit is contained in:
Ludy
2018-11-19 03:39:49 +01:00
committed by Scott Lahteine
parent 826d570162
commit 1f93d2bcf7
13 changed files with 202 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/temperature.cpp
View File

@ -217,7 +217,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
bool Temperature::heater_idle_timeout_exceeded[HOTENDS] = { false };
#endif
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
uint32_t Temperature::current_ADCKey_raw = 0;
uint8_t Temperature::ADCKey_count = 0;
#endif
@ -1869,7 +1869,7 @@ void Temperature::isr() {
// avoid multiple loads of pwm_count
uint8_t pwm_count_tmp = pwm_count;
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
static unsigned int raw_ADCKey_value = 0;
#endif
@ -2290,7 +2290,7 @@ void Temperature::isr() {
break;
#endif
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
case Prepare_ADC_KEY:
HAL_START_ADC(ADC_KEYPAD_PIN);
break;

4
Marlin/src/module/temperature.h
View File

@ -112,7 +112,7 @@ enum ADCSensorState : char {
Prepare_FILWIDTH,
Measure_FILWIDTH,
#endif
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
Prepare_ADC_KEY,
Measure_ADC_KEY,
#endif
@ -291,7 +291,7 @@ class Temperature {
#endif
public:
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
static uint32_t current_ADCKey_raw;
static uint8_t ADCKey_count;
#endif