From b106f44e8ad3941fcbff1ee45be613428ed6eec9 Mon Sep 17 00:00:00 2001
From: Adam Preble <adam@beaker.local>
Date: Mon, 22 Jun 2009 18:31:38 -0400
Subject: [PATCH] Python progress.  Bugfix in PRDevice.cpp.

---
 examples/pinproctest/JD.yaml | 57 +++++++++++++++++++++++++++---------
 src/PRDevice.cpp             |  6 ++--
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/examples/pinproctest/JD.yaml b/examples/pinproctest/JD.yaml
index cfa67d3..e474b99 100644
--- a/examples/pinproctest/JD.yaml
+++ b/examples/pinproctest/JD.yaml
@@ -24,11 +24,13 @@ PRSwitches:
         number: S12
     startButton:
         number: S13
-    shooterLane:
-        number: S27
+    shooterL:
+        number: S15
+    shooterR:
+        number: S41
     buyIn:
         number: S31
-    ballShooter:
+    ballShooterR:
         number: S41
     superGame:
         number: S44
@@ -36,8 +38,10 @@ PRSwitches:
         number: S51
     slingR: 
         number: S52
-    outhole:
-        number: S18
+    popperL:
+        number: S73
+    popperR:
+        number: S74
     trough1:
         number: S81
     trough2:
@@ -46,8 +50,12 @@ PRSwitches:
         number: S83
     trough4:
         number: S84
-    trough6:
+    trough5:
         number: S85
+    trough6:
+        number: S86
+    troughTop:
+        number: S87
 PRCoils:
     flipperLwRMain: 
         number: 32
@@ -65,15 +73,36 @@ PRCoils:
         number: 38
     flipperUpLHold: 
         number: 39
+    popperL:
+        number: C02
+    popperR:
+        number: C03
+    resetDropTarget:
+        number: C05
+    shooterR:
+        number: C08
+    shooterL:
+        number: C09
+    trough:
+        number: C13
     slingL: 
         number: C15
     slingR: 
         number: C16
-    resetDropTarget:
-        number: C05
-    trough:
-        number: C13
-    shooterR:
-        number: C08
-    shooterL:
-        number: C09
\ No newline at end of file
+PRLamps:
+    buyIn:
+        number: L38
+    superGame:
+        number: L87
+    startButton:
+        number: L88
+    gi01:
+        number: G01
+    gi02:
+        number: G02
+    gi03:
+        number: G03
+    gi04:
+        number: G04
+    gi05:
+        number: G05
\ No newline at end of file
diff --git a/src/PRDevice.cpp b/src/PRDevice.cpp
index 84fbe0b..f77cf0c 100644
--- a/src/PRDevice.cpp
+++ b/src/PRDevice.cpp
@@ -726,7 +726,7 @@ PRResult PRDevice::PrepareWriteData(uint32_t * words, int32_t numWords)
     // words will be too many, flush the currently prepared words to the P-ROC now.
     if (numPreparedWriteWords + numWords > maxWriteWords)
     {
-        if (FlushWriteData() == kPRFailure);
+        if (FlushWriteData() == kPRFailure)
             return kPRFailure;
     }
 
@@ -786,13 +786,15 @@ PRResult PRDevice::WriteData(uint32_t * words, int32_t numWords)
 
 PRResult PRDevice::WriteDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int32_t numWriteWords, uint32_t * writeBuffer)
 {
+	PRResult res;
     uint32_t * buffer;
 
     buffer = (uint32_t *)malloc((numWriteWords * 4) + 1);
     buffer[0] = CreateBurstCommand(moduleSelect, startingAddr, numWriteWords);
     memcpy(buffer+1, writeBuffer, numWriteWords * 4);
-    WriteData(buffer, numWriteWords + 1);
+    res = WriteData(buffer, numWriteWords + 1);
     free (buffer);
+	return res;
 }
 
 PRResult PRDevice::ReadDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int32_t numReadWords, uint32_t * readBuffer)