LCD LIB
Fork of RA8875 by
RA8875_Touch.cpp@85:022bba13c5c4, 2015-01-13 (annotated)
- Committer:
- WiredHome
- Date:
- Tue Jan 13 12:31:44 2015 +0000
- Revision:
- 85:022bba13c5c4
- Parent:
- 83:7bad0068cca0
- Child:
- 88:bfddef6ec836
Improved error checking on several methods. In general, if the relevant coordinates of an object are offscreen, it will return bad_parameter, rather than to draw it badly.
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
WiredHome | 78:faf49c381591 | 1 | /// This file contains the RA8875 Touch panel methods. |
WiredHome | 78:faf49c381591 | 2 | /// |
WiredHome | 78:faf49c381591 | 3 | |
WiredHome | 78:faf49c381591 | 4 | #include "RA8875.h" |
WiredHome | 78:faf49c381591 | 5 | |
WiredHome | 83:7bad0068cca0 | 6 | #define NOTOUCH_TIMEOUT_uS 100000 |
WiredHome | 83:7bad0068cca0 | 7 | #define TOUCH_TICKER_uS 1000 |
WiredHome | 83:7bad0068cca0 | 8 | |
WiredHome | 78:faf49c381591 | 9 | // ### Touch Panel support code additions begin here |
WiredHome | 78:faf49c381591 | 10 | |
WiredHome | 78:faf49c381591 | 11 | RetCode_t RA8875::TouchPanelInit(void) |
WiredHome | 78:faf49c381591 | 12 | { |
WiredHome | 78:faf49c381591 | 13 | //TPCR0: Set enable bit, default sample time, wakeup, and ADC clock |
WiredHome | 78:faf49c381591 | 14 | WriteCommand(TPCR0, TP_ENABLE | TP_ADC_SAMPLE_DEFAULT_CLKS | TP_ADC_CLKDIV_DEFAULT); |
WiredHome | 78:faf49c381591 | 15 | // TPCR1: Set auto/manual, Ref voltage, debounce, manual mode params |
WiredHome | 78:faf49c381591 | 16 | WriteCommand(TPCR1, TP_MODE_DEFAULT | TP_DEBOUNCE_DEFAULT); |
WiredHome | 78:faf49c381591 | 17 | WriteCommand(INTC1, ReadCommand(INTC1) | RA8875_INT_TP); // reg INTC1: Enable Touch Panel Interrupts (D2 = 1) |
WiredHome | 78:faf49c381591 | 18 | WriteCommand(INTC2, RA8875_INT_TP); // reg INTC2: Clear any TP interrupt flag |
WiredHome | 83:7bad0068cca0 | 19 | touchSample = 0; |
WiredHome | 83:7bad0068cca0 | 20 | touchState = no_cal; |
WiredHome | 83:7bad0068cca0 | 21 | touchTicker.attach_us(this, &RA8875::_TouchTicker, TOUCH_TICKER_uS); |
WiredHome | 83:7bad0068cca0 | 22 | touchTimer.start(); |
WiredHome | 83:7bad0068cca0 | 23 | touchTimer.reset(); |
WiredHome | 78:faf49c381591 | 24 | return noerror; |
WiredHome | 78:faf49c381591 | 25 | } |
WiredHome | 78:faf49c381591 | 26 | |
WiredHome | 78:faf49c381591 | 27 | RetCode_t RA8875::TouchPanelInit(uint8_t bTpEnable, uint8_t bTpAutoManual, uint8_t bTpDebounce, uint8_t bTpManualMode, uint8_t bTpAdcClkDiv, uint8_t bTpAdcSampleTime) |
WiredHome | 78:faf49c381591 | 28 | { |
WiredHome | 78:faf49c381591 | 29 | // Parameter bounds check |
WiredHome | 78:faf49c381591 | 30 | if( \ |
WiredHome | 78:faf49c381591 | 31 | !(bTpEnable == TP_ENABLE || bTpEnable == TP_ENABLE) || \ |
WiredHome | 78:faf49c381591 | 32 | !(bTpAutoManual == TP_MODE_AUTO || bTpAutoManual == TP_MODE_MANUAL) || \ |
WiredHome | 78:faf49c381591 | 33 | !(bTpDebounce == TP_DEBOUNCE_OFF || bTpDebounce == TP_DEBOUNCE_ON) || \ |
WiredHome | 78:faf49c381591 | 34 | !(bTpManualMode <= TP_MANUAL_LATCH_Y) || \ |
WiredHome | 78:faf49c381591 | 35 | !(bTpAdcClkDiv <= TP_ADC_CLKDIV_128) || \ |
WiredHome | 78:faf49c381591 | 36 | !(bTpAdcSampleTime <= TP_ADC_SAMPLE_65536_CLKS) \ |
WiredHome | 78:faf49c381591 | 37 | ) return bad_parameter; |
WiredHome | 78:faf49c381591 | 38 | // Construct the config byte for TPCR0 and write them |
WiredHome | 78:faf49c381591 | 39 | WriteCommand(TPCR0, bTpEnable | bTpAdcClkDiv | bTpAdcSampleTime); // Note: Wakeup is never enabled |
WiredHome | 78:faf49c381591 | 40 | // Construct the config byte for TPCR1 and write them |
WiredHome | 78:faf49c381591 | 41 | WriteCommand(TPCR1, bTpManualMode | bTpDebounce | bTpManualMode); // Note: Always uses internal Vref. |
WiredHome | 78:faf49c381591 | 42 | // Set up the interrupt flag and enable bits |
WiredHome | 78:faf49c381591 | 43 | WriteCommand(INTC1, ReadCommand(INTC1) | RA8875_INT_TP); // reg INTC1: Enable Touch Panel Interrupts (D2 = 1) |
WiredHome | 78:faf49c381591 | 44 | WriteCommand(INTC2, RA8875_INT_TP); // reg INTC2: Clear any TP interrupt flag |
WiredHome | 83:7bad0068cca0 | 45 | touchSample = 0; |
WiredHome | 83:7bad0068cca0 | 46 | touchState = no_cal; |
WiredHome | 83:7bad0068cca0 | 47 | if (bTpEnable == TP_ENABLE) { |
WiredHome | 83:7bad0068cca0 | 48 | touchTicker.attach_us(this, &RA8875::_TouchTicker, TOUCH_TICKER_uS); |
WiredHome | 83:7bad0068cca0 | 49 | touchTimer.start(); |
WiredHome | 83:7bad0068cca0 | 50 | touchTimer.reset(); |
WiredHome | 83:7bad0068cca0 | 51 | } else { |
WiredHome | 83:7bad0068cca0 | 52 | touchTicker.detach(); |
WiredHome | 83:7bad0068cca0 | 53 | touchTimer.stop(); |
WiredHome | 83:7bad0068cca0 | 54 | } |
WiredHome | 78:faf49c381591 | 55 | return noerror; |
WiredHome | 78:faf49c381591 | 56 | } |
WiredHome | 78:faf49c381591 | 57 | |
WiredHome | 81:01da2e34283d | 58 | // +----------------------------------------------------+ |
WiredHome | 81:01da2e34283d | 59 | // | | |
WiredHome | 81:01da2e34283d | 60 | // | 1 | |
WiredHome | 81:01da2e34283d | 61 | // | | |
WiredHome | 81:01da2e34283d | 62 | // | | |
WiredHome | 81:01da2e34283d | 63 | // | 2 | |
WiredHome | 81:01da2e34283d | 64 | // | | |
WiredHome | 81:01da2e34283d | 65 | // | | |
WiredHome | 81:01da2e34283d | 66 | // | 3 | |
WiredHome | 81:01da2e34283d | 67 | // | | |
WiredHome | 81:01da2e34283d | 68 | // +----------------------------------------------------+ |
WiredHome | 81:01da2e34283d | 69 | |
WiredHome | 81:01da2e34283d | 70 | |
WiredHome | 81:01da2e34283d | 71 | RetCode_t RA8875::TouchPanelCalibrate(tpMatrix_t * matrix) |
WiredHome | 81:01da2e34283d | 72 | { |
WiredHome | 81:01da2e34283d | 73 | return TouchPanelCalibrate(NULL, matrix); |
WiredHome | 81:01da2e34283d | 74 | } |
WiredHome | 81:01da2e34283d | 75 | |
WiredHome | 81:01da2e34283d | 76 | |
WiredHome | 81:01da2e34283d | 77 | RetCode_t RA8875::TouchPanelCalibrate(const char * msg, tpMatrix_t * matrix) |
WiredHome | 81:01da2e34283d | 78 | { |
WiredHome | 81:01da2e34283d | 79 | point_t pTest[3]; |
WiredHome | 81:01da2e34283d | 80 | point_t pSample[3]; |
WiredHome | 83:7bad0068cca0 | 81 | int x,y; |
WiredHome | 81:01da2e34283d | 82 | |
WiredHome | 83:7bad0068cca0 | 83 | while (TouchPanelA2DFiltered(&x, &y)) |
WiredHome | 83:7bad0068cca0 | 84 | wait_ms(20); |
WiredHome | 81:01da2e34283d | 85 | cls(); |
WiredHome | 81:01da2e34283d | 86 | if (msg) |
WiredHome | 81:01da2e34283d | 87 | puts(msg); |
WiredHome | 81:01da2e34283d | 88 | SetTextCursor(0,height()/2); |
WiredHome | 81:01da2e34283d | 89 | pTest[0].x = 50; pTest[0].y = 50; |
WiredHome | 81:01da2e34283d | 90 | pTest[1].x = width() - 50; pTest[1].y = height()/2; |
WiredHome | 81:01da2e34283d | 91 | pTest[2].x = width()/2; pTest[2].y = height() - 50; |
WiredHome | 81:01da2e34283d | 92 | for (int i=0; i<3; i++) { |
WiredHome | 81:01da2e34283d | 93 | foreground(Blue); |
WiredHome | 81:01da2e34283d | 94 | printf(" (%3d,%3d) => ", pTest[i].x, pTest[i].y); |
WiredHome | 81:01da2e34283d | 95 | line(pTest[i].x-10, pTest[i].y, pTest[i].x+10, pTest[i].y, White); |
WiredHome | 81:01da2e34283d | 96 | line(pTest[i].x, pTest[i].y-10, pTest[i].x, pTest[i].y+10, White); |
WiredHome | 81:01da2e34283d | 97 | while (!TouchPanelA2DFiltered(&x, &y)) |
WiredHome | 81:01da2e34283d | 98 | wait_ms(20); |
WiredHome | 81:01da2e34283d | 99 | pSample[i].x = x; |
WiredHome | 81:01da2e34283d | 100 | pSample[i].y = y; |
WiredHome | 81:01da2e34283d | 101 | line(pTest[i].x-10, pTest[i].y, pTest[i].x+10, pTest[i].y, Black); |
WiredHome | 81:01da2e34283d | 102 | line(pTest[i].x, pTest[i].y-10, pTest[i].x, pTest[i].y+10, Black); |
WiredHome | 81:01da2e34283d | 103 | foreground(Blue); |
WiredHome | 81:01da2e34283d | 104 | printf(" (%4d,%4d)\r\n", x,y); |
WiredHome | 81:01da2e34283d | 105 | while (TouchPanelA2DFiltered(&x, &y)) |
WiredHome | 81:01da2e34283d | 106 | wait_ms(20); |
WiredHome | 81:01da2e34283d | 107 | wait(2); |
WiredHome | 81:01da2e34283d | 108 | } |
WiredHome | 81:01da2e34283d | 109 | return TouchPanelComputeCalibration(pTest, pSample, matrix); |
WiredHome | 81:01da2e34283d | 110 | } |
WiredHome | 81:01da2e34283d | 111 | |
WiredHome | 81:01da2e34283d | 112 | |
WiredHome | 81:01da2e34283d | 113 | /********************************************************************** |
WiredHome | 81:01da2e34283d | 114 | * |
WiredHome | 81:01da2e34283d | 115 | * Function: getDisplayPoint() |
WiredHome | 81:01da2e34283d | 116 | * |
WiredHome | 81:01da2e34283d | 117 | * Description: Given a valid set of calibration factors and a point |
WiredHome | 81:01da2e34283d | 118 | * value reported by the touch screen, this function |
WiredHome | 81:01da2e34283d | 119 | * calculates and returns the true (or closest to true) |
WiredHome | 81:01da2e34283d | 120 | * display point below the spot where the touch screen |
WiredHome | 81:01da2e34283d | 121 | * was touched. |
WiredHome | 81:01da2e34283d | 122 | * |
WiredHome | 81:01da2e34283d | 123 | * |
WiredHome | 81:01da2e34283d | 124 | * |
WiredHome | 81:01da2e34283d | 125 | * Argument(s): displayPtr (output) - Pointer to the calculated |
WiredHome | 81:01da2e34283d | 126 | * (true) display point. |
WiredHome | 81:01da2e34283d | 127 | * screenPtr (input) - Pointer to the reported touch |
WiredHome | 81:01da2e34283d | 128 | * screen point. |
WiredHome | 81:01da2e34283d | 129 | * matrixPtr (input) - Pointer to calibration factors |
WiredHome | 81:01da2e34283d | 130 | * matrix previously calculated |
WiredHome | 81:01da2e34283d | 131 | * from a call to |
WiredHome | 81:01da2e34283d | 132 | * setCalibrationMatrix() |
WiredHome | 81:01da2e34283d | 133 | * |
WiredHome | 81:01da2e34283d | 134 | * |
WiredHome | 81:01da2e34283d | 135 | * The function simply solves for Xd and Yd by implementing the |
WiredHome | 81:01da2e34283d | 136 | * computations required by the translation matrix. |
WiredHome | 81:01da2e34283d | 137 | * |
WiredHome | 81:01da2e34283d | 138 | * /- -\ |
WiredHome | 81:01da2e34283d | 139 | * /- -\ /- -\ | | |
WiredHome | 81:01da2e34283d | 140 | * | | | | | Xs | |
WiredHome | 81:01da2e34283d | 141 | * | Xd | | A B C | | | |
WiredHome | 81:01da2e34283d | 142 | * | | = | | * | Ys | |
WiredHome | 81:01da2e34283d | 143 | * | Yd | | D E F | | | |
WiredHome | 81:01da2e34283d | 144 | * | | | | | 1 | |
WiredHome | 81:01da2e34283d | 145 | * \- -/ \- -/ | | |
WiredHome | 81:01da2e34283d | 146 | * \- -/ |
WiredHome | 81:01da2e34283d | 147 | * |
WiredHome | 81:01da2e34283d | 148 | * It must be kept brief to avoid consuming CPU cycles. |
WiredHome | 81:01da2e34283d | 149 | * |
WiredHome | 81:01da2e34283d | 150 | * Return: OK - the display point was correctly calculated |
WiredHome | 81:01da2e34283d | 151 | * and its value is in the output argument. |
WiredHome | 81:01da2e34283d | 152 | * NOT_OK - an error was detected and the function |
WiredHome | 81:01da2e34283d | 153 | * failed to return a valid point. |
WiredHome | 81:01da2e34283d | 154 | * |
WiredHome | 81:01da2e34283d | 155 | * NOTE! NOTE! NOTE! |
WiredHome | 81:01da2e34283d | 156 | * |
WiredHome | 81:01da2e34283d | 157 | * setCalibrationMatrix() and getDisplayPoint() will do fine |
WiredHome | 81:01da2e34283d | 158 | * for you as they are, provided that your digitizer |
WiredHome | 81:01da2e34283d | 159 | * resolution does not exceed 10 bits (1024 values). Higher |
WiredHome | 81:01da2e34283d | 160 | * resolutions may cause the integer operations to overflow |
WiredHome | 81:01da2e34283d | 161 | * and return incorrect values. If you wish to use these |
WiredHome | 81:01da2e34283d | 162 | * functions with digitizer resolutions of 12 bits (4096 |
WiredHome | 81:01da2e34283d | 163 | * values) you will either have to a) use 64-bit signed |
WiredHome | 81:01da2e34283d | 164 | * integer variables and math, or b) judiciously modify the |
WiredHome | 81:01da2e34283d | 165 | * operations to scale results by a factor of 2 or even 4. |
WiredHome | 81:01da2e34283d | 166 | * |
WiredHome | 81:01da2e34283d | 167 | */ |
WiredHome | 83:7bad0068cca0 | 168 | TouchCode_t RA8875::TouchPanelReadable(point_t * TouchPoint) |
WiredHome | 81:01da2e34283d | 169 | { |
WiredHome | 83:7bad0068cca0 | 170 | int a2dX = 0; |
WiredHome | 83:7bad0068cca0 | 171 | int a2dY = 0; |
WiredHome | 81:01da2e34283d | 172 | |
WiredHome | 83:7bad0068cca0 | 173 | TouchCode_t ts = TouchPanelA2DFiltered(&a2dX, &a2dY); |
WiredHome | 83:7bad0068cca0 | 174 | if (ts != no_touch) { |
WiredHome | 81:01da2e34283d | 175 | if (tpMatrix.Divider != 0 && TouchPoint) { |
WiredHome | 81:01da2e34283d | 176 | /* Operation order is important since we are doing integer */ |
WiredHome | 81:01da2e34283d | 177 | /* math. Make sure you add all terms together before */ |
WiredHome | 81:01da2e34283d | 178 | /* dividing, so that the remainder is not rounded off */ |
WiredHome | 81:01da2e34283d | 179 | /* prematurely. */ |
WiredHome | 83:7bad0068cca0 | 180 | TouchPoint->x = ( (tpMatrix.An * a2dX) + |
WiredHome | 83:7bad0068cca0 | 181 | (tpMatrix.Bn * a2dY) + |
WiredHome | 81:01da2e34283d | 182 | tpMatrix.Cn |
WiredHome | 81:01da2e34283d | 183 | ) / tpMatrix.Divider ; |
WiredHome | 81:01da2e34283d | 184 | |
WiredHome | 83:7bad0068cca0 | 185 | TouchPoint->y = ( (tpMatrix.Dn * a2dX) + |
WiredHome | 83:7bad0068cca0 | 186 | (tpMatrix.En * a2dY) + |
WiredHome | 81:01da2e34283d | 187 | tpMatrix.Fn |
WiredHome | 81:01da2e34283d | 188 | ) / tpMatrix.Divider ; |
WiredHome | 81:01da2e34283d | 189 | } else { |
WiredHome | 83:7bad0068cca0 | 190 | ts = no_cal; |
WiredHome | 81:01da2e34283d | 191 | } |
WiredHome | 81:01da2e34283d | 192 | } |
WiredHome | 83:7bad0068cca0 | 193 | return ts; |
WiredHome | 81:01da2e34283d | 194 | } |
WiredHome | 81:01da2e34283d | 195 | |
WiredHome | 81:01da2e34283d | 196 | |
WiredHome | 85:022bba13c5c4 | 197 | TouchCode_t RA8875::TouchPanelGet(point_t * TouchPoint) |
WiredHome | 85:022bba13c5c4 | 198 | { |
WiredHome | 85:022bba13c5c4 | 199 | TouchCode_t t; |
WiredHome | 85:022bba13c5c4 | 200 | |
WiredHome | 85:022bba13c5c4 | 201 | do { |
WiredHome | 85:022bba13c5c4 | 202 | t = TouchPanelReadable(TouchPoint); |
WiredHome | 85:022bba13c5c4 | 203 | } while (t == no_touch); |
WiredHome | 85:022bba13c5c4 | 204 | return t; |
WiredHome | 85:022bba13c5c4 | 205 | } |
WiredHome | 85:022bba13c5c4 | 206 | |
WiredHome | 81:01da2e34283d | 207 | RetCode_t RA8875::TouchPanelSetMatrix(tpMatrix_t * matrixPtr) |
WiredHome | 81:01da2e34283d | 208 | { |
WiredHome | 81:01da2e34283d | 209 | if (matrixPtr == NULL || matrixPtr->Divider == 0) |
WiredHome | 81:01da2e34283d | 210 | return bad_parameter; |
WiredHome | 81:01da2e34283d | 211 | memcpy(&tpMatrix, matrixPtr, sizeof(tpMatrix_t)); |
WiredHome | 83:7bad0068cca0 | 212 | touchState = no_touch; |
WiredHome | 81:01da2e34283d | 213 | return noerror; |
WiredHome | 81:01da2e34283d | 214 | } |
WiredHome | 81:01da2e34283d | 215 | |
WiredHome | 81:01da2e34283d | 216 | |
WiredHome | 83:7bad0068cca0 | 217 | static void InsertionSort(int * buf, int bufsize) |
WiredHome | 83:7bad0068cca0 | 218 | { |
WiredHome | 83:7bad0068cca0 | 219 | int i, j; |
WiredHome | 83:7bad0068cca0 | 220 | int temp; |
WiredHome | 83:7bad0068cca0 | 221 | |
WiredHome | 83:7bad0068cca0 | 222 | for(i = 1; i <= bufsize; i++) { |
WiredHome | 83:7bad0068cca0 | 223 | temp = buf[i]; |
WiredHome | 83:7bad0068cca0 | 224 | j = i; |
WiredHome | 83:7bad0068cca0 | 225 | while( j && (buf[j-1] > temp) ) { |
WiredHome | 83:7bad0068cca0 | 226 | buf[j] = buf[j-1]; |
WiredHome | 83:7bad0068cca0 | 227 | j = j-1; |
WiredHome | 83:7bad0068cca0 | 228 | } |
WiredHome | 83:7bad0068cca0 | 229 | buf[j] = temp; |
WiredHome | 83:7bad0068cca0 | 230 | } // End of sort |
WiredHome | 83:7bad0068cca0 | 231 | } |
WiredHome | 83:7bad0068cca0 | 232 | |
WiredHome | 83:7bad0068cca0 | 233 | |
WiredHome | 83:7bad0068cca0 | 234 | void RA8875::_TouchTicker(void) |
WiredHome | 78:faf49c381591 | 235 | { |
WiredHome | 83:7bad0068cca0 | 236 | if (touchTimer.read_us() > NOTOUCH_TIMEOUT_uS) { |
WiredHome | 83:7bad0068cca0 | 237 | touchSample = 0; |
WiredHome | 83:7bad0068cca0 | 238 | if (touchState == held) |
WiredHome | 83:7bad0068cca0 | 239 | touchState = release; |
WiredHome | 83:7bad0068cca0 | 240 | else |
WiredHome | 83:7bad0068cca0 | 241 | touchState = no_touch; |
WiredHome | 83:7bad0068cca0 | 242 | touchTimer.reset(); |
WiredHome | 83:7bad0068cca0 | 243 | } |
WiredHome | 83:7bad0068cca0 | 244 | } |
WiredHome | 83:7bad0068cca0 | 245 | |
WiredHome | 83:7bad0068cca0 | 246 | TouchCode_t RA8875::TouchPanelA2DRaw(int *x, int *y) |
WiredHome | 83:7bad0068cca0 | 247 | { |
WiredHome | 83:7bad0068cca0 | 248 | if( (ReadCommand(INTC2) & RA8875_INT_TP) ) { // Test for TP Interrupt pending in register INTC2 |
WiredHome | 83:7bad0068cca0 | 249 | touchTimer.reset(); |
WiredHome | 83:7bad0068cca0 | 250 | *y = ReadCommand(TPYH) << 2 | ( (ReadCommand(TPXYL) & 0xC) >> 2 ); // D[9:2] from reg TPYH, D[1:0] from reg TPXYL[3:2] |
WiredHome | 83:7bad0068cca0 | 251 | *x = ReadCommand(TPXH) << 2 | ( (ReadCommand(TPXYL) & 0x3) ); // D[9:2] from reg TPXH, D[1:0] from reg TPXYL[1:0] |
WiredHome | 83:7bad0068cca0 | 252 | WriteCommand(INTC2, RA8875_INT_TP); // reg INTC2: Clear that TP interrupt flag |
WiredHome | 83:7bad0068cca0 | 253 | touchState = touch; |
WiredHome | 83:7bad0068cca0 | 254 | } else { |
WiredHome | 83:7bad0068cca0 | 255 | touchState = no_touch; |
WiredHome | 83:7bad0068cca0 | 256 | } |
WiredHome | 83:7bad0068cca0 | 257 | return touchState; |
WiredHome | 83:7bad0068cca0 | 258 | } |
WiredHome | 83:7bad0068cca0 | 259 | |
WiredHome | 83:7bad0068cca0 | 260 | TouchCode_t RA8875::TouchPanelA2DFiltered(int *x, int *y) |
WiredHome | 83:7bad0068cca0 | 261 | { |
WiredHome | 83:7bad0068cca0 | 262 | static int xbuf[TPBUFSIZE], ybuf[TPBUFSIZE]; |
WiredHome | 83:7bad0068cca0 | 263 | static int lastX, lastY; |
WiredHome | 83:7bad0068cca0 | 264 | int i, j; |
WiredHome | 83:7bad0068cca0 | 265 | TouchCode_t ret = touchState; |
WiredHome | 78:faf49c381591 | 266 | |
WiredHome | 78:faf49c381591 | 267 | if( (ReadCommand(INTC2) & RA8875_INT_TP) ) { // Test for TP Interrupt pending in register INTC2 |
WiredHome | 83:7bad0068cca0 | 268 | touchTimer.reset(); |
WiredHome | 78:faf49c381591 | 269 | // Get the next data samples |
WiredHome | 83:7bad0068cca0 | 270 | ybuf[touchSample] = ReadCommand(TPYH) << 2 | ( (ReadCommand(TPXYL) & 0xC) >> 2 ); // D[9:2] from reg TPYH, D[1:0] from reg TPXYL[3:2] |
WiredHome | 83:7bad0068cca0 | 271 | xbuf[touchSample] = ReadCommand(TPXH) << 2 | ( (ReadCommand(TPXYL) & 0x3) ); // D[9:2] from reg TPXH, D[1:0] from reg TPXYL[1:0] |
WiredHome | 78:faf49c381591 | 272 | // Check for a complete set |
WiredHome | 83:7bad0068cca0 | 273 | if(++touchSample == TPBUFSIZE) { |
WiredHome | 78:faf49c381591 | 274 | // Buffers are full, so process them using Finn's method described in Analog Dialogue No. 44, Feb 2010 |
WiredHome | 78:faf49c381591 | 275 | // This requires sorting the samples in order of size, then discarding the top 25% and |
WiredHome | 78:faf49c381591 | 276 | // bottom 25% as noise spikes. Finally, the middle 50% of the values are averaged to |
WiredHome | 78:faf49c381591 | 277 | // reduce Gaussian noise. |
WiredHome | 83:7bad0068cca0 | 278 | #if 1 |
WiredHome | 83:7bad0068cca0 | 279 | InsertionSort(ybuf, TPBUFSIZE); |
WiredHome | 83:7bad0068cca0 | 280 | InsertionSort(xbuf, TPBUFSIZE); |
WiredHome | 83:7bad0068cca0 | 281 | #else |
WiredHome | 78:faf49c381591 | 282 | // Sort the Y buffer using an Insertion Sort |
WiredHome | 78:faf49c381591 | 283 | for(i = 1; i <= TPBUFSIZE; i++) { |
WiredHome | 78:faf49c381591 | 284 | temp = ybuf[i]; |
WiredHome | 78:faf49c381591 | 285 | j = i; |
WiredHome | 78:faf49c381591 | 286 | while( j && (ybuf[j-1] > temp) ) { |
WiredHome | 78:faf49c381591 | 287 | ybuf[j] = ybuf[j-1]; |
WiredHome | 78:faf49c381591 | 288 | j = j-1; |
WiredHome | 78:faf49c381591 | 289 | } |
WiredHome | 78:faf49c381591 | 290 | ybuf[j] = temp; |
WiredHome | 78:faf49c381591 | 291 | } // End of Y sort |
WiredHome | 78:faf49c381591 | 292 | // Sort the X buffer the same way |
WiredHome | 78:faf49c381591 | 293 | for(i = 1; i <= TPBUFSIZE; i++) { |
WiredHome | 78:faf49c381591 | 294 | temp = xbuf[i]; |
WiredHome | 78:faf49c381591 | 295 | j = i; |
WiredHome | 78:faf49c381591 | 296 | while( j && (xbuf[j-1] > temp) ) { |
WiredHome | 78:faf49c381591 | 297 | xbuf[j] = xbuf[j-1]; |
WiredHome | 78:faf49c381591 | 298 | j = j-1; |
WiredHome | 78:faf49c381591 | 299 | } |
WiredHome | 78:faf49c381591 | 300 | xbuf[j] = temp; |
WiredHome | 78:faf49c381591 | 301 | } // End of X sort |
WiredHome | 83:7bad0068cca0 | 302 | #endif |
WiredHome | 78:faf49c381591 | 303 | // Average the middle half of the Y values and report them |
WiredHome | 78:faf49c381591 | 304 | j = 0; |
WiredHome | 78:faf49c381591 | 305 | for(i = (TPBUFSIZE/4) - 1; i < TPBUFSIZE - TPBUFSIZE/4; i++ ) { |
WiredHome | 78:faf49c381591 | 306 | j += ybuf[i]; |
WiredHome | 78:faf49c381591 | 307 | } |
WiredHome | 83:7bad0068cca0 | 308 | *y = lastY = j * (float)2/TPBUFSIZE; // This is the average |
WiredHome | 78:faf49c381591 | 309 | // Average the middle half of the X values and report them |
WiredHome | 78:faf49c381591 | 310 | j = 0; |
WiredHome | 78:faf49c381591 | 311 | for(i = (TPBUFSIZE/4) - 1; i < TPBUFSIZE - TPBUFSIZE/4; i++ ) { |
WiredHome | 78:faf49c381591 | 312 | j += xbuf[i]; |
WiredHome | 78:faf49c381591 | 313 | } |
WiredHome | 83:7bad0068cca0 | 314 | *x = lastX = j * (float)2/TPBUFSIZE; // This is the average |
WiredHome | 78:faf49c381591 | 315 | // Tidy up and return |
WiredHome | 83:7bad0068cca0 | 316 | if (touchState == touch || touchState == held) |
WiredHome | 83:7bad0068cca0 | 317 | touchState = held; |
WiredHome | 83:7bad0068cca0 | 318 | else |
WiredHome | 83:7bad0068cca0 | 319 | touchState = touch; |
WiredHome | 83:7bad0068cca0 | 320 | ret = touchState; |
WiredHome | 83:7bad0068cca0 | 321 | touchSample = 0; // Ready to start on the next set of data samples |
WiredHome | 78:faf49c381591 | 322 | } else { |
WiredHome | 78:faf49c381591 | 323 | // Buffer not yet full, so do not return any results yet |
WiredHome | 83:7bad0068cca0 | 324 | if (touchState == touch || touchState == held) { |
WiredHome | 83:7bad0068cca0 | 325 | *x = lastX; |
WiredHome | 83:7bad0068cca0 | 326 | *y = lastY; |
WiredHome | 83:7bad0068cca0 | 327 | ret = touchState = held; |
WiredHome | 83:7bad0068cca0 | 328 | } |
WiredHome | 78:faf49c381591 | 329 | } |
WiredHome | 78:faf49c381591 | 330 | WriteCommand(INTC2, RA8875_INT_TP); // reg INTC2: Clear that TP interrupt flag |
WiredHome | 78:faf49c381591 | 331 | } // End of initial if -- data has been read and processed |
WiredHome | 83:7bad0068cca0 | 332 | else { |
WiredHome | 83:7bad0068cca0 | 333 | if (touchState == touch || touchState == held) { |
WiredHome | 83:7bad0068cca0 | 334 | *x = lastX; |
WiredHome | 83:7bad0068cca0 | 335 | *y = lastY; |
WiredHome | 83:7bad0068cca0 | 336 | ret = touchState = held; |
WiredHome | 83:7bad0068cca0 | 337 | } else if (touchState == release) { |
WiredHome | 83:7bad0068cca0 | 338 | *x = lastX; |
WiredHome | 83:7bad0068cca0 | 339 | *y = lastY; |
WiredHome | 83:7bad0068cca0 | 340 | ret = release; |
WiredHome | 83:7bad0068cca0 | 341 | touchState = no_touch; |
WiredHome | 83:7bad0068cca0 | 342 | } |
WiredHome | 83:7bad0068cca0 | 343 | } |
WiredHome | 83:7bad0068cca0 | 344 | return ret; |
WiredHome | 78:faf49c381591 | 345 | } |
WiredHome | 78:faf49c381591 | 346 | |
WiredHome | 78:faf49c381591 | 347 | /* The following section is derived from Carlos E. Vidales. |
WiredHome | 78:faf49c381591 | 348 | * |
WiredHome | 78:faf49c381591 | 349 | * Copyright (c) 2001, Carlos E. Vidales. All rights reserved. |
WiredHome | 78:faf49c381591 | 350 | * |
WiredHome | 78:faf49c381591 | 351 | * This sample program was written and put in the public domain |
WiredHome | 78:faf49c381591 | 352 | * by Carlos E. Vidales. The program is provided "as is" |
WiredHome | 78:faf49c381591 | 353 | * without warranty of any kind, either expressed or implied. |
WiredHome | 78:faf49c381591 | 354 | * If you choose to use the program within your own products |
WiredHome | 78:faf49c381591 | 355 | * you do so at your own risk, and assume the responsibility |
WiredHome | 78:faf49c381591 | 356 | * for servicing, repairing or correcting the program should |
WiredHome | 78:faf49c381591 | 357 | * it prove defective in any manner. |
WiredHome | 78:faf49c381591 | 358 | * You may copy and distribute the program's source code in any |
WiredHome | 78:faf49c381591 | 359 | * medium, provided that you also include in each copy an |
WiredHome | 78:faf49c381591 | 360 | * appropriate copyright notice and disclaimer of warranty. |
WiredHome | 78:faf49c381591 | 361 | * You may also modify this program and distribute copies of |
WiredHome | 78:faf49c381591 | 362 | * it provided that you include prominent notices stating |
WiredHome | 78:faf49c381591 | 363 | * that you changed the file(s) and the date of any change, |
WiredHome | 78:faf49c381591 | 364 | * and that you do not charge any royalties or licenses for |
WiredHome | 78:faf49c381591 | 365 | * its use. |
WiredHome | 78:faf49c381591 | 366 | * |
WiredHome | 78:faf49c381591 | 367 | * This file contains functions that implement calculations |
WiredHome | 78:faf49c381591 | 368 | * necessary to obtain calibration factors for a touch screen |
WiredHome | 78:faf49c381591 | 369 | * that suffers from multiple distortion effects: namely, |
WiredHome | 78:faf49c381591 | 370 | * translation, scaling and rotation. |
WiredHome | 78:faf49c381591 | 371 | * |
WiredHome | 78:faf49c381591 | 372 | * The following set of equations represent a valid display |
WiredHome | 78:faf49c381591 | 373 | * point given a corresponding set of touch screen points: |
WiredHome | 78:faf49c381591 | 374 | * |
WiredHome | 78:faf49c381591 | 375 | * /- -\ |
WiredHome | 78:faf49c381591 | 376 | * /- -\ /- -\ | | |
WiredHome | 78:faf49c381591 | 377 | * | | | | | Xs | |
WiredHome | 78:faf49c381591 | 378 | * | Xd | | A B C | | | |
WiredHome | 78:faf49c381591 | 379 | * | | = | | * | Ys | |
WiredHome | 78:faf49c381591 | 380 | * | Yd | | D E F | | | |
WiredHome | 78:faf49c381591 | 381 | * | | | | | 1 | |
WiredHome | 78:faf49c381591 | 382 | * \- -/ \- -/ | | |
WiredHome | 78:faf49c381591 | 383 | * \- -/ |
WiredHome | 78:faf49c381591 | 384 | * where: |
WiredHome | 78:faf49c381591 | 385 | * (Xd,Yd) represents the desired display point |
WiredHome | 78:faf49c381591 | 386 | * coordinates, |
WiredHome | 78:faf49c381591 | 387 | * (Xs,Ys) represents the available touch screen |
WiredHome | 78:faf49c381591 | 388 | * coordinates, and the matrix |
WiredHome | 78:faf49c381591 | 389 | * /- -\ |
WiredHome | 78:faf49c381591 | 390 | * |A,B,C| |
WiredHome | 78:faf49c381591 | 391 | * |D,E,F| represents the factors used to translate |
WiredHome | 78:faf49c381591 | 392 | * \- -/ the available touch screen point values |
WiredHome | 78:faf49c381591 | 393 | * into the corresponding display |
WiredHome | 78:faf49c381591 | 394 | * coordinates. |
WiredHome | 78:faf49c381591 | 395 | * Note that for practical considerations, the utilities |
WiredHome | 78:faf49c381591 | 396 | * within this file do not use the matrix coefficients as |
WiredHome | 78:faf49c381591 | 397 | * defined above, but instead use the following |
WiredHome | 78:faf49c381591 | 398 | * equivalents, since floating point math is not used: |
WiredHome | 78:faf49c381591 | 399 | * A = An/Divider |
WiredHome | 78:faf49c381591 | 400 | * B = Bn/Divider |
WiredHome | 78:faf49c381591 | 401 | * C = Cn/Divider |
WiredHome | 78:faf49c381591 | 402 | * D = Dn/Divider |
WiredHome | 78:faf49c381591 | 403 | * E = En/Divider |
WiredHome | 78:faf49c381591 | 404 | * F = Fn/Divider |
WiredHome | 78:faf49c381591 | 405 | * The functions provided within this file are: |
WiredHome | 78:faf49c381591 | 406 | * setCalibrationMatrix() - calculates the set of factors |
WiredHome | 78:faf49c381591 | 407 | * in the above equation, given |
WiredHome | 78:faf49c381591 | 408 | * three sets of test points. |
WiredHome | 78:faf49c381591 | 409 | * getDisplayPoint() - returns the actual display |
WiredHome | 78:faf49c381591 | 410 | * coordinates, given a set of |
WiredHome | 78:faf49c381591 | 411 | * touch screen coordinates. |
WiredHome | 78:faf49c381591 | 412 | * translateRawScreenCoordinates() - helper function to transform |
WiredHome | 78:faf49c381591 | 413 | * raw screen points into values |
WiredHome | 78:faf49c381591 | 414 | * scaled to the desired display |
WiredHome | 78:faf49c381591 | 415 | * resolution. |
WiredHome | 78:faf49c381591 | 416 | */ |
WiredHome | 78:faf49c381591 | 417 | |
WiredHome | 78:faf49c381591 | 418 | /********************************************************************** |
WiredHome | 78:faf49c381591 | 419 | * |
WiredHome | 78:faf49c381591 | 420 | * Function: setCalibrationMatrix() |
WiredHome | 78:faf49c381591 | 421 | * |
WiredHome | 78:faf49c381591 | 422 | * Description: Calling this function with valid input data |
WiredHome | 78:faf49c381591 | 423 | * in the display and screen input arguments |
WiredHome | 78:faf49c381591 | 424 | * causes the calibration factors between the |
WiredHome | 78:faf49c381591 | 425 | * screen and display points to be calculated, |
WiredHome | 78:faf49c381591 | 426 | * and the output argument - matrixPtr - to be |
WiredHome | 78:faf49c381591 | 427 | * populated. |
WiredHome | 78:faf49c381591 | 428 | * |
WiredHome | 78:faf49c381591 | 429 | * This function needs to be called only when new |
WiredHome | 78:faf49c381591 | 430 | * calibration factors are desired. |
WiredHome | 78:faf49c381591 | 431 | * |
WiredHome | 78:faf49c381591 | 432 | * |
WiredHome | 78:faf49c381591 | 433 | * Argument(s): displayPtr (input) - Pointer to an array of three |
WiredHome | 78:faf49c381591 | 434 | * sample, reference points. |
WiredHome | 78:faf49c381591 | 435 | * screenPtr (input) - Pointer to the array of touch |
WiredHome | 78:faf49c381591 | 436 | * screen points corresponding |
WiredHome | 78:faf49c381591 | 437 | * to the reference display points. |
WiredHome | 78:faf49c381591 | 438 | * matrixPtr (output) - Pointer to the calibration |
WiredHome | 78:faf49c381591 | 439 | * matrix computed for the set |
WiredHome | 78:faf49c381591 | 440 | * of points being provided. |
WiredHome | 78:faf49c381591 | 441 | * |
WiredHome | 78:faf49c381591 | 442 | * |
WiredHome | 78:faf49c381591 | 443 | * From the article text, recall that the matrix coefficients are |
WiredHome | 78:faf49c381591 | 444 | * resolved to be the following: |
WiredHome | 78:faf49c381591 | 445 | * |
WiredHome | 78:faf49c381591 | 446 | * |
WiredHome | 78:faf49c381591 | 447 | * Divider = (Xs0 - Xs2)*(Ys1 - Ys2) - (Xs1 - Xs2)*(Ys0 - Ys2) |
WiredHome | 78:faf49c381591 | 448 | * |
WiredHome | 78:faf49c381591 | 449 | * |
WiredHome | 78:faf49c381591 | 450 | * |
WiredHome | 78:faf49c381591 | 451 | * (Xd0 - Xd2)*(Ys1 - Ys2) - (Xd1 - Xd2)*(Ys0 - Ys2) |
WiredHome | 78:faf49c381591 | 452 | * A = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 453 | * Divider |
WiredHome | 78:faf49c381591 | 454 | * |
WiredHome | 78:faf49c381591 | 455 | * |
WiredHome | 78:faf49c381591 | 456 | * (Xs0 - Xs2)*(Xd1 - Xd2) - (Xd0 - Xd2)*(Xs1 - Xs2) |
WiredHome | 78:faf49c381591 | 457 | * B = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 458 | * Divider |
WiredHome | 78:faf49c381591 | 459 | * |
WiredHome | 78:faf49c381591 | 460 | * |
WiredHome | 78:faf49c381591 | 461 | * Ys0*(Xs2*Xd1 - Xs1*Xd2) + |
WiredHome | 78:faf49c381591 | 462 | * Ys1*(Xs0*Xd2 - Xs2*Xd0) + |
WiredHome | 78:faf49c381591 | 463 | * Ys2*(Xs1*Xd0 - Xs0*Xd1) |
WiredHome | 78:faf49c381591 | 464 | * C = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 465 | * Divider |
WiredHome | 78:faf49c381591 | 466 | * |
WiredHome | 78:faf49c381591 | 467 | * |
WiredHome | 78:faf49c381591 | 468 | * (Yd0 - Yd2)*(Ys1 - Ys2) - (Yd1 - Yd2)*(Ys0 - Ys2) |
WiredHome | 78:faf49c381591 | 469 | * D = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 470 | * Divider |
WiredHome | 78:faf49c381591 | 471 | * |
WiredHome | 78:faf49c381591 | 472 | * |
WiredHome | 78:faf49c381591 | 473 | * (Xs0 - Xs2)*(Yd1 - Yd2) - (Yd0 - Yd2)*(Xs1 - Xs2) |
WiredHome | 78:faf49c381591 | 474 | * E = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 475 | * Divider |
WiredHome | 78:faf49c381591 | 476 | * |
WiredHome | 78:faf49c381591 | 477 | * |
WiredHome | 78:faf49c381591 | 478 | * Ys0*(Xs2*Yd1 - Xs1*Yd2) + |
WiredHome | 78:faf49c381591 | 479 | * Ys1*(Xs0*Yd2 - Xs2*Yd0) + |
WiredHome | 78:faf49c381591 | 480 | * Ys2*(Xs1*Yd0 - Xs0*Yd1) |
WiredHome | 78:faf49c381591 | 481 | * F = --------------------------------------------------- |
WiredHome | 78:faf49c381591 | 482 | * Divider |
WiredHome | 78:faf49c381591 | 483 | * |
WiredHome | 78:faf49c381591 | 484 | * |
WiredHome | 78:faf49c381591 | 485 | * Return: OK - the calibration matrix was correctly |
WiredHome | 78:faf49c381591 | 486 | * calculated and its value is in the |
WiredHome | 78:faf49c381591 | 487 | * output argument. |
WiredHome | 78:faf49c381591 | 488 | * NOT_OK - an error was detected and the |
WiredHome | 78:faf49c381591 | 489 | * function failed to return a valid |
WiredHome | 78:faf49c381591 | 490 | * set of matrix values. |
WiredHome | 78:faf49c381591 | 491 | * The only time this sample code returns |
WiredHome | 78:faf49c381591 | 492 | * NOT_OK is when Divider == 0 |
WiredHome | 78:faf49c381591 | 493 | * |
WiredHome | 78:faf49c381591 | 494 | * |
WiredHome | 78:faf49c381591 | 495 | * |
WiredHome | 78:faf49c381591 | 496 | * NOTE! NOTE! NOTE! |
WiredHome | 78:faf49c381591 | 497 | * |
WiredHome | 78:faf49c381591 | 498 | * setCalibrationMatrix() and getDisplayPoint() will do fine |
WiredHome | 78:faf49c381591 | 499 | * for you as they are, provided that your digitizer |
WiredHome | 78:faf49c381591 | 500 | * resolution does not exceed 10 bits (1024 values). Higher |
WiredHome | 78:faf49c381591 | 501 | * resolutions may cause the integer operations to overflow |
WiredHome | 78:faf49c381591 | 502 | * and return incorrect values. If you wish to use these |
WiredHome | 78:faf49c381591 | 503 | * functions with digitizer resolutions of 12 bits (4096 |
WiredHome | 78:faf49c381591 | 504 | * values) you will either have to a) use 64-bit signed |
WiredHome | 78:faf49c381591 | 505 | * integer variables and math, or b) judiciously modify the |
WiredHome | 78:faf49c381591 | 506 | * operations to scale results by a factor of 2 or even 4. |
WiredHome | 78:faf49c381591 | 507 | * |
WiredHome | 78:faf49c381591 | 508 | */ |
WiredHome | 81:01da2e34283d | 509 | RetCode_t RA8875::TouchPanelComputeCalibration(point_t * displayPtr, point_t * screenPtr, tpMatrix_t * matrixPtr) |
WiredHome | 78:faf49c381591 | 510 | { |
WiredHome | 78:faf49c381591 | 511 | RetCode_t retValue = noerror; |
WiredHome | 78:faf49c381591 | 512 | |
WiredHome | 78:faf49c381591 | 513 | tpMatrix.Divider = ((screenPtr[0].x - screenPtr[2].x) * (screenPtr[1].y - screenPtr[2].y)) - |
WiredHome | 78:faf49c381591 | 514 | ((screenPtr[1].x - screenPtr[2].x) * (screenPtr[0].y - screenPtr[2].y)) ; |
WiredHome | 78:faf49c381591 | 515 | |
WiredHome | 78:faf49c381591 | 516 | if( tpMatrix.Divider == 0 ) { |
WiredHome | 78:faf49c381591 | 517 | retValue = bad_parameter; |
WiredHome | 78:faf49c381591 | 518 | } else { |
WiredHome | 78:faf49c381591 | 519 | tpMatrix.An = ((displayPtr[0].x - displayPtr[2].x) * (screenPtr[1].y - screenPtr[2].y)) - |
WiredHome | 78:faf49c381591 | 520 | ((displayPtr[1].x - displayPtr[2].x) * (screenPtr[0].y - screenPtr[2].y)) ; |
WiredHome | 78:faf49c381591 | 521 | |
WiredHome | 78:faf49c381591 | 522 | tpMatrix.Bn = ((screenPtr[0].x - screenPtr[2].x) * (displayPtr[1].x - displayPtr[2].x)) - |
WiredHome | 78:faf49c381591 | 523 | ((displayPtr[0].x - displayPtr[2].x) * (screenPtr[1].x - screenPtr[2].x)) ; |
WiredHome | 78:faf49c381591 | 524 | |
WiredHome | 78:faf49c381591 | 525 | tpMatrix.Cn = (screenPtr[2].x * displayPtr[1].x - screenPtr[1].x * displayPtr[2].x) * screenPtr[0].y + |
WiredHome | 78:faf49c381591 | 526 | (screenPtr[0].x * displayPtr[2].x - screenPtr[2].x * displayPtr[0].x) * screenPtr[1].y + |
WiredHome | 78:faf49c381591 | 527 | (screenPtr[1].x * displayPtr[0].x - screenPtr[0].x * displayPtr[1].x) * screenPtr[2].y ; |
WiredHome | 78:faf49c381591 | 528 | |
WiredHome | 78:faf49c381591 | 529 | tpMatrix.Dn = ((displayPtr[0].y - displayPtr[2].y) * (screenPtr[1].y - screenPtr[2].y)) - |
WiredHome | 78:faf49c381591 | 530 | ((displayPtr[1].y - displayPtr[2].y) * (screenPtr[0].y - screenPtr[2].y)) ; |
WiredHome | 78:faf49c381591 | 531 | |
WiredHome | 78:faf49c381591 | 532 | tpMatrix.En = ((screenPtr[0].x - screenPtr[2].x) * (displayPtr[1].y - displayPtr[2].y)) - |
WiredHome | 78:faf49c381591 | 533 | ((displayPtr[0].y - displayPtr[2].y) * (screenPtr[1].x - screenPtr[2].x)) ; |
WiredHome | 78:faf49c381591 | 534 | |
WiredHome | 78:faf49c381591 | 535 | tpMatrix.Fn = (screenPtr[2].x * displayPtr[1].y - screenPtr[1].x * displayPtr[2].y) * screenPtr[0].y + |
WiredHome | 78:faf49c381591 | 536 | (screenPtr[0].x * displayPtr[2].y - screenPtr[2].x * displayPtr[0].y) * screenPtr[1].y + |
WiredHome | 78:faf49c381591 | 537 | (screenPtr[1].x * displayPtr[0].y - screenPtr[0].x * displayPtr[1].y) * screenPtr[2].y ; |
WiredHome | 83:7bad0068cca0 | 538 | touchState = no_touch; |
WiredHome | 78:faf49c381591 | 539 | if (matrixPtr) |
WiredHome | 78:faf49c381591 | 540 | memcpy(matrixPtr, &tpMatrix, sizeof(tpMatrix_t)); |
WiredHome | 78:faf49c381591 | 541 | } |
WiredHome | 78:faf49c381591 | 542 | return( retValue ) ; |
WiredHome | 78:faf49c381591 | 543 | } |
WiredHome | 78:faf49c381591 | 544 | |
WiredHome | 78:faf49c381591 | 545 | // #### end of touch panel code additions |