Remove text added to Description property by Remote Client

Peter-Simpson · Peter-Simpson · commit f8a0f1a16049 · 2020-06-23T20:53:24.000+01:00
The additional characters added by the Remote Client caused a Conform failure if the remote device description was more than 30 characters long. This change permits the full 68 characters to be available to the remote device.
diff --git a/Remote Client Device Base Classes/Camera Base Class.cs b/Remote Client Device Base Classes/Camera Base Class.cs
@@ -153,7 +153,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -164,9 +164,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/Dome Base Class.cs b/Remote Client Device Base Classes/Dome Base Class.cs
@@ -152,7 +152,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -163,9 +163,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/FilterWheel Base Class.cs b/Remote Client Device Base Classes/FilterWheel Base Class.cs
@@ -183,7 +183,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -197,9 +197,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/Focuser Base Class.cs b/Remote Client Device Base Classes/Focuser Base Class.cs
@@ -153,7 +153,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -164,9 +164,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/ObservingConditions Base Class.cs b/Remote Client Device Base Classes/ObservingConditions Base Class.cs
@@ -151,7 +151,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -162,9 +162,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/Rotator Base Class.cs b/Remote Client Device Base Classes/Rotator Base Class.cs
@@ -153,7 +153,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -164,9 +164,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/SafetyMonitor Base Class.cs b/Remote Client Device Base Classes/SafetyMonitor Base Class.cs
@@ -151,7 +151,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -162,9 +162,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/Switch Base Class.cs b/Remote Client Device Base Classes/Switch Base Class.cs
@@ -151,7 +151,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -162,9 +162,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }
diff --git a/Remote Client Device Base Classes/Telescope Base Class.cs b/Remote Client Device Base Classes/Telescope Base Class.cs
@@ -154,7 +154,7 @@ public string Description
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));
+                string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);
                 TL.LogMessage(clientNumber, "Description", response);
                 return response;
             }
@@ -165,9 +165,9 @@ public string DriverInfo
             get
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
-                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
                 string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);
+                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public string Description`
`153`	`153`	`get`
`154`	`154`	`{`
`155`	`155`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`156`		`- string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));`
	`156`	`+ string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);`
`157`	`157`	`TL.LogMessage(clientNumber, "Description", response);`
`158`	`158`	`return response;`
`159`	`159`	`}`
`@@ -164,9 +164,9 @@ public string DriverInfo`
`164`	`164`	`get`
`165`	`165`	`{`
`166`	`166`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`167`		`- Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;`
	`167`	`+ Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`168`	`168`	`string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`169`		`- string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);`
	`169`	`+ string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
`170`	`170`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`171`	`171`	`return response;`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public string Description`
`152`	`152`	`get`
`153`	`153`	`{`
`154`	`154`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`155`		`- string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));`
	`155`	`+ string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);`
`156`	`156`	`TL.LogMessage(clientNumber, "Description", response);`
`157`	`157`	`return response;`
`158`	`158`	`}`
`@@ -163,9 +163,9 @@ public string DriverInfo`
`163`	`163`	`get`
`164`	`164`	`{`
`165`	`165`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`166`		`- Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;`
	`166`	`+ Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`167`	`167`	`string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`168`		`- string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);`
	`168`	`+ string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
`169`	`169`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`170`	`170`	`return response;`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public string Description`
`183`	`183`	`get`
`184`	`184`	`{`
`185`	`185`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`186`		`- string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));`
	`186`	`+ string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);`
`187`	`187`	`TL.LogMessage(clientNumber, "Description", response);`
`188`	`188`	`return response;`
`189`	`189`	`}`
`@@ -197,9 +197,9 @@ public string DriverInfo`
`197`	`197`	`get`
`198`	`198`	`{`
`199`	`199`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`200`		`- Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;`
	`200`	`+ Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`201`	`201`	`string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`202`		`- string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);`
	`202`	`+ string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
`203`	`203`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`204`	`204`	`return response;`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public string Description`
`151`	`151`	`get`
`152`	`152`	`{`
`153`	`153`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`154`		`- string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));`
	`154`	`+ string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);`
`155`	`155`	`TL.LogMessage(clientNumber, "Description", response);`
`156`	`156`	`return response;`
`157`	`157`	`}`
`@@ -162,9 +162,9 @@ public string DriverInfo`
`162`	`162`	`get`
`163`	`163`	`{`
`164`	`164`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`165`		`- Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;`
	`165`	`+ Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`166`	`166`	`string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`167`		`- string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);`
	`167`	`+ string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
`168`	`168`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`169`	`169`	`return response;`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public string Description`
`154`	`154`	`get`
`155`	`155`	`{`
`156`	`156`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`157`		`- string response = string.Format("{0} REMOTE DRIVER: {1}", DriverDisplayName, RemoteClientDriver.Description(clientNumber, client, URIBase, TL));`
	`157`	`+ string response = RemoteClientDriver.Description(clientNumber, client, URIBase, TL);`
`158`	`158`	`TL.LogMessage(clientNumber, "Description", response);`
`159`	`159`	`return response;`
`160`	`160`	`}`
`@@ -165,9 +165,9 @@ public string DriverInfo`
`165`	`165`	`get`
`166`	`166`	`{`
`167`	`167`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`168`		`- Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;`
	`168`	`+ Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`169`	`169`	`string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`170`		`- string response = string.Format("{0} Version {1}, REMOTE DRIVER: {2}", DriverDisplayName, version.ToString(), remoteString);`
	`170`	`+ string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
`171`	`171`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`172`	`172`	`return response;`
`173`	`173`	`}`