Merge branch 'master' into feature/usb_mode

diff --cc ykcore/ykcore.c
Simple merge

diff --cc ykcore/ykdef.h
index 08de9d62ee144d284aa9361dd9a678d8074b213f,28d1b3b0cf818afa51fe0fc7a6b92800285d1c25..e210228852cede0b91710c5842827f2f7f44fbaf
--- 1/ykcore/ykdef.h
--- 2/ykcore/ykdef.h
+++ b/ykcore/ykdef.h
@@@ -40,9 -35,9 +35,11 @@@
  #define       SLOT_NDEF               8   /* Write NDEF record */
  #define       SLOT_NDEF2              9   /* Write NDEF record for slot 2 */
  
 +#define SLOT_USB_MODE         0x0b    /* USB mode of operation (NEO) */
 +
  #define SLOT_DEVICE_SERIAL    0x10    /* Device serial number */
+ #define SLOT_DEVICE_CONFIG    0x11    /* Write device configuration record */
+ #define SLOT_SCAN_MAP         0x12    /* Write scancode map */
  
  #define SLOT_CHAL_OTP1                0x20    /* Write 6 byte challenge to slot 1, get Yubico OTP response */
  #define SLOT_CHAL_OTP2                0x28    /* Write 6 byte challenge to slot 2, get Yubico OTP response */