yuzu/MCUFRIEND_kbv
1
0
Fork 0
mirror of https://github.com/YuzuZensai/MCUFRIEND_kbv.git synced 2026-01-31 14:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

crosshair colours BLUE-WHITE-RED. Warn unusual calibration, missing Touch pins.

Browse Source
This commit is contained in:
prenticedavid
2019-09-23 10:30:08 +01:00
parent aaf8cce0ac
commit 2ce860c6fc
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/TouchScreen_Calibr_native/TouchScreen_Calibr_native.ino
View File

@@ -30,9 +30,14 @@ TSPoint_kbv tp; //global point
#define WHITE 0xFFFF #define WHITE 0xFFFF
#define RED 0xF800 #define RED 0xF800
#define GRAY 0x8410 #define BLUE 0x001F
#define GREEN 0x07E0
#define BLACK 0x0000 #define BLACK 0x0000
//#define GRAY 0x2408 //un-highlighted cross-hair
#define GRAY BLUE //idle cross-hair colour
#define GRAY_DONE RED //finished cross-hair
void readResistiveTouch(void) void readResistiveTouch(void)
{ {
tp = ts.getPoint(); tp = ts.getPoint();
@@ -129,7 +134,8 @@ boolean diagnose_pins()
ts = TouchScreen_kbv(XP, YP, XM, YM, 300); //re-initialise with pins ts = TouchScreen_kbv(XP, YP, XM, YM, 300); //re-initialise with pins
return true; //success return true; //success
} }
Serial.println(F("BROKEN TOUCHSCREEN")); if (found == 0) Serial.println(F("MISSING TOUCHSCREEN"));
else Serial.println(F("BROKEN TOUCHSCREEN"));
return false; return false;
} }
@@ -266,7 +272,7 @@ void calibrate(int x, int y, int i, String msg)
drawCrossHair(x, y, WHITE); drawCrossHair(x, y, WHITE);
readCoordinates(); readCoordinates();
centerprint("* RELEASE *", text_y_center); centerprint("* RELEASE *", text_y_center);
drawCrossHair(x, y, GRAY); drawCrossHair(x, y, GRAY_DONE);
rx[i] = cx; rx[i] = cx;
ry[i] = cy; ry[i] = cy;
Serial.print("\r\ncx="); Serial.print(cx); Serial.print("\r\ncx="); Serial.print(cx);
@@ -343,6 +349,13 @@ void report()
sprintf(buf, "y = map(p.x, TOP=%d, BOT=%d, 0, %d)", TS_TOP, TS_BOT, TS_HT); sprintf(buf, "y = map(p.x, TOP=%d, BOT=%d, 0, %d)", TS_TOP, TS_BOT, TS_HT);
tft.println(buf); tft.println(buf);
Serial.println(buf); Serial.println(buf);
int16_t x_range = TS_LEFT - TS_RT, y_range = TS_TOP - TS_BOT;
if (abs(x_range) > 800 && abs(y_range) > 700) //LANDSCAPE
return;
sprintf(buf, "\n*** UNUSUAL CALIBRATION RANGES %d %d", x_range, y_range);
tft.println(buf);
Serial.println(buf);
} }
void drawCrossHair(int x, int y, uint16_t color) void drawCrossHair(int x, int y, uint16_t color)