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

Add setThresholds() and variables to hold the thresholds #47

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add setThresholds() and variables to hold the thresholds #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions XPT2046_Touchscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

#include "XPT2046_Touchscreen.h"

#define Z_THRESHOLD 300
#define Z_THRESHOLD_INT 75
#define MSEC_THRESHOLD 3
#define SPI_SETTING SPISettings(2000000, MSBFIRST, SPI_MODE0)

Expand All @@ -48,7 +46,7 @@ bool XPT2046_Touchscreen::begin(SPIClass &wspi)
#define FLEXSPI_SETTING FlexIOSPISettings(2000000, MSBFIRST, SPI_MODE0)
bool XPT2046_Touchscreen::begin(FlexIOSPI &wflexspi)
{
_pspi = nullptr; // make sure we dont use this one...
_pspi = nullptr; // make sure we dont use this one...
_pflexspi = &wflexspi;
_pflexspi->begin();
pinMode(csPin, OUTPUT);
Expand Down Expand Up @@ -84,7 +82,7 @@ bool XPT2046_Touchscreen::tirqTouched()
bool XPT2046_Touchscreen::touched()
{
update();
return (zraw >= Z_THRESHOLD);
return (zraw >= Z_Threshold);
}

void XPT2046_Touchscreen::readData(uint16_t *x, uint16_t *y, uint8_t *z)
Expand Down Expand Up @@ -132,7 +130,7 @@ void XPT2046_Touchscreen::update()
z = z1 + 4095;
int16_t z2 = _pspi->transfer16(0x91 /* X */) >> 3;
z -= z2;
if (z >= Z_THRESHOLD) {
if (z >= Z_Threshold) {
_pspi->transfer16(0x91 /* X */); // dummy X measure, 1st is always noisy
data[0] = _pspi->transfer16(0xD1 /* Y */) >> 3;
data[1] = _pspi->transfer16(0x91 /* X */) >> 3; // make 3 x-y measurements
Expand All @@ -144,7 +142,7 @@ void XPT2046_Touchscreen::update()
data[5] = _pspi->transfer16(0) >> 3;
digitalWrite(csPin, HIGH);
_pspi->endTransaction();
}
}
#if defined(_FLEXIO_SPI_H_)
else if (_pflexspi) {
_pflexspi->beginTransaction(FLEXSPI_SETTING);
Expand All @@ -154,7 +152,7 @@ void XPT2046_Touchscreen::update()
z = z1 + 4095;
int16_t z2 = _pflexspi->transfer16(0x91 /* X */) >> 3;
z -= z2;
if (z >= Z_THRESHOLD) {
if (z >= Z_Threshold) {
_pflexspi->transfer16(0x91 /* X */); // dummy X measure, 1st is always noisy
data[0] = _pflexspi->transfer16(0xD1 /* Y */) >> 3;
data[1] = _pflexspi->transfer16(0x91 /* X */) >> 3; // make 3 x-y measurements
Expand All @@ -169,31 +167,31 @@ void XPT2046_Touchscreen::update()

}
#endif
// If we do not have either _pspi or _pflexspi than bail.
// If we do not have either _pspi or _pflexspi then bail.
else return;

//Serial.printf("z=%d :: z1=%d, z2=%d ", z, z1, z2);
if (z < 0) z = 0;
if (z < Z_THRESHOLD) { // if ( !touched ) {
if (z < Z_Threshold) { // if ( !touched ) {
// Serial.println();
zraw = 0;
if (z < Z_THRESHOLD_INT) { // if ( !touched ) {
if (z < Z_Threshold_int) { // if ( !touched ) {
if (255 != tirqPin) isrWake = false;
}
return;
}
zraw = z;

// Average pair with least distance between each measured x then y
//Serial.printf(" z1=%d,z2=%d ", z1, z2);
//Serial.printf("p=%d, %d,%d %d,%d %d,%d", zraw,
//data[0], data[1], data[2], data[3], data[4], data[5]);
int16_t x = besttwoavg( data[0], data[2], data[4] );
int16_t y = besttwoavg( data[1], data[3], data[5] );

//Serial.printf(" %d,%d", x, y);
//Serial.println();
if (z >= Z_THRESHOLD) {
if (z >= Z_Threshold) {
msraw = now; // good read completed, set wait
switch (rotation) {
case 0:
Expand Down
7 changes: 7 additions & 0 deletions XPT2046_Touchscreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
#error "Arduino 1.6.0 or later (SPI library) is required"
#endif

// Initial thresholds, for press and for clearing interrupt flag.
#define Z_THRESHOLD 400
#define Z_THRESHOLD_INT 75

class TS_Point {
public:
TS_Point(void) : x(0), y(0), z(0) {}
Expand All @@ -61,13 +65,16 @@ class XPT2046_Touchscreen {
bool bufferEmpty();
uint8_t bufferSize() { return 1; }
void setRotation(uint8_t n) { rotation = n % 4; }
void setThresholds(uint16_t Z_Threshold_press = Z_THRESHOLD, uint16_t Z_Threshold_interrupt = Z_THRESHOLD_INT) {
Z_Threshold = Z_Threshold_press; Z_Threshold_Int = Z_Threshold_interrupt; }
// protected:
volatile bool isrWake=true;

private:
void update();
uint8_t csPin, tirqPin, rotation=1;
int16_t xraw=0, yraw=0, zraw=0;
int16_t Z_Threshold=Z_THRESHOLD, Z_Threshold_Int=Z_THRESHOLD_INT;
uint32_t msraw=0x80000000;
SPIClass *_pspi = nullptr;
#if defined(_FLEXIO_SPI_H_)
Expand Down