Reduce max # of reported axes in the OM, report the value in 'limits'

Author: dc42

src/Config/Configuration.h

@@ -176,12 +176,13 @@ constexpr size_t MinimumBuffersForObjectModel = 20;		// Minimum number of free b
 #elif SAM4E || SAM4S
 constexpr size_t OUTPUT_BUFFER_SIZE = 256;				// How many bytes does each OutputBuffer hold?
 constexpr size_t OUTPUT_BUFFER_COUNT = 26;				// How many OutputBuffer instances do we have?
-constexpr size_t RESERVED_OUTPUT_BUFFERS = 1;			// Number of reserved output buffers after long responses, enough to hold a status response
+constexpr size_t RESERVED_OUTPUT_BUFFERS = 2;			// Number of reserved output buffers after long responses, enough to hold a status response
 constexpr size_t MinimumBuffersForObjectModel = 20;		// Minimum number of free buffers we want before we start assembling a request for the object model
 #else
 # error Unsupported processor
 #endif
 
+constexpr size_t MaxReportedAxes = 6;					// This used to be fixed at 9 but that's too big for some Duet 2 configurations
 constexpr size_t maxQueuedCodes = 16;					// How many codes can be queued?
 
 #if SAME70 || SAME5x

src/Movement/Move.cpp

@@ -140,7 +140,7 @@ DEFINE_GET_OBJECT_MODEL_ARRAY_TABLE(Move)
 
 size_t Move::GetMaxElementsToReturn(const ObjectModelArrayTableEntry *entry) const noexcept
 {
-	return (entry == &objectModelArrayTable[0]) ? 9 : 0;				// return at most 9 elements of move.axes
+	return (entry == &objectModelArrayTable[0]) ? MaxReportedAxes : 0;				// return at most this number of elements of move.axes unless just move.axes is requested
 }
 
 static inline const char *_ecv_array GetFilamentName(size_t extruder) noexcept

src/Platform/RepRap.cpp

@@ -312,6 +312,7 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] =
 #endif
 	{ "monitorsPerHeater",		OBJECT_MODEL_FUNC_NOSELF((int32_t)MaxMonitorsPerHeater),				ObjectModelEntryFlags::verbose },
 	{ "portsPerHeater",			OBJECT_MODEL_FUNC_NOSELF((int32_t)MaxPortsPerHeater),					ObjectModelEntryFlags::verbose },
+	{ "reportedAxes",			OBJECT_MODEL_FUNC_NOSELF((int32_t)MaxReportedAxes),						ObjectModelEntryFlags::verbose },
 	{ "restorePoints",			OBJECT_MODEL_FUNC_NOSELF((int32_t)NumVisibleRestorePoints),				ObjectModelEntryFlags::verbose },
 	{ "sensors",				OBJECT_MODEL_FUNC_NOSELF((int32_t)MaxSensors),							ObjectModelEntryFlags::verbose },
 	{ "spindles",				OBJECT_MODEL_FUNC_NOSELF((int32_t)MaxSpindles),							ObjectModelEntryFlags::verbose },
@@ -420,7 +421,7 @@ constexpr uint8_t RepRap::objectModelTableDescriptor[] =
 #else
 	0,																						// directories
 #endif
-	26 + SUPPORT_LED_STRIPS,																// limits
+	27 + SUPPORT_LED_STRIPS,																// limits
 	22 + HAS_VOLTAGE_MONITOR + SUPPORT_LASER,												// state
 	2,																						// state.beep
 	12 + (unsigned int)HAS_NETWORKING + (2 * HAS_MASS_STORAGE) + ((unsigned int)HAS_MASS_STORAGE | (unsigned int)HAS_EMBEDDED_FILES | (unsigned int)HAS_SBC_INTERFACE) + SUPPORT_LED_STRIPS,	// seqs