fix(UI): request data for up to 10 axes

Author: AndyEveritt

README.md

@@ -56,7 +56,7 @@ Multiple methods are available to connect the Duet3D screen to a mainboard. The
 2. In the GUI, select the USB connection method.
 
 > [!NOTE]
-> When the Duet3D screen detects a USB connection to a Duet3D mainboard, it will automatically send `M575 P0 S0` to configure the mainboard for USB communication.
+> When the Duet3D screen detects a USB connection to a Duet3D mainboard, it will automatically send `M575 P0 S4` to configure the mainboard for USB communication.
 
 ### WiFi
 > [!NOTE]
@@ -79,7 +79,7 @@ Multiple methods are available to connect the Duet3D screen to a mainboard. The
 1. Connect the Duet3D screen to the mainboard using a UART cable.
     - Use connector `UART Duet` on the screen.
 2. In the GUI, select the UART connection method.
-3. Set the baud rate on the mainboard to `115200`. use `M575 P1 S1 B115200` in config.g, this is similar to connecting a PanelDue, other than the default baud rate is 115200
+3. Set the baud rate on the mainboard to `115200`. use `M575 P1 S4 B115200` in config.g, this is similar to connecting a PanelDue, other than the default baud rate is 115200
 
 #### Wiring
 For a Duet3 IO0 port for UART is as follows:

src/Comm/Commands.h

@@ -29,6 +29,7 @@ namespace Comm
 		rcvSeqsHeat,
 		rcvSeqsInputs,
 		rcvSeqsJob,
+		rcvSeqsLimits,
 		rcvSeqsMove,
 		rcvSeqsNetwork,
 		rcvSeqsReply,

src/Comm/Communication.cpp

@@ -152,6 +152,7 @@ namespace Comm
 			}
 		}
 
+		LOG_WARN("Received key '{:s}' does not match any known seq", key);
 		return nullptr;
 	}
 

src/Comm/JsonDecoder.cpp

@@ -174,6 +174,7 @@ namespace Comm
 		m_fieldPrefix.Clear();
 		m_fieldId.Clear();
 		m_fieldVal.Clear();
+		m_key.Clear();
 		m_state = jsBegin;
 		m_lastState = jsBegin;
 		m_serialIoErrors = 0;
@@ -208,6 +209,8 @@ namespace Comm
 			m_seq = nullptr;
 		}
 
+		m_key.Clear();
+
 		responseType = ResponseType::unknown;
 		responseData = nullptr;
 	}
@@ -216,7 +219,7 @@ namespace Comm
 	void JsonDecoder::ProcessReceivedValue(StringRef id, const char data[], const size_t indices[])
 	{
 		ZoneScoped;
-		LOG_VERBOSE("{:s} (indices [{:d}|{:d}|{:d}|{:d}]) = '{:s}'",
+		LOG_VERBOSE("'{:s}' (indices [{:d}|{:d}|{:d}|{:d}]) = '{:s}'",
 					id.c_str(),
 					indices[0],
 					indices[1],
@@ -233,9 +236,9 @@ namespace Comm
 			// modifier)
 
 			id.Erase(0, 6);
-			if (m_seq != nullptr && strcasecmp(m_seq->key, "") != 0)
+			if (!m_key.IsEmpty())
 			{
-				id.Prepend(m_seq->key);
+				id.Prepend(m_key.c_str());
 			}
 			else
 			{
@@ -269,6 +272,8 @@ namespace Comm
 			{
 				m_seq = FindSeqByKey(data);
 			}
+			m_key.copy(data);
+			m_key.ReplaceAll('.', ':');
 			break;
 		}
 
@@ -358,15 +363,15 @@ namespace Comm
 	void JsonDecoder::RemoveLastId()
 	{
 		ZoneScoped;
-		// LOG_VERBOSE("{:s}, len: {:d}", m_fieldId.c_str(), m_fieldId.strlen());
+		LOG_VERBOSE("{:s}, len: {:d}", m_fieldId.c_str(), m_fieldId.strlen());
 		size_t index = m_fieldId.strlen();
 		while (index != 0 && m_fieldId[index - 1] != '^' && m_fieldId[index - 1] != ':')
 		{
 			--index;
 		}
 		m_fieldId.Truncate(index);
 
-		// LOG_VERBOSE("{:s}, len: {:d}", m_fieldId.c_str(), m_fieldId.strlen());
+		LOG_VERBOSE("{:s}, len: {:d}", m_fieldId.c_str(), m_fieldId.strlen());
 	}
 
 	void JsonDecoder::RemoveLastIdChar()

src/Comm/JsonDecoder.h

@@ -108,6 +108,7 @@ namespace Comm
 		size_t m_arrayIndices[MAX_ARRAY_NESTING];
 		size_t m_arrayDepth;
 		Seq* m_seq = nullptr;
+		String<50> m_key; // for OM responses
 	};
 } // namespace Comm
 #endif /* JNI_COMM_JSONDECODER_H_ */

src/Configuration.h

@@ -89,6 +89,8 @@ constexpr unsigned int MAX_HEATERS = 32;
 constexpr unsigned int MAX_SENSORS = 32;
 constexpr unsigned int MAX_ENDSTOPS = 20;
 constexpr size_t MAX_TRACKED_OBJECTS = 40;
+constexpr size_t MAX_REPORTED_AXES =
+	5; // RRF only reports 5 axes in the `move` object, need to request `move.axes` to get the rest
 
 /* Console */
 constexpr unsigned int MAX_COMMAND_LENGTH = 50;

src/Subscribers/MoveSubscribers.cpp

@@ -1,5 +1,6 @@
 #include "Debug.h"
 
+#include "Hardware/Duet.h"
 #include "MoveSubscribers.h"
 #include "ObjectModel/Axis.h"
 #include "ObjectModel/Heightmap.h"
@@ -340,6 +341,19 @@ bool MoveSubscribers::axesArrayEnd(Comm::JsonDecoder* decoder, const size_t indi
 {
 	ZoneScoped;
 	UNUSED(decoder);
+	const Comm::Seq* seq = decoder->GetSeq();
+	if (seq && seq->seqid == Comm::rcvSeqsMove && indices[0] >= MAX_REPORTED_AXES)
+	{
+		/**
+		 * There might be more axes available
+		 *
+		 * TODO: this won't handle the case where the single `move.axes` request still doesn't return all axes but it
+		 * can handle 10 currently. Will need to check the `next` field in the response to handle more than that.
+		 * Likely I will postpone handling that until the Duet comms are reworked to handle request/response IDs (#69)
+		 */
+		Comm::DUET.RequestModel("move.axes", "vna0");
+		return true;
+	}
 	OM::Move::RemoveAxis(indices[0], true);
 	Model::get().post<EventType::AxesData>();
 	return true;

src/UI/Screens/Move/MoveView.cpp

@@ -62,6 +62,7 @@ namespace UI
 		m_messageBox.cancelVisible(true);
 
 		/* Axis Control */
+		m_axisControlCont.setFlag(LV_OBJ_FLAG_SCROLLABLE, false);
 		m_axisControlCont.setHeight(LV_PCT(100));
 		m_axisControlCont.setFlexGrow(1);
 		m_axisControlCont.setFlexFlow(LV_FLEX_FLOW_ROW);
@@ -173,10 +174,11 @@ namespace UI
 		m_zControl.setLabelCallback([this](char axis_letter, float position)
 									{ configureNumberpadForAxis(axis_letter, position); });
 
+		m_genericAxisControls.setFlexGrow(1);
 		m_genericAxisControls.setSize(LV_SIZE_CONTENT, LV_PCT(100));
 		m_genericAxisControls.setListSize(LV_SIZE_CONTENT, LV_PCT(100));
 		// m_genericAxisControls.setFlexGrow(1);
-		m_genericAxisControls.setMaxWidth(LV_PCT(60));
+		m_genericAxisControls.setMaxWidth(LV_SIZE_CONTENT);
 		m_genericAxisControls.setListFlow(LV_FLEX_FLOW_ROW);
 		m_genericAxisControls.addStyle(Themes::getLvglStyles().no_border);
 		m_genericAxisControls.addStyle(Themes::getLvglStyles().pad_zero);

tests/object_model/test_bench/model_10_axes.json

@@ -0,0 +1 @@
+{"key":"move.axes","flags":"vna0","result":[{"acceleration":2000.0,"babystep":0,"backlash":0,"current":1300,"drivers":["0.4"],"homed":true,"jerk":600.0,"letter":"X","machinePosition":0,"max":355.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":600.0,"reducedAcceleration":1000.0,"speed":33000.0,"stepPos":0,"stepsPerMm":43.61,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":2000.0,"babystep":0,"backlash":0,"current":1300,"drivers":["0.5"],"homed":true,"jerk":600.0,"letter":"Y","machinePosition":0,"max":355.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":600.0,"reducedAcceleration":1000.0,"speed":33000.0,"stepPos":0,"stepsPerMm":43.61,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":300.0,"babystep":0,"backlash":0,"current":1400,"drivers":["0.2","0.1","0.0"],"homed":true,"jerk":40.0,"letter":"Z","machinePosition":0,"max":315.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":40.0,"reducedAcceleration":200.0,"speed":2500.0,"stepPos":0,"stepsPerMm":426.67,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.6"],"homed":true,"jerk":900.0,"letter":"U","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.4"],"homed":true,"jerk":900.0,"letter":"V","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.3"],"homed":false,"jerk":900.0,"letter":"D","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.0"],"homed":false,"jerk":900.0,"letter":"A","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.1"],"homed":false,"jerk":900.0,"letter":"B","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.2"],"homed":false,"jerk":900.0,"letter":"C","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]},{"acceleration":1000.0,"babystep":0,"backlash":0,"current":0,"drivers":["1.1"],"homed":false,"jerk":900.0,"letter":"b","machinePosition":0,"max":200.00,"maxProbed":false,"microstepping":{"interpolated":true,"value":16},"min":0,"minProbed":false,"percentCurrent":100,"percentStstCurrent":71,"phaseStep":false,"printingJerk":900.0,"reducedAcceleration":1000.0,"speed":6000.0,"stepPos":0,"stepsPerMm":80.00,"userPosition":0,"visible":true,"workplaceOffsets":[0,0,0,0,0,0,0,0,0]}],"next":10}