Merge remote-tracking branch 'origin/3.3-dev' into wil-convert-same70-to-coren2g

1 files changed, 10 insertions, 0 deletions

diff --git a/src/Hardware/IoPorts.cpp b/src/Hardware/IoPorts.cpp
index e0bc71b8..9417cf36 100644
--- a/src/Hardware/IoPorts.cpp
+++ b/src/Hardware/IoPorts.cpp
@@ -30,6 +30,10 @@ using
 # include <CanId.h>
 #endif
 
+#if SUPPORT_REMOTE_COMMANDS
+# include <CAN/CanInterface.h>
+#endif
+
 // Read a port name parameter and assign some ports. Caller must call gb.Seen() with the appropriate letter and get 'true' returned before calling this.
 // Return the number of ports allocated, or 0 if there was an error with the error message in 'reply'.
 /*static*/ size_t IoPort::AssignPorts(GCodeBuffer& gb, const StringRef& reply, PinUsedBy neededFor, size_t numPorts, IoPort* const ports[], const PinAccess access[]) THROWS(GCodeException)
@@ -416,6 +420,12 @@ void IoPort::AppendPinName(const StringRef& str) const noexcept
 {
 	if (IsValid())
 	{
+#if SUPPORT_REMOTE_COMMANDS
+		if (CanInterface::InExpansionMode())
+		{
+			str.catf("%u.", CanInterface::GetCanAddress());
+		}
+#endif
 		if (GetInvert())
 		{
 			str.cat('!');