rebellion/libpinproc
1
0
Fork 0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00
Code Releases Activity

Python progress. Bugfix in PRDevice.cpp.

Browse Source
This commit is contained in:
Adam Preble
2009-06-22 18:31:38 -04:00
parent f5a65921c9
commit b106f44e8a
2 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
examples/pinproctest/JD.yaml
View File

@@ -24,11 +24,13 @@ PRSwitches:
number: S12 number: S12
startButton: startButton:
number: S13 number: S13
shooterLane: shooterL:
number: S27 number: S15
shooterR:
number: S41
buyIn: buyIn:
number: S31 number: S31
ballShooter: ballShooterR:
number: S41 number: S41
superGame: superGame:
number: S44 number: S44
@@ -36,8 +38,10 @@ PRSwitches:
number: S51 number: S51
slingR: slingR:
number: S52 number: S52
outhole: popperL:
number: S18 number: S73
popperR:
number: S74
trough1: trough1:
number: S81 number: S81
trough2: trough2:
@@ -46,8 +50,12 @@ PRSwitches:
number: S83 number: S83
trough4: trough4:
number: S84 number: S84
trough6: trough5:
number: S85 number: S85
trough6:
number: S86
troughTop:
number: S87
PRCoils: PRCoils:
flipperLwRMain: flipperLwRMain:
number: 32 number: 32
@@ -65,15 +73,36 @@ PRCoils:
number: 38 number: 38
flipperUpLHold: flipperUpLHold:
number: 39 number: 39
slingL: popperL:
number: C15 number: C02
slingR: popperR:
number: C16 number: C03
resetDropTarget: resetDropTarget:
number: C05 number: C05
trough:
number: C13
shooterR: shooterR:
number: C08 number: C08
shooterL: shooterL:
number: C09 number: C09
trough:
number: C13
slingL:
number: C15
slingR:
number: C16
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

6
src/PRDevice.cpp
View File

@@ -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. // words will be too many, flush the currently prepared words to the P-ROC now.
if (numPreparedWriteWords + numWords > maxWriteWords) if (numPreparedWriteWords + numWords > maxWriteWords)
{ {
if (FlushWriteData() == kPRFailure); if (FlushWriteData() == kPRFailure)
return 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 PRDevice::WriteDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int32_t numWriteWords, uint32_t * writeBuffer)
{ {
PRResult res;
uint32_t * buffer; uint32_t * buffer;
buffer = (uint32_t *)malloc((numWriteWords * 4) + 1); buffer = (uint32_t *)malloc((numWriteWords * 4) + 1);
buffer[0] = CreateBurstCommand(moduleSelect, startingAddr, numWriteWords); buffer[0] = CreateBurstCommand(moduleSelect, startingAddr, numWriteWords);
memcpy(buffer+1, writeBuffer, numWriteWords * 4); memcpy(buffer+1, writeBuffer, numWriteWords * 4);
WriteData(buffer, numWriteWords + 1); res = WriteData(buffer, numWriteWords + 1);
free (buffer); free (buffer);
return res;
} }
PRResult PRDevice::ReadDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int32_t numReadWords, uint32_t * readBuffer) PRResult PRDevice::ReadDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int32_t numReadWords, uint32_t * readBuffer)