Merge branch 'master' into fix_iclass_sim

diff --cc armsrc/iclass.c
index 0e42fb06c4fc55cdd1a9c8580007aa2c530cb786,ab63dceaee6fb402cc7d47995f2e990e8d974519..2533d1f9d643a549c036499d8fdaa8fd4bcf8131
--- 1/armsrc/iclass.c
--- 2/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@@ -1850,16 -1853,8 +1852,8 @@@ void ReaderIClass_Replay(uint8_t arg0, 
        LED_A_OFF();
  }
  
- void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
-       uint8_t readcheck[] = { keyType, blockNo };
-       uint8_t resp[] = {0,0,0,0,0,0,0,0};
-       size_t isOK = 0;
-       isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
-       cmd_send(CMD_ACK,isOK, 0, 0, 0, 0);
- }
- 
  void iClass_Authentication(uint8_t *MAC) {
 -      uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 +      uint8_t check[] = { ICLASS_CMD_CHECK_KD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
        uint8_t resp[ICLASS_BUFFER_SIZE];
        memcpy(check+5, MAC, 4);
        bool isOK;

diff --cc client/cmdhficlass.c
Simple merge

diff --cc include/usb_cmd.h
Simple merge