sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5 TSD: Fix to prohibit reading samples when not valid

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-17 17:26:06 -06:00
parent c6533b6402
commit dda776d27c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nxwm/src/ccalibration.cxx
View File

@ -1156,7 +1156,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data)
data.left.slope = (bottomX - topX) / (bottomY - topY); data.left.slope = (bottomX - topX) / (bottomY - topY);
data.left.offset = topX - topY * data.left.slope; data.left.offset = topX - topY * data.left.slope;
idbg("Left slope: %f offset: %f\n", data.left.slope, data.left.offset); idbg("Left slope: %f6.2 offset: %f6.2\n", data.left.slope, data.left.offset);
topX = (float)m_calibData[CALIB_UPPER_RIGHT_INDEX].x; topX = (float)m_calibData[CALIB_UPPER_RIGHT_INDEX].x;
bottomX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x; bottomX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x;
@ -1167,7 +1167,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data)
data.right.slope = (bottomX - topX) / (bottomY - topY); data.right.slope = (bottomX - topX) / (bottomY - topY);
data.right.offset = topX - topY * data.right.slope; data.right.offset = topX - topY * data.right.slope;
idbg("Right slope: %f offset: %f\n", data.right.slope, data.right.offset); idbg("Right slope: %f6.2 offset: %f6.2\n", data.right.slope, data.right.offset);
// Y lines: // Y lines:
// //
@ -1185,7 +1185,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data)
data.top.slope = (rightY - leftY) / (rightX - leftX); data.top.slope = (rightY - leftY) / (rightX - leftX);
data.top.offset = leftY - leftX * data.top.slope; data.top.offset = leftY - leftX * data.top.slope;
idbg("Top slope: %f offset: %f\n", data.top.slope, data.top.offset); idbg("Top slope: %f6.2 offset: %f6.2\n", data.top.slope, data.top.offset);
leftX = (float)m_calibData[CALIB_LOWER_LEFT_INDEX].x; leftX = (float)m_calibData[CALIB_LOWER_LEFT_INDEX].x;
rightX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x; rightX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x;
@ -1196,7 +1196,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data)
data.bottom.slope = (rightY - leftY) / (rightX - leftX); data.bottom.slope = (rightY - leftY) / (rightX - leftX);
data.bottom.offset = leftY - leftX * data.bottom.slope; data.bottom.offset = leftY - leftX * data.bottom.slope;
idbg("Bottom slope: %f offset: %f\n", data.bottom.slope, data.bottom.offset); idbg("Bottom slope: %f6.2 offset: %f6.2\n", data.bottom.slope, data.bottom.offset);
// Save also the calibration screen positions // Save also the calibration screen positions

5
nxwm/src/ctouchscreen.cxx
View File

@ -531,6 +531,8 @@ void CTouchscreen::handleMouseInput(struct touch_sample_s *sample)
x = (nxgl_coord_t)scaledX; x = (nxgl_coord_t)scaledX;
y = (nxgl_coord_t)scaledY; y = (nxgl_coord_t)scaledY;
vdbg("raw: (%f6.2, %f6.2) scaled: (%f6.2, %f6.2) (%d, %d)\n",
rawX, rawY, scaledX, scaledY, x, y);
#else #else
// We have valid coordinates. Get the raw touch // We have valid coordinates. Get the raw touch
// position from the sample // position from the sample
@ -577,9 +579,8 @@ void CTouchscreen::handleMouseInput(struct touch_sample_s *sample)
y = (nxgl_coord_t)bigY; y = (nxgl_coord_t)bigY;
} }
#endif
vdbg("raw: (%d, %d) scaled: (%d, %d)\n", rawX, rawY, x, y); vdbg("raw: (%d, %d) scaled: (%d, %d)\n", rawX, rawY, x, y);
#endif
} }
// Get the server handle and "inject the mouse data // Get the server handle and "inject the mouse data