Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for EMI noise filter for button state #23925

Merged
merged 5 commits into from
Mar 21, 2022
Merged

Add support for EMI noise filter for button state #23925

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09e4209
Add support for EMI noise filter for button state
Na1w Mar 19, 2022
2799fe1
Inverted logic for touchscreen fallback
Na1w Mar 19, 2022
d0a5d03
extracted hw button logic to actually get it to work with the touchsc…
Na1w Mar 19, 2022
495acc1
use an uint8_t as iterator
Na1w Mar 20, 2022
1985d07
tweaks
thinkyhead Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion Marlin/src/lcd/marlinui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,31 @@ class MarlinUI {
#endif

static void update_buttons();
static bool button_pressed() { return BUTTON_CLICK() || TERN(TOUCH_SCREEN, touch_pressed(), false); }

#if HAS_ENCODER_NOISE
#ifndef ENCODER_SAMPLES
#define ENCODER_SAMPLES 10
#endif

/**
* Some printers may have issues with EMI noise especially using a motherboard with 3.3V logic levels
* it may cause the logical LOW to float into the undefined region and register as a logical HIGH
* causing it to errorenously register as if someone clicked the button and in worst case make the printer
* unusable in practice.
*/
static bool hw_button_pressed() {
LOOP_L_N(s, ENCODER_SAMPLES) {
if (!BUTTON_CLICK()) return false;
safe_delay(1);
}
return true;
}
#else
static bool hw_button_pressed() { return BUTTON_CLICK(); }
#endif

static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); }

#if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
static void wait_for_release();
#endif
Expand Down