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

resolving merge conflicts

This commit is contained in:
Gerry Stellenberg
2012-02-19 10:23:04 -06:00
parent d47694682a
commit 2ca0786752
2 changed files with 165 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