From 6b23c0e156762bc8451d8afefbbcd716fa07e252 Mon Sep 17 00:00:00 2001
From: Blizzard Finnegan <blizzardfinnegan@gmail.com>
Date: Fri, 10 Mar 2023 12:14:56 -0500
Subject: [PATCH] Fix minor glitch with DataSaving

Also expand buffer range on MovementFacade
---
 dependency-reduced-pom.xml                             | 5 +----
 pom.xml                                                | 2 +-
 src/main/java/org/baxter/disco/ocr/DataSaving.java     | 2 +-
 src/main/java/org/baxter/disco/ocr/MovementFacade.java | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index bb421ef..0211333 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.baxter.disco</groupId>
   <artifactId>ocr</artifactId>
   <name>Disco OCR Accuracy Over Life Testing</name>
-  <version>4.3.5</version>
+  <version>4.3.6</version>
   <description>Testing Discos for long-term accuracy, using automated optical character recognition.</description>
   <organization>
     <name>Baxter International</name>
@@ -91,9 +91,6 @@
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>3.4.1</version>
-        <configuration>
-          <show>private</show>
-        </configuration>
       </plugin>
     </plugins>
   </reporting>
diff --git a/pom.xml b/pom.xml
index 027d85e..9ba0377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baxter.disco</groupId>
     <artifactId>ocr</artifactId>
-    <version>4.3.5</version>
+    <version>4.3.6</version>
     <packaging>jar</packaging>
     <name>Disco OCR Accuracy Over Life Testing</name>
     <description>Testing Discos for long-term accuracy, using automated optical character recognition.</description>
diff --git a/src/main/java/org/baxter/disco/ocr/DataSaving.java b/src/main/java/org/baxter/disco/ocr/DataSaving.java
index 28b7f06..6a8fed1 100644
--- a/src/main/java/org/baxter/disco/ocr/DataSaving.java
+++ b/src/main/java/org/baxter/disco/ocr/DataSaving.java
@@ -228,7 +228,7 @@ public class DataSaving
         boolean output = false;
         int cellnum = 0;
         int startingRow = outputSheet.getLastRowNum();
-        HSSFRow row = (cycle == 1) ? outputSheet.getRow(++startingRow) : outputSheet.createRow(++startingRow);
+        HSSFRow row = (cycle == 1) ? outputSheet.getRow(startingRow) : outputSheet.createRow(++startingRow);
         List<String> cameraNames = new ArrayList<>(cameraToFile.keySet());
 
         cycle++;
diff --git a/src/main/java/org/baxter/disco/ocr/MovementFacade.java b/src/main/java/org/baxter/disco/ocr/MovementFacade.java
index 81fe653..05166da 100644
--- a/src/main/java/org/baxter/disco/ocr/MovementFacade.java
+++ b/src/main/java/org/baxter/disco/ocr/MovementFacade.java
@@ -44,7 +44,7 @@ public class MovementFacade
     /**
      * Amount of buffer between the found absolute speed, and used speed.
      */
-    private static final int SPEED_BUFFER = 5000;
+    private static final int SPEED_BUFFER = 7500;
 
     /**
      * Minimum allowed speed of the fixture arm; also used for reset travels.
@@ -455,7 +455,7 @@ public class MovementFacade
             ErrorLogging.logError("DEBUG: Motor Frequency: " + FREQUENCY);
             ErrorLogging.logError("DEBUG: Motor calibrate on.");
             motorEnable.on();
-            int TWO_SECONDS = 20 * TIME_CONVERSION;
+            int TWO_SECONDS = 2 * TIME_CONVERSION;
             for(int j = 0; j < TWO_SECONDS; j++)
             {
                 try{ Thread.sleep(POLL_WAIT); } catch(Exception e){ ErrorLogging.logError(e); }