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

This commit is contained in:
marshmellow42 2015-07-20 21:26:35 -04:00
commit 6b659d2406
16 changed files with 635 additions and 30 deletions

View file

@ -95,6 +95,7 @@ typedef struct{
#define CMD_FSK_SIM_TAG 0x021E
#define CMD_ASK_SIM_TAG 0x021F
#define CMD_PSK_SIM_TAG 0x0220
#define CMD_AWID_DEMOD_FSK 0x0221
/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */