Merge pull request #2 from lucidcode/feature/json-settings

IAmCoder · web-flow · commit a2fd3067170f · 2022-09-06T22:44:14.000+10:00
Use json settings
diff --git a/BrainFlow/BrainFlow.Boards.lsd b/BrainFlow/BrainFlow.Boards.lsd
diff --git a/BrainFlow/BrainFlow.csproj b/BrainFlow/BrainFlow.csproj
@@ -90,6 +90,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="UserSettings.cs" />
     <Compile Include="Board.cs" />
     <Compile Include="Channels\Channel16.cs" />
     <Compile Include="Channels\Channel15.cs" />
@@ -122,7 +123,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="brainflow_boards.json">
+    <None Include="BrainFlow.Boards.lsd">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
diff --git a/BrainFlow/Channels/Channel1.cs b/BrainFlow/Channels/Channel1.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(1);
-                    Device.ClearEEG(1);
-                    return tempValue;
+                    return Device.GetEEG(1);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel10.cs b/BrainFlow/Channels/Channel10.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(10);
-                    Device.ClearEEG(10);
-                    return tempValue;
+                    return Device.GetEEG(10);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel11.cs b/BrainFlow/Channels/Channel11.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(11);
-                    Device.ClearEEG(11);
-                    return tempValue;
+                    return Device.GetEEG(11);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel12.cs b/BrainFlow/Channels/Channel12.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(12);
-                    Device.ClearEEG(12);
-                    return tempValue;
+                    return Device.GetEEG(12);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel13.cs b/BrainFlow/Channels/Channel13.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(13);
-                    Device.ClearEEG(13);
-                    return tempValue;
+                    return Device.GetEEG(13);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel14.cs b/BrainFlow/Channels/Channel14.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(14);
-                    Device.ClearEEG(14);
-                    return tempValue;
+                    return Device.GetEEG(14);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel15.cs b/BrainFlow/Channels/Channel15.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(15);
-                    Device.ClearEEG(15);
-                    return tempValue;
+                    return Device.GetEEG(15);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel16.cs b/BrainFlow/Channels/Channel16.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(16);
-                    Device.ClearEEG(16);
-                    return tempValue;
+                    return Device.GetEEG(16);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel2.cs b/BrainFlow/Channels/Channel2.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(2);
-                    Device.ClearEEG(2);
-                    return tempValue;
+                    return Device.GetEEG(2);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel3.cs b/BrainFlow/Channels/Channel3.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(3);
-                    Device.ClearEEG(3);
-                    return tempValue;
+                    return Device.GetEEG(3);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel4.cs b/BrainFlow/Channels/Channel4.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(4);
-                    Device.ClearEEG(4);
-                    return tempValue;
+                    return Device.GetEEG(4);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel5.cs b/BrainFlow/Channels/Channel5.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(5);
-                    Device.ClearEEG(5);
-                    return tempValue;
+                    return Device.GetEEG(5);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel6.cs b/BrainFlow/Channels/Channel6.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(6);
-                    Device.ClearEEG(6);
-                    return tempValue;
+                    return Device.GetEEG(6);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel7.cs b/BrainFlow/Channels/Channel7.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(7);
-                    Device.ClearEEG(7);
-                    return tempValue;
+                    return Device.GetEEG(7);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel8.cs b/BrainFlow/Channels/Channel8.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(8);
-                    Device.ClearEEG(8);
-                    return tempValue;
+                    return Device.GetEEG(8);
                 }
             }
 
diff --git a/BrainFlow/Channels/Channel9.cs b/BrainFlow/Channels/Channel9.cs
@@ -25,9 +25,7 @@ public override double Value
             {
                 get
                 {
-                    double tempValue = Device.GetEEG(9);
-                    Device.ClearEEG(9);
-                    return tempValue;
+                    return Device.GetEEG(9);
                 }
             }
 
diff --git a/BrainFlow/ConnectForm.cs b/BrainFlow/ConnectForm.cs
diff --git a/BrainFlow/ConnectForm.designer.cs b/BrainFlow/ConnectForm.designer.cs
diff --git a/BrainFlow/PluginHandler.cs b/BrainFlow/PluginHandler.cs
diff --git a/BrainFlow/UserSettings.cs b/BrainFlow/UserSettings.cs
diff --git a/Installer/Lucid Scribe BrainFlow.vdproj b/Installer/Lucid Scribe BrainFlow.vdproj

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ public override double Value`
`25`	`25`	`{`
`26`	`26`	`get`
`27`	`27`	`{`
`28`		`- double tempValue = Device.GetEEG(1);`
`29`		`- Device.ClearEEG(1);`
`30`		`- return tempValue;`
	`28`	`+ return Device.GetEEG(1);`
`31`	`29`	`}`
`32`	`30`	`}`
`33`	`31`