SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow larger ADC debounce

Browse source 
Reference #17205
This commit is contained in:
Scott Lahteine 2020-06-26 18:53:39 -05:00
parent 319e93f55d
commit a907e15ae6
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View file

@ -1519,7 +1519,7 @@
// ADC Button Debounce // ADC Button Debounce
// //
#if HAS_ADC_BUTTONS #if HAS_ADC_BUTTONS
#define ADC_BUTTON_DEBOUNCE_DELAY 16 // (ms) Increase if buttons bounce or repeat too fast #define ADC_BUTTON_DEBOUNCE_DELAY 16 // Increase if buttons bounce or repeat too fast
#endif #endif
// @section safety // @section safety

4
Marlin/src/inc/SanityCheck.h
View file

@ -2976,8 +2976,8 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#endif #endif
#endif #endif
#if HAS_ADC_BUTTONS && defined(ADC_BUTTON_DEBOUNCE_DELAY) && !WITHIN(ADC_BUTTON_DEBOUNCE_DELAY, 16, 255) #if HAS_ADC_BUTTONS && defined(ADC_BUTTON_DEBOUNCE_DELAY) && ADC_BUTTON_DEBOUNCE_DELAY < 16
#error "ADC_BUTTON_DEBOUNCE_DELAY must be an integer from 16 to 255." #error "ADC_BUTTON_DEBOUNCE_DELAY must be greater than 16."
#endif #endif
/** /**

2
Marlin/src/module/temperature.cpp
View file

@ -351,7 +351,7 @@ volatile bool Temperature::raw_temps_ready = false;
#if HAS_ADC_BUTTONS #if HAS_ADC_BUTTONS
uint32_t Temperature::current_ADCKey_raw = HAL_ADC_RANGE; uint32_t Temperature::current_ADCKey_raw = HAL_ADC_RANGE;
uint8_t Temperature::ADCKey_count = 0; uint16_t Temperature::ADCKey_count = 0;
#endif #endif
#if ENABLED(PID_EXTRUSION_SCALING) #if ENABLED(PID_EXTRUSION_SCALING)

2
Marlin/src/module/temperature.h
View file

@ -425,7 +425,7 @@ class Temperature {
public: public:
#if HAS_ADC_BUTTONS #if HAS_ADC_BUTTONS
static uint32_t current_ADCKey_raw; static uint32_t current_ADCKey_raw;
static uint8_t ADCKey_count; static uint16_t ADCKey_count;
#endif #endif
TERN_(PID_EXTRUSION_SCALING, static int16_t lpq_len); TERN_(PID_EXTRUSION_SCALING, static int16_t lpq_len);

7
Marlin/src/pins/ramps/pins_ZRIB_V20.h
View file

@ -69,6 +69,13 @@
#undef ADC_KEYPAD_PIN #undef ADC_KEYPAD_PIN
#undef BEEPER_PIN #undef BEEPER_PIN
#undef SHIFT_OUT
#undef SHIFT_CLK
#undef SHIFT_LD
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define LCD_PINS_RS ZRIB_V20_D16_PIN #define LCD_PINS_RS ZRIB_V20_D16_PIN
#define LCD_PINS_ENABLE ZRIB_V20_D17_PIN #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
#define LCD_PINS_D4 ZRIB_V20_D23_PIN #define LCD_PINS_D4 ZRIB_V20_D23_PIN