Skip to content

Touch Sensor IDF Refactoring #6194

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

Merged
merged 17 commits into from
Feb 3, 2022
Merged

Touch Sensor IDF Refactoring #6194

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3f70195
Touch Sensor IDF Refactoring
SuGlider Jan 25, 2022
b2a92a5
Merge branch 'master' into touch-idf
SuGlider Jan 26, 2022
f8bed68
Touch Sensor IDF Refactoring
SuGlider Jan 26, 2022
dc10f17
Merge branch 'touch-idf' of https://github.com/suglider/arduino-esp32…
SuGlider Jan 26, 2022
a5507a2
Touch Sensor IDF Refactoring
SuGlider Jan 26, 2022
4fa91de
Touch Sensor IDF Refactoring
SuGlider Jan 26, 2022
be005fe
Touch Sensor IDF Refactoring
SuGlider Jan 26, 2022
b5c791c
Touch Sensor IDF Refactoring
SuGlider Jan 26, 2022
f226913
Merge branch 'master' into touch-idf
SuGlider Jan 31, 2022
cd43edf
Merge branch 'espressif:master' into touch-idf
SuGlider Jan 31, 2022
c7ec9c5
fixes initialization return codes
SuGlider Jan 31, 2022
6cab5b7
code review
SuGlider Feb 2, 2022
d1702cd
code review
SuGlider Feb 2, 2022
149d594
Merge branch 'master' into touch-idf
SuGlider Feb 2, 2022
8cd18cc
preprocessor messages review
SuGlider Feb 3, 2022
d571a87
Merge branch 'touch-idf' of https://github.com/suglider/arduino-esp32…
SuGlider Feb 3, 2022
a243f89
preprocessor messages review
SuGlider Feb 3, 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
Prev Previous commit
Next Next commit
Touch Sensor IDF Refactoring
  • Loading branch information
@SuGlider
SuGlider committed Jan 26, 2022
commit f8bed6893fb8d9871ec4391869762dc5545a4900
4 changes: 2 additions & 2 deletions cores/esp32/esp32-hal-touch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ static void __touchDettachInterrupt(uint8_t pin)
{
__touchConfigInterrupt(pin, NULL, NULL, 0, false); // userFunc as NULL acts as dettaching
}


/*
External Public Touch API Functions
*/
Expand All @@ -242,8 +244,6 @@ bool touchInterruptGetLastStatus(uint8_t pin) {
}
#endif



extern uint32_t touchRead(uint8_t) __attribute__ ((weak, alias("__touchRead")));
extern void touchAttachInterrupt(uint8_t, voidFuncPtr, uint32_t) __attribute__ ((weak, alias("__touchAttachInterrupt")));
extern void touchAttachInterruptArg(uint8_t, voidArgFuncPtr, void *, uint32_t) __attribute__ ((weak, alias("__touchAttachArgsInterrupt")));
Expand Down