From e06e19edf59d823fe84fb108d3d9d57b8a610519 Mon Sep 17 00:00:00 2001
From: Marek Bel <marek.bel@posta.cz>
Date: Tue, 7 Aug 2018 15:46:23 +0200
Subject: [PATCH] Fix showing calibration results.
Messages:
_i("XYZ calibration failed. Bed calibration point was not found.")
_T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
_i("XYZ calibration failed. Front calibration points not reachable.")
_i("XYZ calibration failed. Right front calibration point not reachable.")
_i("XYZ calibration failed. Left front calibration point not reachable.");
were never shown.
Fix compiler warnings:
sketch/ultralcd.cpp:3476:19: warning: comparison is always false due to limited range of data type [-Wtype-limits]
sketch/ultralcd.cpp:3478:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
---
Firmware/ultralcd.cpp | 2 +-
Firmware/ultralcd.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9c18586b..5c66a0af 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3470,7 +3470,7 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow
}
}
-void lcd_bed_calibration_show_result(uint8_t result, uint8_t point_too_far_mask)
+void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, uint8_t point_too_far_mask)
{
const char *msg = NULL;
if (result == BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND) {
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 77da5933..fb655ccb 100644
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -5,6 +5,7 @@
#include "lcd.h"
#include "conv2str.h"
#include "menu.h"
+#include "mesh_bed_calibration.h"
extern int lcd_puts_P(const char* str);
extern int lcd_printf_P(const char* format, ...);
@@ -143,7 +144,7 @@ extern const char* lcd_display_message_fullscreen_P(const char *msg);
#endif
// Show the result of the calibration process on the LCD screen.
- extern void lcd_bed_calibration_show_result(uint8_t result, uint8_t point_too_far_mask);
+ extern void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, uint8_t point_too_far_mask);
extern void lcd_diag_show_end_stops();