Ensure clear and consistent DriverVersion descriptions

Peter-Simpson · Peter-Simpson · commit 466d4a61567b · 2020-07-03T17:45:47.000+01:00
The response changes are to differentiate Remote Client drivers from the new Platform 6.5 Dynamic Clients drivers.
diff --git a/Remote Client Device Base Classes/Camera Base Class.cs b/Remote Client Device Base Classes/Camera Base Class.cs
@@ -165,8 +165,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -164,8 +164,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -198,8 +198,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -165,8 +165,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -163,8 +163,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -165,8 +165,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -163,8 +163,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -163,8 +163,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 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
@@ -166,8 +166,7 @@ public string DriverInfo
             {
                 RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);
                 Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);
-                string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";
+                string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";
                 TL.LogMessage(clientNumber, "DriverInfo", response);
                 return response;
             }

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,7 @@ public string DriverInfo`
`165`	`165`	`{`
`166`	`166`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`167`	`167`	`Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`168`		`- string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`169`		`- string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
	`168`	`+ string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";`
`170`	`169`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`171`	`170`	`return response;`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,7 @@ public string DriverInfo`
`164`	`164`	`{`
`165`	`165`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`166`	`166`	`Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`167`		`- string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`168`		`- string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
	`167`	`+ string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";`
`169`	`168`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`170`	`169`	`return response;`
`171`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,7 @@ public string DriverInfo`
`198`	`198`	`{`
`199`	`199`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`200`	`200`	`Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`201`		`- string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`202`		`- string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
	`201`	`+ string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";`
`203`	`202`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`204`	`203`	`return response;`
`205`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,7 @@ public string DriverInfo`
`163`	`163`	`{`
`164`	`164`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`165`	`165`	`Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`166`		`- string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`167`		`- string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
	`166`	`+ string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";`
`168`	`167`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`169`	`168`	`return response;`
`170`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,7 @@ public string DriverInfo`
`166`	`166`	`{`
`167`	`167`	`RemoteClientDriver.SetClientTimeout(client, standardServerResponseTimeout);`
`168`	`168`	`Version version = Assembly.GetExecutingAssembly().GetName().Version;`
`169`		`- string remoteString = RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL);`
`170`		`- string response = $"{DriverDisplayName} Version {version}, REMOTE DRIVER: {remoteString}";`
	`169`	`+ string response = $"ASCOM Remote Driver v{version} - REMOTE DEVICE: {RemoteClientDriver.DriverInfo(clientNumber, client, URIBase, TL)}";`
`171`	`170`	`TL.LogMessage(clientNumber, "DriverInfo", response);`
`172`	`171`	`return response;`
`173`	`172`	`}`