Changeset 3543

Timestamp:

04/27/10 10:13:55 (14 years ago)

Author:

jerome

Message:

Doesn't waste anymore the reading of one character at device opening
time. Activates debug mode in the testing program.

Files:

• pykocard/trunk/pykocard/cartadistcrs.py (modified) (5 diffs)

pykocard/trunk/pykocard/cartadistcrs.py

@@ -71 +71 @@
 
         self.lastcommand = None
+        self.shortprompt = '$'
         self.sol = chr(13) + chr(10) # start of line (begins each answer)
         self.sollen = len(self.sol)
-        self.prompt = chr(13) + chr(10) + '$' # the prompt
+        self.prompt = chr(13) + chr(10) + self.shortprompt # the prompt
         self.promptlen = len(self.prompt)
         self.eoc = chr(13) # end of command
@@ -99 +100 @@
             self.tcrs.flushInput()
             self.tcrs.flushOutput()
-            self.tcrs.read(1) # Skips the first $ prompt
         except serial.serialutil.SerialException, msg :
             self.logError(msg)
@@ -152 +152 @@
             answer = self.tcrs.readline(eol=self.prompt)
             self.logDebug("TCRS answered %s" % repr(answer))
+            if answer.startswith(self.shortprompt) :
+                answer = answer[len(self.shortprompt):]
             if answer.startswith(command) :
                 answer = answer[len(command):]
@@ -157 +159 @@
                 return answer[self.sollen:-self.promptlen]
             else :
-                if answer != self.sol :
+                if answer and (answer != self.sol) :
                     self.logError("Unknown answer %s" % repr(answer))
                 return None
@@ -282 +284 @@
 if __name__ == "__main__" :
     # Minimal testing
-    tcrs = CartadisTCRS("/dev/ttyS0", debug=False)
+    tcrs = CartadisTCRS("/dev/ttyS0", debug=True)
     try :
         sys.stdout.write("%s TCRS detected on device %s with serial number %s\n" \