# HG changeset patch # User drewp@bigasterisk.com # Date 1552376040 25200 # Node ID a60155ded95f61d80bd19d2c5d04ec56b549d528 # Parent aea6dbb8abf518c6e8e0e2015207651ca04b4a7f reindent Ignore-this: 4d6ed319001e7781a67e8a820aa8972e diff -r aea6dbb8abf5 -r a60155ded95f service/rfid_pn532_py/tags.py --- a/service/rfid_pn532_py/tags.py Tue Mar 12 00:14:19 2019 -0700 +++ b/service/rfid_pn532_py/tags.py Tue Mar 12 00:34:00 2019 -0700 @@ -72,23 +72,23 @@ self._check(freefare.mifare_classic_disconnect(self.tag)) def readBlock(self, blockNumber: int) -> bytes: - blockNum = freefare.MifareClassicBlockNumber(blockNumber) - self._check(freefare.mifare_classic_authenticate( - self.tag, blockNum, (c_ubyte*6)(*pubkey), freefare.MFC_KEY_A)) - - data = freefare.MifareClassicBlock() - self._check(freefare.mifare_classic_read(self.tag, blockNum, pointer(data))) - return ''.join(map(chr, data)) # with trailing nulls + blockNum = freefare.MifareClassicBlockNumber(blockNumber) + self._check(freefare.mifare_classic_authenticate( + self.tag, blockNum, (c_ubyte*6)(*pubkey), freefare.MFC_KEY_A)) + + data = freefare.MifareClassicBlock() + self._check(freefare.mifare_classic_read(self.tag, blockNum, pointer(data))) + return ''.join(map(chr, data)) # with trailing nulls def writeBlock(self, blockNumber: int, data: str): - blocknum = freefare.MifareClassicBlockNumber(blockNumber) - self._check(freefare.mifare_classic_authenticate( - self.tag, blocknum, (c_ubyte*6)(*pubkey), freefare.MFC_KEY_A)) - - dataBytes = data.encode('utf8') - if len(dataBytes) > 16: - raise ValueError('too long') - dataBlock = (c_ubyte*16)(*dataBytes) - - self._check(freefare.mifare_classic_write(self.tag, blocknum, dataBlock)) - log.info(" wrote block {blocknum}: {dataBlock}") + blocknum = freefare.MifareClassicBlockNumber(blockNumber) + self._check(freefare.mifare_classic_authenticate( + self.tag, blocknum, (c_ubyte*6)(*pubkey), freefare.MFC_KEY_A)) + + dataBytes = data.encode('utf8') + if len(dataBytes) > 16: + raise ValueError('too long') + dataBlock = (c_ubyte*16)(*dataBytes) + + self._check(freefare.mifare_classic_write(self.tag, blocknum, dataBlock)) + log.info(" wrote block {blocknum}: {dataBlock}")