diff --git a/Firmware/Chameleon-Mini/Application/EM4233.c b/Firmware/Chameleon-Mini/Application/EM4233.c index 18a26ac..54a20f4 100644 --- a/Firmware/Chameleon-Mini/Application/EM4233.c +++ b/Firmware/Chameleon-Mini/Application/EM4233.c @@ -198,7 +198,7 @@ uint16_t EM4233_Read_Multiple(uint8_t* FrameBuf, uint16_t FrameBytes) MemoryReadBlock(&LockStatusBuffer, EM4233_MEM_LSM_ADDRESS + BlockAddress, BlocksNumber); for (uint8_t block = 0; block < BlocksNumber; block++) { /* we cycle through the blocks */ - + /* add lock status */ if (LockStatusBuffer[block] & ISO15693_MASK_USER_LOCK) { /* tests if bit 0 of the status byte if set to 1 */ FrameBuf[FramePtr] = 0x01; /* return bit 0 set as 1 (user locked) */ diff --git a/Firmware/Chameleon-Mini/Application/ISO15693-A.c b/Firmware/Chameleon-Mini/Application/ISO15693-A.c index 38aa01b..b271db8 100644 --- a/Firmware/Chameleon-Mini/Application/ISO15693-A.c +++ b/Firmware/Chameleon-Mini/Application/ISO15693-A.c @@ -88,7 +88,7 @@ bool ISO15693PrepareFrame(uint8_t* FrameBuf, uint16_t FrameBytes, CurrentFrame* FrameStruct -> Parameters = &FrameBuf[ISO15693_REQ_ADDR_PARAM + ISO15693_GENERIC_UID_SIZE]; else FrameStruct -> Parameters = &FrameBuf[ISO15693_REQ_ADDR_PARAM]; - + if ( (*FrameStruct -> Command) >= 0xA0) { /* if command is Custom or Proprietary */ /* then between CMD and UID is placed another byte which is IC Mfg Code, but we don't need it */ FrameStruct -> Parameters += 0x01; diff --git a/Firmware/Chameleon-Mini/Codec/ISO15693.c b/Firmware/Chameleon-Mini/Codec/ISO15693.c index 8c84219..bab785d 100644 --- a/Firmware/Chameleon-Mini/Codec/ISO15693.c +++ b/Firmware/Chameleon-Mini/Codec/ISO15693.c @@ -143,7 +143,7 @@ void isr_ISO15693_CODEC_TIMER_SAMPLING_CCC_VECT(void) CODEC_TIMER_SAMPLING.INTCTRLB = 0; } break; - + case DEMOD_1_OUT_OF_4_STATE: if (SampleRegister == EOC_CODE) { @@ -184,7 +184,7 @@ void isr_ISO15693_CODEC_TIMER_SAMPLING_CCC_VECT(void) } } break; - + case DEMOD_1_OUT_OF_256_STATE: if (SampleRegister == EOC_CODE) { @@ -252,7 +252,7 @@ void isr_ISO15693_CODEC_TIMER_LOADMOD_CCB_VECT(void) } else { return; } - + LOADMOD_START_SINGLE_LABEL: CodecStartSubcarrier(); ShiftRegister = SOF_PATTERN; @@ -276,7 +276,7 @@ void isr_ISO15693_CODEC_TIMER_LOADMOD_CCB_VECT(void) StateRegister = LOADMOD_SOF_SINGLE; } return; - + LOADMOD_BIT0_SINGLE_LABEL: //Manchester encoding if (ShiftRegister & 0x01) { /* Deactivate carrier */ @@ -288,7 +288,7 @@ void isr_ISO15693_CODEC_TIMER_LOADMOD_CCB_VECT(void) StateRegister = LOADMOD_BIT1_SINGLE; return; - + LOADMOD_BIT1_SINGLE_LABEL: //Manchester encoding if (ShiftRegister & 0x01) { CodecSetLoadmodState(true); @@ -312,7 +312,7 @@ void isr_ISO15693_CODEC_TIMER_LOADMOD_CCB_VECT(void) } } return; - + LOADMOD_EOF_SINGLE_LABEL: //End of Manchester encoding /* Output EOF */ if (ShiftRegister & 0x80) { @@ -333,7 +333,7 @@ void isr_ISO15693_CODEC_TIMER_LOADMOD_CCB_VECT(void) return; // ------------------------------------------------------------- - + LOADMOD_START_DUAL_LABEL: CodecStartSubcarrier(); ShiftRegister = SOF_PATTERN; @@ -514,11 +514,11 @@ void ISO15693CodecTask(void) { if (Flags.DemodFinished) { Flags.DemodFinished = 0; - + uint16_t DemodByteCount = ByteCount; uint16_t AppReceivedByteCount = 0; bool bDualSubcarrier = false; - + if (DemodByteCount > 0) { if (CodecBuffer[0] & ISO15693_REQ_SUBCARRIER_DUAL) @@ -531,13 +531,13 @@ void ISO15693CodecTask(void) } else { ApplicationReset(); } - + //This is only reached when we've received a valid frame if (AppReceivedByteCount > 0) { LogEntry(LOG_INFO_CODEC_TX_DATA, CodecBuffer, AppReceivedByteCount); CodecBufferPtr = CodecBuffer; ByteCount = AppReceivedByteCount; - + CodecStartSubcarrier(); /* Start loadmodulating */ @@ -548,7 +548,7 @@ void ISO15693CodecTask(void) StateRegister = LOADMOD_START_SINGLE; CodecSetSubcarrier(CODEC_SUBCARRIERMOD_OOK, SUBCARRIER_1); } - + } else { /* No data to be processed. Disable T1 waiting and * start listening again */ @@ -557,7 +557,7 @@ void ISO15693CodecTask(void) StartISO15693Demod(); } } - + if (Flags.LoadmodFinished) { Flags.LoadmodFinished = 0; /* Load modulation has been finished. Stop it and start to listen diff --git a/Firmware/Chameleon-Mini/Configuration.c b/Firmware/Chameleon-Mini/Configuration.c index 35b0de5..df5a1ff 100644 --- a/Firmware/Chameleon-Mini/Configuration.c +++ b/Firmware/Chameleon-Mini/Configuration.c @@ -38,19 +38,19 @@ static const MapEntryType PROGMEM ConfigurationMap[] = { { .Id = CONFIG_ISO14443A_READER, .Text = "ISO14443A_READER" }, #endif #ifdef CONFIG_VICINITY_SUPPORT - { .Id = CONFIG_VICINITY, .Text = "VICINITY" }, + { .Id = CONFIG_VICINITY, .Text = "VICINITY" }, #endif #ifdef CONFIG_ISO15693_SNIFF_SUPPORT - { .Id = CONFIG_ISO15693_SNIFF, .Text = "ISO15693_SNIFF" }, + { .Id = CONFIG_ISO15693_SNIFF, .Text = "ISO15693_SNIFF" }, #endif #ifdef CONFIG_SL2S2002_SUPPORT - { .Id = CONFIG_SL2S2002, .Text = "SL2S2002" }, + { .Id = CONFIG_SL2S2002, .Text = "SL2S2002" }, #endif #ifdef CONFIG_TITAGITSTANDARD_SUPPORT - { .Id = CONFIG_TITAGITSTANDARD, .Text = "TITAGITSTANDARD" }, + { .Id = CONFIG_TITAGITSTANDARD, .Text = "TITAGITSTANDARD" }, #endif #ifdef CONFIG_EM4233_SUPPORT - { .Id = CONFIG_EM4233, .Text = "EM4233" }, + { .Id = CONFIG_EM4233, .Text = "EM4233" }, #endif }; @@ -85,7 +85,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = 0, .MemorySize = 0, .ReadOnly = true, - .TagFamily = TAG_FAMILY_NONE + .TagFamily = TAG_FAMILY_NONE }, #ifdef CONFIG_MF_ULTRALIGHT_SUPPORT [CONFIG_MF_ULTRALIGHT] = { @@ -102,7 +102,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = MIFARE_ULTRALIGHT_UID_SIZE, .MemorySize = MIFARE_ULTRALIGHT_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, [CONFIG_MF_ULTRALIGHT_EV1_80B] = { .CodecInitFunc = ISO14443ACodecInit, @@ -118,7 +118,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = MIFARE_ULTRALIGHT_UID_SIZE, .MemorySize = MIFARE_ULTRALIGHT_EV11_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, [CONFIG_MF_ULTRALIGHT_EV1_164B] = { .CodecInitFunc = ISO14443ACodecInit, @@ -134,7 +134,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = MIFARE_ULTRALIGHT_UID_SIZE, .MemorySize = MIFARE_ULTRALIGHT_EV12_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, #endif #ifdef CONFIG_MF_CLASSIC_1K_SUPPORT @@ -152,7 +152,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = MIFARE_CLASSIC_UID_SIZE, .MemorySize = MIFARE_CLASSIC_1K_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, #endif #ifdef CONFIG_MF_CLASSIC_1K_7B_SUPPORT @@ -170,7 +170,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = ISO14443A_UID_SIZE_DOUBLE, .MemorySize = MIFARE_CLASSIC_1K_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, #endif #ifdef CONFIG_MF_CLASSIC_4K_SUPPORT @@ -188,7 +188,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = MIFARE_CLASSIC_UID_SIZE, .MemorySize = MIFARE_CLASSIC_4K_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, #endif #ifdef CONFIG_MF_CLASSIC_4K_7B_SUPPORT @@ -206,7 +206,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = ISO14443A_UID_SIZE_DOUBLE, .MemorySize = MIFARE_CLASSIC_4K_MEM_SIZE, .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO14443A + .TagFamily = TAG_FAMILY_ISO14443A }, #endif #ifdef CONFIG_ISO14443A_SNIFF_SUPPORT @@ -224,7 +224,7 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = 0, .MemorySize = 0, .ReadOnly = true, - .TagFamily = TAG_FAMILY_NONE + .TagFamily = TAG_FAMILY_NONE }, #endif #ifdef CONFIG_ISO14443A_READER_SUPPORT @@ -242,97 +242,97 @@ static const PROGMEM ConfigurationType ConfigurationTable[] = { .UidSize = 0, .MemorySize = 0, .ReadOnly = false, - .TagFamily = TAG_FAMILY_NONE + .TagFamily = TAG_FAMILY_NONE }, #endif #ifdef CONFIG_VICINITY_SUPPORT [CONFIG_VICINITY] = { - .CodecInitFunc = ISO15693CodecInit, - .CodecDeInitFunc = ISO15693CodecDeInit, - .CodecTaskFunc = ISO15693CodecTask, - .ApplicationInitFunc = VicinityAppInit, - .ApplicationResetFunc = VicinityAppReset, - .ApplicationTaskFunc = VicinityAppTask, - .ApplicationTickFunc = VicinityAppTick, - .ApplicationProcessFunc = VicinityAppProcess, - .ApplicationGetUidFunc = VicinityGetUid, - .ApplicationSetUidFunc = VicinitySetUid, - .UidSize = ISO15693_GENERIC_UID_SIZE, - .MemorySize = ISO15693_GENERIC_MEM_SIZE, - .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO15693 + .CodecInitFunc = ISO15693CodecInit, + .CodecDeInitFunc = ISO15693CodecDeInit, + .CodecTaskFunc = ISO15693CodecTask, + .ApplicationInitFunc = VicinityAppInit, + .ApplicationResetFunc = VicinityAppReset, + .ApplicationTaskFunc = VicinityAppTask, + .ApplicationTickFunc = VicinityAppTick, + .ApplicationProcessFunc = VicinityAppProcess, + .ApplicationGetUidFunc = VicinityGetUid, + .ApplicationSetUidFunc = VicinitySetUid, + .UidSize = ISO15693_GENERIC_UID_SIZE, + .MemorySize = ISO15693_GENERIC_MEM_SIZE, + .ReadOnly = false, + .TagFamily = TAG_FAMILY_ISO15693 }, #endif #ifdef CONFIG_ISO15693_SNIFF_SUPPORT [CONFIG_ISO15693_SNIFF] = { - .CodecInitFunc = ISO15693CodecInit, - .CodecDeInitFunc = ISO15693CodecDeInit, - .CodecTaskFunc = ISO15693CodecTask, - .ApplicationInitFunc = ApplicationInitDummy, - .ApplicationResetFunc = ApplicationResetDummy, - .ApplicationTaskFunc = ApplicationTaskDummy, - .ApplicationTickFunc = ApplicationTickDummy, - .ApplicationProcessFunc = ApplicationProcessDummy, - .ApplicationGetUidFunc = ApplicationGetUidDummy, - .ApplicationSetUidFunc = ApplicationSetUidDummy, - .UidSize = 0, - .MemorySize = 0, - .ReadOnly = true, - .TagFamily = TAG_FAMILY_NONE + .CodecInitFunc = ISO15693CodecInit, + .CodecDeInitFunc = ISO15693CodecDeInit, + .CodecTaskFunc = ISO15693CodecTask, + .ApplicationInitFunc = ApplicationInitDummy, + .ApplicationResetFunc = ApplicationResetDummy, + .ApplicationTaskFunc = ApplicationTaskDummy, + .ApplicationTickFunc = ApplicationTickDummy, + .ApplicationProcessFunc = ApplicationProcessDummy, + .ApplicationGetUidFunc = ApplicationGetUidDummy, + .ApplicationSetUidFunc = ApplicationSetUidDummy, + .UidSize = 0, + .MemorySize = 0, + .ReadOnly = true, + .TagFamily = TAG_FAMILY_NONE }, #endif #ifdef CONFIG_SL2S2002_SUPPORT [CONFIG_SL2S2002] = { - .CodecInitFunc = ISO15693CodecInit, - .CodecDeInitFunc = ISO15693CodecDeInit, - .CodecTaskFunc = ISO15693CodecTask, - .ApplicationInitFunc = Sl2s2002AppInit, - .ApplicationResetFunc = Sl2s2002AppReset, - .ApplicationTaskFunc = Sl2s2002AppTask, - .ApplicationTickFunc = Sl2s2002AppTick, - .ApplicationProcessFunc = Sl2s2002AppProcess, - .ApplicationGetUidFunc = Sl2s2002GetUid, - .ApplicationSetUidFunc = Sl2s2002SetUid, - .UidSize = ISO15693_GENERIC_UID_SIZE, - .MemorySize = ISO15693_GENERIC_MEM_SIZE, - .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO15693 + .CodecInitFunc = ISO15693CodecInit, + .CodecDeInitFunc = ISO15693CodecDeInit, + .CodecTaskFunc = ISO15693CodecTask, + .ApplicationInitFunc = Sl2s2002AppInit, + .ApplicationResetFunc = Sl2s2002AppReset, + .ApplicationTaskFunc = Sl2s2002AppTask, + .ApplicationTickFunc = Sl2s2002AppTick, + .ApplicationProcessFunc = Sl2s2002AppProcess, + .ApplicationGetUidFunc = Sl2s2002GetUid, + .ApplicationSetUidFunc = Sl2s2002SetUid, + .UidSize = ISO15693_GENERIC_UID_SIZE, + .MemorySize = ISO15693_GENERIC_MEM_SIZE, + .ReadOnly = false, + .TagFamily = TAG_FAMILY_ISO15693 }, #endif #ifdef CONFIG_TITAGITSTANDARD_SUPPORT [CONFIG_TITAGITSTANDARD] = { - .CodecInitFunc = ISO15693CodecInit, - .CodecDeInitFunc = ISO15693CodecDeInit, - .CodecTaskFunc = ISO15693CodecTask, - .ApplicationInitFunc = TITagitstandardAppInit, - .ApplicationResetFunc = TITagitstandardAppReset, - .ApplicationTaskFunc = TITagitstandardAppTask, - .ApplicationTickFunc = TITagitstandardAppTick, - .ApplicationProcessFunc = TITagitstandardAppProcess, - .ApplicationGetUidFunc = TITagitstandardGetUid, - .ApplicationSetUidFunc = TITagitstandardSetUid, - .UidSize = TITAGIT_STD_UID_SIZE, - .MemorySize = TITAGIT_STD_MEM_SIZE, - .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO15693 + .CodecInitFunc = ISO15693CodecInit, + .CodecDeInitFunc = ISO15693CodecDeInit, + .CodecTaskFunc = ISO15693CodecTask, + .ApplicationInitFunc = TITagitstandardAppInit, + .ApplicationResetFunc = TITagitstandardAppReset, + .ApplicationTaskFunc = TITagitstandardAppTask, + .ApplicationTickFunc = TITagitstandardAppTick, + .ApplicationProcessFunc = TITagitstandardAppProcess, + .ApplicationGetUidFunc = TITagitstandardGetUid, + .ApplicationSetUidFunc = TITagitstandardSetUid, + .UidSize = TITAGIT_STD_UID_SIZE, + .MemorySize = TITAGIT_STD_MEM_SIZE, + .ReadOnly = false, + .TagFamily = TAG_FAMILY_ISO15693 }, #endif #ifdef CONFIG_EM4233_SUPPORT [CONFIG_EM4233] = { - .CodecInitFunc = ISO15693CodecInit, - .CodecDeInitFunc = ISO15693CodecDeInit, - .CodecTaskFunc = ISO15693CodecTask, - .ApplicationInitFunc = EM4233AppInit, - .ApplicationResetFunc = EM4233AppReset, - .ApplicationTaskFunc = EM4233AppTask, - .ApplicationTickFunc = EM4233AppTick, - .ApplicationProcessFunc = EM4233AppProcess, - .ApplicationGetUidFunc = EM4233GetUid, - .ApplicationSetUidFunc = EM4233SetUid, - .UidSize = EM4233_STD_UID_SIZE, - .MemorySize = EM4233_STD_MEM_SIZE, - .ReadOnly = false, - .TagFamily = TAG_FAMILY_ISO15693 + .CodecInitFunc = ISO15693CodecInit, + .CodecDeInitFunc = ISO15693CodecDeInit, + .CodecTaskFunc = ISO15693CodecTask, + .ApplicationInitFunc = EM4233AppInit, + .ApplicationResetFunc = EM4233AppReset, + .ApplicationTaskFunc = EM4233AppTask, + .ApplicationTickFunc = EM4233AppTick, + .ApplicationProcessFunc = EM4233AppProcess, + .ApplicationGetUidFunc = EM4233GetUid, + .ApplicationSetUidFunc = EM4233SetUid, + .UidSize = EM4233_STD_UID_SIZE, + .MemorySize = EM4233_STD_MEM_SIZE, + .ReadOnly = false, + .TagFamily = TAG_FAMILY_ISO15693 }, #endif };