rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from doegox/uid7_fix_manufacturer_byte

Browse Source 
Add option to fix manufacturer byte on UID_LEFT_(DE/IN)CREMENT on 7-byte UID
This commit is contained in:
Georg Land
2017-01-17 09:52:15 +01:00
committed by GitHub
parent 55fdc8dd48 b95d3f2158
commit 64f297c36c
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Button.c
+14 -2
View File
@@ -47,11 +47,17 @@ static void ExecuteButtonAction(ButtonActionEnum ButtonAction)
case BUTTON_ACTION_UID_LEFT_INCREMENT:
{
uint8_t offset = 0;
#ifdef SUPPORT_UID7_FIX_MANUFACTURER_BYTE
if (ActiveConfiguration.UidSize == 7) {
offset = 1;
}
#endif
ApplicationGetUid(UidBuffer);
bool Carry = 1;
uint8_t i;
for (i=0; i<ActiveConfiguration.UidSize; i++) {
for (i=offset; i<ActiveConfiguration.UidSize; i++) {
if (Carry) {
if (UidBuffer[i] == 0xFF) {
Carry = 1;
@@ -91,11 +97,17 @@ static void ExecuteButtonAction(ButtonActionEnum ButtonAction)
case BUTTON_ACTION_UID_LEFT_DECREMENT:
{
uint8_t offset = 0;
#ifdef SUPPORT_UID7_FIX_MANUFACTURER_BYTE
if (ActiveConfiguration.UidSize == 7) {
offset = 1;
}
#endif
ApplicationGetUid(UidBuffer);
bool Carry = 1;
uint8_t i;
for (i=0; i<ActiveConfiguration.UidSize; i++) {
for (i=offset; i<ActiveConfiguration.UidSize; i++) {
if (Carry) {
if (UidBuffer[i] == 0x00) {
Carry = 1;
Firmware/Chameleon-Mini/Makefile
+3
View File
@@ -16,6 +16,9 @@ SETTINGS += -DCONFIG_ISO14443A_READER_SUPPORT
#Support magic mode on mifare classic configuration
SETTINGS += -DSUPPORT_MF_CLASSIC_MAGIC_MODE
#Don't touch manufacturer byte with BUTTON_ACTION_UID_LEFT_(DE/IN)CREMENT
SETTINGS += -DSUPPORT_UID7_FIX_MANUFACTURER_BYTE
#Support activating firmware upgrade mode through command-line
SETTINGS += -DSUPPORT_FIRMWARE_UPGRADE