Merge remote-tracking branch 'Proxmark/master' into iclass

Conflicts:
	CHANGELOG.md
This commit is contained in:
marshmellow42 2015-10-07 09:34:47 -04:00
commit c54dff4f4a
26 changed files with 869 additions and 185 deletions

View file

@ -20,7 +20,8 @@ local _commands = {
CMD_BUFF_CLEAR = 0x0105,
CMD_READ_MEM = 0x0106,
CMD_VERSION = 0x0107,
CMD_STATUS = 0x0108,
CMD_PING = 0x0109,
--// For low-frequency tags
CMD_READ_TI_TYPE = 0x0202,
CMD_WRITE_TI_TYPE = 0x0203,