Merge commit '15e2eff' into Develop

Author: Babreakfast

Ares.Device.Serial.Tests/SerialPortTests.cs

@@ -238,7 +238,7 @@ public async Task AresSerialPort_TestingCorruptionProneDevices(CancellationToken
       var response1 = await port.Send(new SomeCommandWithResponse(stringToTest1), TimeSpan.FromMilliseconds(100), token);
     }
     catch(TimeoutException)
-    {}
+    { }
     var response2 = await port.Send(new SomeCommandWithResponse(stringToTest2), TimeSpan.FromSeconds(10), token);
     Assert.That(response2.Response, Is.EqualTo(stringToTest2));
   }
@@ -250,31 +250,24 @@ public async Task AresSerialPort_Subscription_To_Response_Stream_Works_Without_S
     const string stringToTest = "<-Oh Hello->";
     const string stringToTest2 = "<-This Is A Test->";
     var port = new TestConnectionWithDelay(new SerialPortConnectionInfo(0, Parity.Even, 0, StopBits.None));
-    var test1Observable = port.GetTransactionStream<SomeResponse>();
-    var test2Observable = port.GetTransactionStream<SomeResponse>();
-    var test1ObservableResponseWaiter = Task.Run(async () =>
-    {
-      var test1ObservableSecondResponse = await test1Observable.Take(1).ToTask(token);
-      return test1ObservableSecondResponse;
-    }, token);
+    var firstObservable = port.GetTransactionStream<SomeResponse>();
+    var secondObservable = port.GetTransactionStream<SomeResponse>();
 
-    _ = port.SendAndStream(new SomeCommandWithStreamedResponse(stringToTest2), token);
+    var firstWaiter = firstObservable.Take(1).ToTask(token);
+    var secondWaiter = secondObservable.Take(1).ToTask(token);
 
-    var test2ObservableFirstResponse = await test2Observable.Take(1).ToTask(token);
-    var test1ObservableSecondResponse = await test1ObservableResponseWaiter;
-    var test1ObservableResponseWaiter2 = Task.Run(async () =>
-    {
-      var test1ObservableSecondResponse2 = await test1Observable.Take(1).ToTask(token);
-      return test1ObservableSecondResponse2;
-    }, token);
+    _ = port.SendAndStream(new SomeCommandWithStreamedResponse(stringToTest2), token);
 
-    var test3Task = await port.Send(new SomeCommandWithResponse(stringToTest), token);
-    var test1ObservableSecondResponse2 = await test1ObservableResponseWaiter2;
+    var secondObservableFirstResponse = await secondWaiter;
+    var firstObservableSecondResponse = await firstWaiter;
+    var firstObservableResponseWaiter2 = firstObservable.Take(1).ToTask(token);
+    _ = await port.Send(new SomeCommandWithResponse(stringToTest), token);
+    var firstObservableSecondResponse2 = await firstObservableResponseWaiter2;
     using(Assert.EnterMultipleScope())
     {
-      Assert.That(test1ObservableSecondResponse2.Response.Response, Is.EqualTo(stringToTest));
-      Assert.That(test2ObservableFirstResponse.Response.Response, Is.EqualTo(stringToTest2));
-      Assert.That(test1ObservableSecondResponse.Response.Response, Is.EqualTo(stringToTest2));
+      Assert.That(firstObservableSecondResponse2.Response.Response, Is.EqualTo(stringToTest));
+      Assert.That(secondObservableFirstResponse.Response.Response, Is.EqualTo(stringToTest2));
+      Assert.That(firstObservableSecondResponse.Response.Response, Is.EqualTo(stringToTest2));
     }
 
     Assert.That(port.BufferEmpty, Is.True);
@@ -431,7 +424,7 @@ public override void SendInternally(byte[] bytes)
 
 public class TestCorruptableConnection : AresSerialSimConnection
 {
-  public TestCorruptableConnection(SerialPortConnectionInfo connectionInfo) : base(connectionInfo, "SIM1", new SerialConnectionOptions() { DataReceiveInterval = TimeSpan.FromMilliseconds(150)})
+  public TestCorruptableConnection(SerialPortConnectionInfo connectionInfo) : base(connectionInfo, "SIM1", new SerialConnectionOptions() { DataReceiveInterval = TimeSpan.FromMilliseconds(150) })
   {
   }
 
@@ -445,7 +438,8 @@ public override void SendInternally(byte[] bytes)
     //   return;
     // }
     Console.WriteLine($"Got something: {Encoding.ASCII.GetString(bytes)}");
-    Task.Run(async () => {
+    Task.Run(async () =>
+    {
       foreach(var b in bytes)
       {
         AddDataReceived([b]);

AresScript.Tests/AresScript.Tests.csproj

@@ -4,11 +4,11 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RootNamespace>ARESScript.Tests</RootNamespace>
+    <RootNamespace>AresScript.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ARESScript\ARESScript.csproj" />
+    <ProjectReference Include="..\AresScript\AresScript.csproj" />
   </ItemGroup>
 
   <ItemGroup>

AresScript.Tests/Program.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using Antlr4.Runtime;
-using Ares.Datamodel.Extensions;
 using AresScript.Generated;
 using NUnit.Framework;
 

README.md

@@ -1,5 +1,5 @@
 # ARES OS 2.0: Autonomous Research Software
-The next generation of autonomous research software, serving as the central hub for integrating devices, planners, and analyzers for self-directed scientific campaigns.
+The next generation of autonomous research software, serving as the central hub for integrating devices, planners, and analyzers for self-directed scientific campaigns. This is our general research software, if you're interested in specifically our 3-D printer software, please visit the [Educational ARES Repo](https://github.com/AFRL-ARES/Educational-ARES).
 
 ## 🎛️ Overview
 **ARES OS 2.0** acts as the core central hub that connects and coordinates components such as devices, planners, and analyzers into cohesive research campaigns. Built on a modular, distributed architecture, ARES provides the framework for defining complex, multi-step experiments and managing all connected systems from a unified dashboard.