thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve Touch Calibration screen (#20524)

Browse Source
This commit is contained in:
X-Ryl669
2020-12-22 13:17:06 +01:00
committed by GitHub
parent 5e3be83dbb
commit 91730d71ff
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/lcd/tft_io/touch_calibration.cpp
View File

@@ -28,6 +28,7 @@ TouchCalibration touch_calibration;
touch_calibration_t TouchCalibration::calibration;
calibrationState TouchCalibration::calibration_state = CALIBRATION_NONE;
touch_calibration_point_t TouchCalibration::calibration_points[4];
uint8_t TouchCalibration::failed_count;
void TouchCalibration::validate_calibration() {
const bool landscape = validate_precision_x(0, 1) && validate_precision_x(2, 3) && validate_precision_y(0, 2) && validate_precision_y(1, 3);
@@ -44,6 +45,8 @@ void TouchCalibration::validate_calibration() {
else {
calibration_state = CALIBRATION_FAIL;
calibration_reset();
// Retry up to 5 times before reporting the failure
if (need_calibration() && failed_count++ < 5) calibration_state = CALIBRATION_TOP_LEFT;
}
if (calibration_state == CALIBRATION_SUCCESS) {