Touch mode sensitivity replaced by threshold

Author: dc42

src/Endstops/RemoteZProbe.cpp

@@ -72,7 +72,7 @@ bool RemoteZProbe::SetProbing(bool isProbing) noexcept
 		{
 			// Send the sensitivity as a 16-bit integer in the lower half of the 32-bit parameter in the ChangeInputHandle message.
 			// We keep the upper bits free for future touch mode parameters.
-			rslt = CanInterface::ChangeHandleSetTouchMode(boardAddress, handle, (uint32_t)((uint16_t)(touchModeSensitivity * 65535.0)), reply.GetRef());
+			rslt = CanInterface::ChangeHandleSetTouchMode(boardAddress, handle, (uint32_t)((uint16_t)(touchModeThreshold * (65535.0/5.0))), reply.GetRef());
 		}
 	}
 	else

src/Endstops/ZProbe.cpp

@@ -114,8 +114,8 @@ constexpr ObjectModelTableEntry ZProbe::objectModelTable[] =
 #if SUPPORT_SCANNING_PROBES
 	// 1. probe.touchMode members
 	{ "active",						OBJECT_MODEL_FUNC(self->useTouchMode), 														ObjectModelEntryFlags::none },
-	{ "sensitivity",				OBJECT_MODEL_FUNC(self->touchModeSensitivity, 2), 											ObjectModelEntryFlags::none },
 	{ "speed",						OBJECT_MODEL_FUNC(InverseConvertSpeedToMmPerMin(self->touchModeProbeSpeed), 1),				ObjectModelEntryFlags::none },
+	{ "threshold",					OBJECT_MODEL_FUNC(self->touchModeThreshold, 2), 											ObjectModelEntryFlags::none },
 	{ "triggerHeight",				OBJECT_MODEL_FUNC(self->touchModeTriggerHeight, 3), 										ObjectModelEntryFlags::none },
 #endif
 };
@@ -574,7 +574,7 @@ GCodeResult ZProbe::SetTouchModeParameters(GCodeBuffer& gb, const StringRef& rep
 	bool seen = false;
 	gb.TryGetBValue('S', useTouchMode, seen);
 	gb.TryGetFValue('H', touchModeTriggerHeight, seen);
-	gb.TryGetLimitedFValue('V', touchModeSensitivity, seen, 0.0, 1.0);
+	gb.TryGetLimitedFValue('V', touchModeThreshold, seen, 0.0, 5.0);
 	{
 		float speed;
 		if (gb.TryGetPositiveFValue('F', speed, seen))
@@ -589,8 +589,8 @@ GCodeResult ZProbe::SetTouchModeParameters(GCodeBuffer& gb, const StringRef& rep
 	}
 	else
 	{
-		reply.printf("Z probe %u touch mode: %s" "active, speed %.1fmm/min, trigger height %.2fmm, sensitivity %.2f",
-						number, (useTouchMode) ? "" : "not ", (double)InverseConvertSpeedToMmPerMin(touchModeProbeSpeed), (double)touchModeTriggerHeight, (double)touchModeSensitivity);
+		reply.printf("Z probe %u touch mode: %s" "active, speed %.1fmm/min, trigger height %.2fmm, threshold %.2f",
+						number, (useTouchMode) ? "" : "not ", (double)InverseConvertSpeedToMmPerMin(touchModeProbeSpeed), (double)touchModeTriggerHeight, (double)touchModeThreshold);
 	}
 	return GCodeResult::ok;
 }

src/Endstops/ZProbe.h

@@ -124,7 +124,7 @@ class ZProbe : public EndstopOrZProbe
 	// Scanning support
 	float scanCoefficients[4];
 	float touchModeTriggerHeight = DefaultScanningProbeTouchModeTriggerHeight;
-	float touchModeSensitivity = DefaultScanningProbeTouchModeSensitivity;
+	float touchModeThreshold = DefaultScanningProbeTouchModeThreshold;
 	float touchModeProbeSpeed = ConvertSpeedFromMmPerMin(DefaultScanningProbeTouchModeProbeSpeed);
 	bool isCalibrated = false;
 	bool useTouchMode = false;

src/Version.h

@@ -10,7 +10,7 @@
 
 #ifndef VERSION
 // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
-# define MAIN_VERSION	"3.6.0-beta.4+4"
+# define MAIN_VERSION	"3.6.0-rc.1"
 # ifdef USE_CAN0
 #  define VERSION_SUFFIX	"(CAN0)"
 # else