Various

Fixed bad JSON output from M409
Improved check for mixing spaces and tabs
Deviations in object model are now split into mean and deviation from
mean
StraightProbSettings no longer derives from ObjectModel

1 files changed, 2 insertions, 24 deletions

diff --git a/src/Movement/StraightProbeSettings.cpp b/src/Movement/StraightProbeSettings.cpp
index 270c0cc7..96ea014d 100644
--- a/src/Movement/StraightProbeSettings.cpp
+++ b/src/Movement/StraightProbeSettings.cpp
@@ -8,30 +8,6 @@
 #include "StraightProbeSettings.h"
 #include "RepRap.h"
 
-#if SUPPORT_OBJECT_MODEL
-
-// Object model table and functions
-// Note: if using GCC version 7.3.1 20180622 and lambda functions are used in this table, you must compile this file with option -std=gnu++17.
-// Otherwise the table will be allocated in RAM instead of flash, which wastes too much RAM.
-
-// Macro to build a standard lambda function that includes the necessary type conversions
-#define OBJECT_MODEL_FUNC(...) OBJECT_MODEL_FUNC_BODY(StraightProbeSettings, __VA_ARGS__)
-
-constexpr ObjectModelTableEntry StraightProbeSettings::objectModelTable[] =
-{
-	// These entries must be in alphabetical order
-	{ "movingAxes", OBJECT_MODEL_FUNC(self->movingAxes, TYPE_OF(Bitmap32)), ObjectModelEntryFlags::none },
-	{ "probeToUse", OBJECT_MODEL_FUNC((int32_t)self->probeToUse), ObjectModelEntryFlags::none },
-	//{ "target", OBJECT_MODEL_FUNC(&(self->target)), TYPE_OF(const float *), ObjectModelEntryFlags::none },
-	{ "type", OBJECT_MODEL_FUNC((uint32_t)self->type, TYPE_OF(Enum32)), ObjectModelEntryFlags::none },
-};
-
-constexpr uint8_t StraightProbeSettings::objectModelTableDescriptor[] = { 1, 3 };
-
-DEFINE_GET_OBJECT_MODEL_TABLE(StraightProbeSettings)
-
-#endif
-
 StraightProbeSettings::StraightProbeSettings() {
 	Reset();
 }
@@ -58,3 +34,5 @@ void StraightProbeSettings::SetCoordsToTarget(float coords[MaxAxes]) const {
 		coords[axis] = target[axis];
 	}
 }
+
+// End