Merge branch 'master' into hf_mf_sim

This commit is contained in:
vratiskol 2019-03-15 21:17:44 +01:00
commit cbea5d9d02
161 changed files with 2002 additions and 1463 deletions

View file

@ -277,6 +277,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define ISO_15693 7
#define FELICA 8
#define PROTO_MIFARE 9
#define PROTO_HITAG 10
//-- Picopass fuses
#define FUSE_FPERS 0x80