Skip to content

Commit 3be22d4

Browse files
Peter-SimpsonPeter-Simpson
committed
Merge branch 'develop'
2 parents f2f5102 + fa5045f commit 3be22d4

14 files changed

Lines changed: 630 additions & 410 deletions

File tree

‎ASCOM.DynamicRemoteClients/ASCOM.DynamicRemoteClients.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
</ItemGroup>
8888
<ItemGroup>
8989
<PackageReference Include="Newtonsoft.Json">
90-
<Version>13.0.1</Version>
90+
<Version>13.0.2</Version>
9191
</PackageReference>
9292
<PackageReference Include="RestSharp">
93-
<Version>106.13.0</Version>
93+
<Version>106.15.0</Version>
9494
</PackageReference>
9595
</ItemGroup>
9696
<ItemGroup>

‎Remote Client Device Base Classes/Device Base Classes.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</ItemGroup>
7373
<ItemGroup>
7474
<PackageReference Include="RestSharp">
75-
<Version>106.13.0</Version>
75+
<Version>106.15.0</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Remote Client Local Server/Remote Client Local Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@
257257
</ItemGroup>
258258
<ItemGroup>
259259
<PackageReference Include="Newtonsoft.Json">
260-
<Version>13.0.1</Version>
260+
<Version>13.0.2</Version>
261261
</PackageReference>
262262
<PackageReference Include="RestSharp">
263-
<Version>106.13.0</Version>
263+
<Version>106.15.0</Version>
264264
</PackageReference>
265265
</ItemGroup>
266266
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎Remote Client Local Server/RemoteClientDriver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,8 @@ public static T SendToRemoteDriver<T>(uint clientNumber, RestClient client, stri
592592

593593
// Add the transaction number and client ID parameters
594594
uint transaction = TransactionNumber();
595-
request.AddParameter(SharedConstants.CLIENTTRANSACTION_PARAMETER_NAME, transaction.ToString());
596-
request.AddParameter(SharedConstants.CLIENTID_PARAMETER_NAME, clientNumber.ToString());
595+
request.AddParameter(SharedConstants.CLIENT_TRANSACTION_ID_PARAMETER_NAME, transaction.ToString());
596+
request.AddParameter(SharedConstants.CLIENT_ID_PARAMETER_NAME, clientNumber.ToString());
597597

598598
// Add any supplied parameters to the request
599599
foreach (KeyValuePair<string, string> parameter in Parameters)

‎Remote Client Local Server/ServerConfigurationForm.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ private void BtnGetRemoteConfiguration_Click(object sender, EventArgs e)
112112
RequestFormat = DataFormat.Json
113113
};
114114

115-
request.AddParameter(SharedConstants.CLIENTID_PARAMETER_NAME, clientNumber.ToString());
115+
request.AddParameter(SharedConstants.CLIENT_ID_PARAMETER_NAME, clientNumber.ToString());
116116
uint transaction = RemoteClientDriver.TransactionNumber();
117-
request.AddParameter(SharedConstants.CLIENTTRANSACTION_PARAMETER_NAME, transaction.ToString());
117+
request.AddParameter(SharedConstants.CLIENT_TRANSACTION_ID_PARAMETER_NAME, transaction.ToString());
118118

119119
TL.LogMessage("GetConfiguration", "Client Txn ID: " + transaction.ToString() + ", Sending command to remote server");
120120
IRestResponse response = client.Execute(request);
@@ -207,9 +207,9 @@ private void BtnReloadConfiguration_Click(object sender, EventArgs e)
207207
RequestFormat = DataFormat.Json
208208
};
209209

210-
request.AddParameter(SharedConstants.CLIENTID_PARAMETER_NAME, clientNumber.ToString());
210+
request.AddParameter(SharedConstants.CLIENT_ID_PARAMETER_NAME, clientNumber.ToString());
211211
uint transaction = RemoteClientDriver.TransactionNumber();
212-
request.AddParameter(SharedConstants.CLIENTTRANSACTION_PARAMETER_NAME, transaction.ToString());
212+
request.AddParameter(SharedConstants.CLIENT_TRANSACTION_ID_PARAMETER_NAME, transaction.ToString());
213213

214214
TL.LogMessage("Reload", "Client Txn ID: " + transaction.ToString() + ", Sending command to remote server");
215215
IRestResponse response = client.Execute(request);

‎Remote Server/DriverHostForm.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ public Thread DriverCommand(RequestData requestData)
7777

7878
// Process the command on a separate thread allowing other requests to be handled concurrently through this thread, which is running the Windows message loop
7979
Thread driverThread = new Thread(new ParameterizedThreadStart(ProcessCommand)); // Create a new thread on which to make the call to the COM driver
80-
if (ServerForm.DebugTraceState) ServerForm.LogMessage1(requestData, requestData.Elements[ServerForm.URL_ELEMENT_METHOD], $"DriverCommand has received a command for {deviceKey} on FORM thread {Thread.CurrentThread.ManagedThreadId} Apartment state: {Thread.CurrentThread.GetApartmentState()} Is background: {Thread.CurrentThread.IsBackground} Is thread pool thread: {Thread.CurrentThread.IsThreadPoolThread}");
80+
if (ServerForm.DebugTraceState) ServerForm.LogMessage1(requestData, requestData.Elements[SharedConstants.URL_ELEMENT_METHOD], $"DriverCommand has received a command for {deviceKey} on FORM thread {Thread.CurrentThread.ManagedThreadId} Apartment state: {Thread.CurrentThread.GetApartmentState()} Is background: {Thread.CurrentThread.IsBackground} Is thread pool thread: {Thread.CurrentThread.IsThreadPoolThread}");
8181

8282
driverThread.Start(requestData); // Start the thread supplying the request data to the method
8383

84-
if (ServerForm.DebugTraceState) ServerForm.LogMessage1(requestData, requestData.Elements[ServerForm.URL_ELEMENT_METHOD], $"DriverCommand has started the command for {deviceKey} on FORM thread { Thread.CurrentThread.ManagedThreadId}");
84+
if (ServerForm.DebugTraceState) ServerForm.LogMessage1(requestData, requestData.Elements[SharedConstants.URL_ELEMENT_METHOD], $"DriverCommand has started the command for {deviceKey} on FORM thread { Thread.CurrentThread.ManagedThreadId}");
8585
return driverThread; // Return the thread so that the calling method can wait for it to complete and so that this thread can start waiting for the next command
8686
}
8787
catch (Exception ex) // Something serious has gone wrong with the ASCOM Remote server itself so report this to the user

‎Remote Server/Remote Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@
246246
</ItemGroup>
247247
<ItemGroup>
248248
<PackageReference Include="ASCOM.Common.Components">
249-
<Version>1.0.0-alpha28</Version>
249+
<Version>1.0.70</Version>
250250
</PackageReference>
251251
<PackageReference Include="Newtonsoft.Json">
252-
<Version>13.0.1</Version>
252+
<Version>13.0.2</Version>
253253
</PackageReference>
254254
</ItemGroup>
255255
<ItemGroup />

0 commit comments

Comments
 (0)