diff options
author | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2003-05-26 19:42:23 +0000 |
---|---|---|
committer | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2003-05-26 19:42:23 +0000 |
commit | e7d23fe04519ed219a6aace4aa01985cdc4e636d (patch) | |
tree | 9ae83cbc281279ea6597de2af5242986ea66ebed | |
parent | b936fcf09a43aa6e971638b7dda1e28b89ade76c (diff) | |
download | pyserial-git-e7d23fe04519ed219a6aace4aa01985cdc4e636d.tar.gz |
self.ctrlReg was not initilized in win32 version
getInSelected typo fixed
-rw-r--r-- | pyparallel/parallel/parallelppdev.py | 2 | ||||
-rw-r--r-- | pyparallel/parallel/parallelwin32.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pyparallel/parallel/parallelppdev.py b/pyparallel/parallel/parallelppdev.py index ff99a52..fc87e90 100644 --- a/pyparallel/parallel/parallelppdev.py +++ b/pyparallel/parallel/parallelppdev.py @@ -555,7 +555,7 @@ class Parallel: """Returns the level on the nFault pin (15)""" return (self.PPRSTATUS() & PARPORT_STATUS_ERROR) != 0 - def gettInSelected(self): + def getInSelected(self): """Returns the level on the Select pin (13)""" return (self.PPRSTATUS() & PARPORT_STATUS_SELECT) != 0 diff --git a/pyparallel/parallel/parallelwin32.py b/pyparallel/parallel/parallelwin32.py index 21e8887..d5d1fc1 100644 --- a/pyparallel/parallel/parallelwin32.py +++ b/pyparallel/parallel/parallelwin32.py @@ -62,6 +62,7 @@ class Parallel: raise ValueError("No such port available - expecting a number") self.statusRegAdr = self.dataRegAdr + 1 self.ctrlRegAdr = self.dataRegAdr + 2 + self.ctrlReg = _pyparallel.inp(self.ctrlRegAdr) def setData(self, value): _pyparallel.outp(self.dataRegAdr, value) @@ -103,7 +104,7 @@ class Parallel: """Error pin""" return _pyparallel.inp(self.statusRegAdr) & 0x08 and 1 - def gettInSelected(self): + def getInSelected(self): """select pin""" return _pyparallel.inp(self.statusRegAdr) & 0x10 and 1 @@ -118,5 +119,3 @@ class Parallel: def getInBusy(self): """input from busy pin""" return not (_pyparallel.inp(self.statusRegAdr) & 0x80) - - |