- NetProcDataGameController made the Database public static. It is re…

…adonly and only a single instance. Service mode will need more access to this at some point. - adjust incorrect color for Red
horseyhorsey · Sep 9, 2023 · e57df10 · e57df10
1 parent 52843ab
commit e57df10
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/dotnet_nuget.yml b/.github/workflows/dotnet_nuget.yml
@@ -52,7 +52,7 @@ jobs:
     - name: Publish
       uses: softprops/action-gh-release@v1
       with:
-          tag_name: "1.0.37"
+          tag_name: "1.0.38"
           files: "NetProc-*"
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<VersionSuffix>1.0.37</VersionSuffix>
+		<VersionSuffix>1.0.38</VersionSuffix>
 		<AssemblyVersion>$(VersionSuffix)</AssemblyVersion>
 		<PackageVersion>$(VersionSuffix)</PackageVersion>
 		<Version>$(VersionSuffix)</Version>

diff --git a/Examples/P-ROC/NetProcGameTest/Program.cs b/Examples/P-ROC/NetProcGameTest/Program.cs
@@ -38,11 +38,11 @@ static void Main(string[] args)
             {
                 if (line == "e")
                 {
-                    game.FlippersEnabled = true;
+                    game.EnableFlippers(true);
                 }
                 if (line == "d")
                 {
-                    game.FlippersEnabled = false;
+                    game.EnableFlippers(true);
                 }
                 if (line == "c")
                 {

diff --git a/Examples/P-ROC/NetProcGameTest/StarterGame/BaseGameMode.cs b/Examples/P-ROC/NetProcGameTest/StarterGame/BaseGameMode.cs
@@ -26,7 +26,7 @@ public override void ModeStarted()
                 lamp.Enable();
 
             // Enable flippers
-            Game.FlippersEnabled = true;
+            Game.EnableFlippers(true);
 
             // Put the ball into play and Start tracking it
             //Game.trough.onBallLaunched += new LaunchCallbackHandler(ball_launch_callback);
@@ -57,7 +57,7 @@ public void ball_launch_callback()
         public override void ModeStopped()
         {
             // Ensure flippers are disabled
-            Game.FlippersEnabled = false;
+            Game.EnableFlippers(false);
             // Disable ball search
         }
 

diff --git a/Examples/P-ROC/NetProcGameTest/StarterGame/StarterGame.cs b/Examples/P-ROC/NetProcGameTest/StarterGame/StarterGame.cs
@@ -183,7 +183,7 @@ public override void Reset()
             //_modes.Add(_ball_search);
 
             // Disable the flippers
-            this.FlippersEnabled = false;
+            this.EnableFlippers(false);
         }
 
         /// <summary>

diff --git a/Examples/P-ROC/NetProcGameTest/StarterGame/TestMode.cs b/Examples/P-ROC/NetProcGameTest/StarterGame/TestMode.cs
@@ -98,15 +98,15 @@ public void all_gi_off()
 
         public bool sw_startButton_active(Switch sw)
         {
-            Game.FlippersEnabled = true;
+            Game.EnableFlippers(true);
             Game.Coils["trough"].Pulse();
 
             return SWITCH_CONTINUE;
         }
 
         public bool sw_buyIn_active(Switch sw)
         {
-            Game.FlippersEnabled = false;
+            Game.EnableFlippers(false);
             return SWITCH_CONTINUE;
         }
 

diff --git a/Examples/P-ROC/NetProcGameTest/TestGame.cs b/Examples/P-ROC/NetProcGameTest/TestGame.cs
@@ -54,7 +54,7 @@ public void FindAndEjectBall()
         public override void Reset()
         {
             base.Reset();
-            this.FlippersEnabled = false;
+            this.EnableFlippers(false);
         }
     }
 }
diff --git a/NetProc.Data/Migrations/20230907234924_AddedColorSets.cs b/NetProc.Data/Migrations/20230907234924_AddedColorSets.cs
@@ -36,7 +36,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.InsertData(
                 table: "Colors",
                 columns: new[] { "Name", "HtmlCode" },
-                values: new object[] { "RED", "FEFEFE" });
+                values: new object[] { "RED", "FF0000" });
 
             migrationBuilder.InsertData(
                 table: "Colors",

diff --git a/NetProc.Data/NetProcDataGameController.cs b/NetProc.Data/NetProcDataGameController.cs
@@ -12,8 +12,9 @@ namespace NetProc.Data
     /// Game controller using <see cref="BaseGameController"/> with an instance to the database <para/>
     /// </summary>
     public class NetProcDataGameController : BaseGameController
-    {        
-        static readonly INetProcDbContext Database = new NetProcDbContext();
+    {
+        /// <summary> Sqlite Entity Framework Database Context </summary>
+        public static readonly INetProcDbContext Database = new NetProcDbContext();
 
         private readonly bool deleteOnInit;
         private bool _dbInitialized;

diff --git a/NetProc.Data/NetProcDbContext.cs b/NetProc.Data/NetProcDbContext.cs
@@ -237,7 +237,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 new ColorSet(){ Name = "BLK", HtmlCode = "010101"},
                 new ColorSet(){ Name = "WHT", HtmlCode = "FEFEFE"},
                 new ColorSet(){ Name = "BLU", HtmlCode = "0155FE"},
-                new ColorSet(){ Name = "RED", HtmlCode = "FEFEFE"},
+                new ColorSet(){ Name = "RED", HtmlCode = "FF0000"},
                 new ColorSet(){ Name = "YEL", HtmlCode = "EDFE01"},
                 new ColorSet(){ Name = "ORG", HtmlCode = "FE9001"},
                 new ColorSet(){ Name = "GRN", HtmlCode = "3CDF13"},