Fixed OSRTT V1 not running input lag test, bumped version to auto ins…

…tall from pre-compiled binary
andymanic · May 11, 2023 · b472d3d · b472d3d
1 parent 8180ccb
commit b472d3d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/Hardware/OSRTT_Full_Code.ino.bin b/Hardware/OSRTT_Full_Code.ino.bin
diff --git a/Hardware/OSRTT_Full_Code/OSRTT_Full_Code.ino b/Hardware/OSRTT_Full_Code/OSRTT_Full_Code.ino
@@ -36,7 +36,8 @@ SPISettings settingsA(10000000, MSBFIRST, SPI_MODE0);
 
 //Serial connection values
 bool connected = false;
-String firmware = "2.9";
+int boardType = 0;
+String firmware = "3.0";
 int testRuns = 4;
 bool vsync = true;
 bool extendedGamma = true;
@@ -483,6 +484,9 @@ void loop() {
       Serial.print("Runs:");
       Serial.println(testRuns);
       delay(100);
+      Serial.print("BoardType:");
+      Serial.println(boardType);
+      delay(100);
       Serial.println("FW:" + firmware);
       delay(100);
       Serial.print("FPS Key:");

diff --git a/OSRTT Launcher/OSRTT Launcher/Main.cs b/OSRTT Launcher/OSRTT Launcher/Main.cs
@@ -28,7 +28,7 @@ public partial class Main : Form
         private double V1DLFW = 2.8;
         private double ProDLFW = 1.5;
         public int boardType = -1;
-        private string softwareVersion = "4.2";
+        private string softwareVersion = "4.3";
 
         // TODO //
         //
@@ -798,7 +798,7 @@ private void findAndConnectToBoard()
                                 string binFileAvailable = "";
                                 foreach (var f in Directory.GetFiles(localPath + @"\\arduinoCLI")) 
                                 {
-                                    if (f.Contains("ino.bin")) { binFileAvailable = f; }
+                                    if (f.Contains("ino.bin") && f.Contains("Pro")) { binFileAvailable = f; }
                                 }
                                 if (binFileAvailable != "")
                                 {
@@ -816,8 +816,23 @@ private void findAndConnectToBoard()
                             }
                             else if (boardType == 0)
                             {
-                                installCommand = "/C .\\arduinoCLI\\arduino-cli.exe lib install Keyboard && .\\arduinoCLI\\arduino-cli.exe lib install Mouse && .\\arduinoCLI\\arduino-cli.exe lib install ArduinoUniqueID";
-                                updateCommand = "/C .\\arduinoCLI\\arduino-cli.exe compile --fqbn adafruit:samd:adafruit_itsybitsy_m4 .\\arduinoCLI\\OSRTT_Full_Code && .\\arduinoCLI\\arduino-cli.exe upload --port " + p + " --fqbn adafruit:samd:adafruit_itsybitsy_m4 .\\arduinoCLI\\OSRTT_Full_Code";
+                                string binFileAvailable = "";
+                                foreach (var f in Directory.GetFiles(localPath + @"\\arduinoCLI"))
+                                {
+                                    if (f.Contains("ino.bin") && f.Contains("Full")) { binFileAvailable = f; }
+                                }
+                                if (binFileAvailable != "")
+                                {
+                                    Console.WriteLine(binFileAvailable);
+                                    installCommand = "";
+                                    updateCommand = "/C .\\arduinoCLI\\arduino-cli.exe upload --port " + p + " --fqbn adafruit:samd:adafruit_itsybitsy_m4 -i \"" + binFileAvailable + "\"";
+                                    Console.WriteLine(updateCommand);
+                                }
+                                else
+                                {
+                                    installCommand = "/C .\\arduinoCLI\\arduino-cli.exe lib install Keyboard && .\\arduinoCLI\\arduino-cli.exe lib install Mouse && .\\arduinoCLI\\arduino-cli.exe lib install ArduinoUniqueID";
+                                    updateCommand = "/C .\\arduinoCLI\\arduino-cli.exe compile --fqbn adafruit:samd:adafruit_itsybitsy_m4 .\\arduinoCLI\\OSRTT_Full_Code && .\\arduinoCLI\\arduino-cli.exe upload --port " + p + " --fqbn adafruit:samd:adafruit_itsybitsy_m4 .\\arduinoCLI\\OSRTT_Full_Code";
+                                }
                             }
                             Console.WriteLine("ready to start");
                             process.StartInfo.UseShellExecute = false;

diff --git a/OSRTT Launcher/OSRTT Launcher/Properties/AssemblyInfo.cs b/OSRTT Launcher/OSRTT Launcher/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.3.0.0")]
+[assembly: AssemblyFileVersion("4.3.0.0")]