- self.putf(bit, bit, [128, ['%d' % self.token[bit][2]]])
- self.putf(0, 0, [129, ['Start bit', 'Start', 'S']])
- t = 'host' if self.token[1][2] == 1 else 'card'
- self.putf(1, 1, [130, ['Transmission: ' + t, 'T: ' + t, 'T']])
- self.putf(2, 7, [131, ['Reserved', 'Res', 'R']])
- self.putf(8, 134, [132, ['Argument', 'Arg', 'A']])
- self.putf(135, 135, [134, ['End bit', 'End', 'E']])
- self.putf(8, 134, [136, ['CID/CSD register', 'CID/CSD', 'C']])
- self.putf(0, 135, [55, ['R2']])
- self.token, self.state = [], 'GET COMMAND TOKEN'
-
- def handle_response_r3(self, cmd):
+ self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit].bit]])
+ self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
+ t = 'host' if self.token[1].bit == 1 else 'card'
+ self.putf(1, 1, [Ann.F_TRANSM, ['Transmission: ' + t, 'T: ' + t, 'T']])
+ self.putf(2, 7, [Ann.F_CMD, ['Reserved', 'Res', 'R']])
+ self.putf(8, 134, [Ann.F_ARG, ['Argument', 'Arg', 'A']])
+ self.putf(135, 135, [Ann.F_END, ['End bit', 'End', 'E']])
+ self.putf(8, 134, [Ann.DECODED_F, ['CID/CSD register', 'CID/CSD', 'C']])
+ self.putf(0, 135, [Ann.RESPONSE_R2, ['Response: R2']])
+
+ if self.last_cmd in (Ann.CMD2, Ann.CMD10):
+ self.handle_reg_cid()
+
+ self.token, self.state = [], St.GET_COMMAND_TOKEN
+
+ def handle_response_r3(self, cmd_pin):