From 6a0c8199393473e7e5e31d55ee955947b23c73c6 Mon Sep 17 00:00:00 2001
From: gstellenberg <gstellenberg@gmail.com>
Date: Thu, 29 Oct 2009 00:02:26 -0500
Subject: [PATCH] When setting up defaults, set up the driver groups before
 enabling the drivers since the FPGA now uses the groups to set the initial
 polarity.

---
 src/PRDevice.cpp | 63 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/PRDevice.cpp b/src/PRDevice.cpp
index 714a078..8df39b9 100644
--- a/src/PRDevice.cpp
+++ b/src/PRDevice.cpp
@@ -381,37 +381,6 @@ PRResult PRDevice::DriverLoadMachineTypeDefaults(PRMachineType machineType, uint
         group->polarity = mappedDriverGroupPolarity[i];
     }
     
-    PRDriverGlobalConfig globals;
-    globals.enableOutputs = false;
-    globals.globalPolarity = globalPolarity;
-    globals.useClear = false;
-    globals.strobeStartSelect = false;
-    globals.startStrobeTime = driverLoopTime; // milliseconds per output loop
-    globals.matrixRowEnableIndex1 = rowEnableIndex1;
-    globals.matrixRowEnableIndex0 = rowEnableIndex0;
-    globals.activeLowMatrixRows = activeLowMatrixRows;
-    globals.tickleSternWatchdog = tickleSternWatchdog;
-    globals.encodeEnables = encodeEnables;
-    globals.watchdogExpired = false;
-    globals.watchdogEnable = true;
-    globals.watchdogResetTime = watchdogResetTime;
-    
-    // We want to start up safely, so we'll update the global driver config twice.
-    // When we toggle enableOutputs like this P-ROC will reset the polarity:
-    
-    // Enable now without the outputs enabled:
-    if (resetFlags & kPRResetFlagUpdateDevice)
-        res = DriverUpdateGlobalConfig(&globals);
-    else
-        driverGlobalConfig = globals;
-    
-    // Now enable the outputs to protect against the polarity being driven incorrectly:
-    globals.enableOutputs = true;
-    if (resetFlags & kPRResetFlagUpdateDevice)
-        res = DriverUpdateGlobalConfig(&globals);
-    else
-        driverGlobalConfig = globals;
-
     
     // Configure the groups.  Each group corresponds to 8 consecutive drivers, starting
     // with driver #32.  The following 6 groups are configured for coils/flashlamps.
@@ -479,6 +448,38 @@ PRResult PRDevice::DriverLoadMachineTypeDefaults(PRMachineType machineType, uint
             driverGroups[i] = group;
     }
 
+    PRDriverGlobalConfig globals;
+    globals.enableOutputs = false;
+    globals.globalPolarity = globalPolarity;
+    globals.useClear = false;
+    globals.strobeStartSelect = false;
+    globals.startStrobeTime = driverLoopTime; // milliseconds per output loop
+    globals.matrixRowEnableIndex1 = rowEnableIndex1;
+    globals.matrixRowEnableIndex0 = rowEnableIndex0;
+    globals.activeLowMatrixRows = activeLowMatrixRows;
+    globals.tickleSternWatchdog = tickleSternWatchdog;
+    globals.encodeEnables = encodeEnables;
+    globals.watchdogExpired = false;
+    globals.watchdogEnable = true;
+    globals.watchdogResetTime = watchdogResetTime;
+    
+    // We want to start up safely, so we'll update the global driver config twice.
+    // When we toggle enableOutputs like this P-ROC will reset the polarity:
+    
+    // Enable now without the outputs enabled:
+    if (resetFlags & kPRResetFlagUpdateDevice)
+        res = DriverUpdateGlobalConfig(&globals);
+    else
+        driverGlobalConfig = globals;
+    
+    // Now enable the outputs to protect against the polarity being driven incorrectly:
+    globals.enableOutputs = true;
+    if (resetFlags & kPRResetFlagUpdateDevice)
+        res = DriverUpdateGlobalConfig(&globals);
+    else
+        driverGlobalConfig = globals;
+
+
     return res;
 }