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

[P097] Updating code and (later) documentation #5165

Open
wants to merge 15 commits into
base: mega
Choose a base branch
from
Open

[P097] Updating code and (later) documentation #5165

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
de803d3
Update _P097_Esp32Touch.ino
chromoxdor Nov 18, 2024
2f29a76
Update _P097_Esp32Touch.ino
chromoxdor Nov 19, 2024
5deca7f
Update _P097_Esp32Touch.ino
chromoxdor Nov 19, 2024
0ac2200
Update _P097_Esp32Touch.ino
chromoxdor Nov 19, 2024
a14b322
Update _P097_Esp32Touch.ino
chromoxdor Nov 23, 2024
5c0ea76
Merge branch 'mega' into touchwake
chromoxdor Nov 23, 2024
b932e81
Update _P097_Esp32Touch.ino
chromoxdor Nov 25, 2024
7f32370
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
721d7bf
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
cff1557
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
b6222a3
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
be4938e
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
cc3f3ad
Update _P097_Esp32Touch.ino
chromoxdor Nov 27, 2024
0dc0e73
Update _P097_Esp32Touch.ino
chromoxdor Nov 28, 2024
8eab511
Update _P097_Esp32Touch.ino
chromoxdor Dec 1, 2024
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
13 changes: 7 additions & 6 deletions src/_P097_Esp32Touch.ino
View file
Open in desktop
chromoxdor marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
# define HAS_T0_INPUT 1
# define HAS_T10_TO_T14 0
# define LAST_TOUCH_INPUT_INDEX 10
# define P097_MAX_THRESHOLD_VALUE 4095
# endif // ifdef ESP32_CLASSIC
# if defined(ESP32S2) || defined(ESP32S3)
# define HAS_T0_INPUT 0

// temporary disabled since T10 to T14 are causing problems
// temporary disabled since T10 to T14 are causing problems
# define HAS_T10_TO_T14 0
# define LAST_TOUCH_INPUT_INDEX 14
# define P097_MAX_THRESHOLD_VALUE 500000 // couldn't find a max value but threshold for ESP32S2 & ESP32S3 is uint32_t
# endif // if defined(ESP32S2) || defined(ESP32S3)


Expand All @@ -27,10 +29,10 @@
# define PLUGIN_NAME_097 "Touch (ESP32) - internal"
# define PLUGIN_VALUENAME1_097 "Touch"
# define PLUGIN_VALUENAME2_097 "State"
# define P097_MAX_ADC_VALUE 4095
# define P097_MAX_LONGPRESS_VALUE 10000



# define P097_SEND_TOUCH_EVENT PCONFIG(0)
# define P097_SEND_RELEASE_EVENT PCONFIG(1)
# define P097_SEND_DURATION_EVENT PCONFIG(2)
Expand Down Expand Up @@ -106,7 +108,7 @@ boolean Plugin_097(uint8_t function, struct EventStruct *event, String& string)
{
addRowLabel(F("Analog Pin"));
addADC_PinSelect(AdcPinSelectPurpose::TouchOnly, F("taskdevicepin1"), CONFIG_PIN1);
# if (defined(ESP32S2) || defined(ESP32S3)) && !HASS_T10_TO_T14
# if (defined(ESP32S2) || defined(ESP32S3)) && !HAS_T10_TO_T14
addFormNote(F("For now touch pins T10 to T14 are not supported!"));
# endif // if (defined(ESP32S2) || defined(ESP32S3)) && !HASS_T10_TO_T14

Expand All @@ -124,7 +126,7 @@ boolean Plugin_097(uint8_t function, struct EventStruct *event, String& string)
addFormCheckBox(F("Send Touch Event"), F("sendtouch"), P097_SEND_TOUCH_EVENT);
addFormCheckBox(F("Send Release Event"), F("sendrelease"), P097_SEND_RELEASE_EVENT);
addFormCheckBox(F("Send Duration Event"), F("sendduration"), P097_SEND_DURATION_EVENT);
addFormNumericBox(F("Touch Threshold"), F("threshold"), P097_TOUCH_THRESHOLD, 0, P097_MAX_ADC_VALUE);
addFormNumericBox(F("Touch Threshold"), F("threshold"), P097_TOUCH_THRESHOLD, 0, P097_MAX_THRESHOLD_VALUE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This defined value is only defined for ESP32S2 and ESP32S3... Not sure why the name is changed?


// Show current value
addRowLabel(F("Current Pressure"));
Expand Down Expand Up @@ -177,7 +179,6 @@ boolean Plugin_097(uint8_t function, struct EventStruct *event, String& string)

if ((p097_pinTouched != 0) || (p097_pinTouchedPrev != 0)) {
// Some pin has been touched or released.
// Check if it is 'our' pin

const bool touched = bitRead(p097_pinTouched, t);
# ifdef ESP32_CLASSIC
Expand Down Expand Up @@ -307,7 +308,7 @@ boolean Plugin_097(uint8_t function, struct EventStruct *event, String& string)
/**********************************************************************************
* Touch pin callback functions
**********************************************************************************/
void P097_setEventParams(int pin, uint16_t threshold) {
void P097_setEventParams(int pin, touch_value_t threshold) {
int adc, ch, t;

if (getADC_gpio_info(pin, adc, ch, t)) {
Expand Down
Loading