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

Fixed hasty copy-paste

Browse Source
This commit is contained in:
Federico Cerutti
2020-09-09 20:13:59 +02:00
parent c6b936640f
commit d43942469a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Application/EM4233.c
-2
View File
@@ -23,8 +23,6 @@ static enum {
} State;
bool loggedIn;
uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
uint16_t ResponseByteCount;
void EM4233AppInit(void) {
State = STATE_READY;
Firmware/Chameleon-Mini/Application/ISO15693-A.c
+2
View File
@@ -3,7 +3,9 @@
#include <util/crc16.h>
CurrentFrame FrameInfo;
uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
uint8_t MyAFI;
uint16_t ResponseByteCount;
//Refer to ISO/IEC 15693-3:2001 page 41
uint16_t calculateCRC(void *FrameBuf, uint16_t FrameBufSize) {
Firmware/Chameleon-Mini/Application/ISO15693-A.h
+3 -1
View File
@@ -86,7 +86,9 @@ typedef struct {
bool Selected;
} CurrentFrame;
extern CurrentFrame FrameInfo; /* Holds current frame information */
extern uint8_t MyAFI; /* Holds current tag's AFI (is used in inventory) */
extern uint8_t Uid[];
extern uint8_t MyAFI; /* Holds current tag's AFI, used during inventory */
extern uint16_t ResponseByteCount; /* Length of response, used when building response frames */
void ISO15693AppendCRC(uint8_t *FrameBuf, uint16_t FrameBufSize);
bool ISO15693CheckCRC(void *FrameBuf, uint16_t FrameBufSize);
Firmware/Chameleon-Mini/Application/TITagitstandard.c
+1 -3
View File
@@ -18,8 +18,6 @@ static enum {
uint16_t UserLockBits_Mask = 0; /* Holds lock state of blocks */
uint16_t FactoryLockBits_Mask = 0; /* Holds lock state of blocks */
uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
uint16_t ResponseByteCount;
void TITagitstandardAppInit(void) {
State = STATE_READY;
@@ -216,7 +214,7 @@ void TITagitstandardGetUid(ConfigurationUidType Uid) {
TITagitstandardFlipUid(Uid);
}
void TITagitstandardSetUid(ConfigurationUidType Uid) {
void TITagitstandardSetUid(ConfigurationUidType NewUid) {
memcpy(Uid, NewUid, ActiveConfiguration.UidSize); // Update the local variable
// Reverse UID before writing it
TITagitstandardFlipUid(Uid);