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

Resolved merge conflicts.

This commit is contained in:
Gerry Stellenberg
2011-07-10 19:30:31 -05:00
2 changed files with 163 additions and 167 deletions

View File

@@ -6,9 +6,7 @@ The install process should have created the following subdirectories:
.\ext\python (includes a setup file for the pinproc python extension) .\ext\python (includes a setup file for the pinproc python extension)
*** USB Driver *** *** USB Driver ***
The FTDI driver should have been installed automatically during the libpinproc installation. The FTDI driver should have been installed automatically during the libpinproc installation. If it did not, manually run .\FTDI_2.xx.yy\DPInst.exe. This is necessary to communicate with the P-ROC over USB.
If it did not, manually run .\FTDI_2.xx.yy\DPInst.exe. This is necessary to communicate with
the P-ROC over USB.
*** pinprocfw.exe *** *** pinprocfw.exe ***
This application can be used to update the P-ROC's firmware when updates are made This application can be used to update the P-ROC's firmware when updates are made
@@ -16,6 +14,4 @@ available on www.pinballcontrollers.com as follows:
.\bin\pinprocfw.exe <new firmware file> .\bin\pinprocfw.exe <new firmware file>
*** pinproc python extension *** *** pinproc python extension ***
If you're planning on writing or using Python scripts to communicate with your P-ROC, and If you're planning on writing or using Python scripts to communicate with your P-ROC, and you already have Python 2.6 installed, execute this setup file to install the pinproc python extension. Note - this extension has only been tested with Python 2.6.
you already have Python 2.6 installed, execute this setup file to install the pinproc python
extension. Note - this extension has only been tested with Python 2.6.