2021.1 - Soft Release

2020.1 - Soft Release
Philip-S-Martin · Feb 19, 2021 · 1f8094c · 1f8094c
2 parents f4811f2 + 9df1839
commit 1f8094c
Show file tree

Hide file tree

Showing 147 changed files with 3,784 additions and 2,694 deletions.
diff --git a/InstallForge/2021_1_InstallProject.ifp b/InstallForge/2021_1_InstallProject.ifp
diff --git a/Schedulino/Generator/Interval.cs → McIntyreAFC/Generator/Interval.cs b/Schedulino/Generator/Interval.cs → McIntyreAFC/Generator/Interval.cs
@@ -1,11 +1,7 @@
-using ProtocolMaster.Model.Protocol;
+using ProtocolMasterCore.Protocol;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     class Interval : IEquatable<Interval>, IComparable<Interval>
     {

diff --git a/Schedulino/Generator/Protocol.cs → McIntyreAFC/Generator/Protocol.cs b/Schedulino/Generator/Protocol.cs → McIntyreAFC/Generator/Protocol.cs
@@ -1,11 +1,8 @@
-using ProtocolMaster.Model.Protocol;
+using ProtocolMasterCore.Protocol;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     // Pairing Handler: calls the delivery handler for 
     delegate void SoundHandler();
@@ -147,7 +144,7 @@ private void GenerateSoundsBlock()
                     prevSoundInterval = si;
                 }
                 exp_end = potential_end;
-            }            
+            }
         }
 
         private void GeneratePreSounds(ref UInt32 timeMs, ref SoundInterval prevSoundInterval)
@@ -335,7 +332,7 @@ private void CenteredDelivery(Stimulus stim, UInt32 begin, UInt32 end)
                 totalTime += duration[i] + between[i];
             }
             uint timeMs;
-            if (end-begin > totalTime)
+            if (end - begin > totalTime)
                 timeMs = begin + ((end - begin) - totalTime) / 2;
             else timeMs = begin - (totalTime - (end - begin)) / 2;
             for (int i = 0; i < stim.stims_per_sound; i++)

diff --git a/Schedulino/Generator/Sound.cs → McIntyreAFC/Generator/Sound.cs b/Schedulino/Generator/Sound.cs → McIntyreAFC/Generator/Sound.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     class Sound
     {

diff --git a/Schedulino/Generator/SoundInterval.cs → McIntyreAFC/Generator/SoundInterval.cs b/Schedulino/Generator/SoundInterval.cs → McIntyreAFC/Generator/SoundInterval.cs
@@ -1,18 +1,14 @@
-using ProtocolMaster.Model.Protocol;
-using System;
+using ProtocolMasterCore.Protocol;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     class SoundInterval : Interval
     {
         public Sound sound;
         public SoundInterval previous;
         public SoundInterval next;
-        public SoundInterval(Sound sound, SoundInterval previous, uint begin, uint end):base(begin, end)
+        public SoundInterval(Sound sound, SoundInterval previous, uint begin, uint end) : base(begin, end)
         {
             this.sound = sound;
             this.previous = previous;

diff --git a/Schedulino/Generator/Stimulus.cs → McIntyreAFC/Generator/Stimulus.cs b/Schedulino/Generator/Stimulus.cs → McIntyreAFC/Generator/Stimulus.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     class Stimulus
     {

diff --git a/Schedulino/Generator/StimulusInterval.cs → McIntyreAFC/Generator/StimulusInterval.cs b/Schedulino/Generator/StimulusInterval.cs → McIntyreAFC/Generator/StimulusInterval.cs
@@ -1,11 +1,7 @@
-using ProtocolMaster.Model.Protocol;
-using System;
+using ProtocolMasterCore.Protocol;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SchedulinoDriver.Generator
+namespace Schedulino.Generator
 {
     class StimulusInterval : Interval
     {

diff --git a/McIntyreAFC/McIntyreAFC.csproj b/McIntyreAFC/McIntyreAFC.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <OutputPath>..\ProtocolMasterWPF\bin\Debug\netcoreapp3.1\Extensions\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <WarningLevel>5</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <OutputPath>..\ProtocolMasterWPF\bin\Release\netcoreapp3.1\Extensions\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="SerialPortStream" Version="2.2.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\ProtocolMasterCore\ProtocolMasterCore.csproj">
+            <Private>false</Private>
+        </ProjectReference>
+    </ItemGroup>
+
+</Project>