Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mifare DESFire tag emulation support #287

Merged
merged 10 commits into from
Oct 19, 2020
Merged

Mifare DESFire tag emulation support #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81eae97
Moving the DESFire libnfc based testing code to the Software director…
maxieds Oct 17, 2020
ff138a6
Adding the DESFire tag emulation docs file
maxieds Oct 17, 2020
d1b8508
Including a sample DESFire tag dump and the command outputs that were…
maxieds Oct 17, 2020
5a74819
Placing the main source files for the DESFire tag support into Applic…
maxieds Oct 17, 2020
6f77cad
Updating the Makefile and relevant source code that has to change to …
maxieds Oct 17, 2020
d1829c5
The remainder of the changes to the source code made during the DESFi…
maxieds Oct 17, 2020
39c73c0
A few fixes and loose ends
maxieds Oct 18, 2020
3400d1f
Re-enabling some of the more verbose logging for DF configs with LIVE…
maxieds Oct 18, 2020
54128d4
Fixing logging issue where if starting from a logmode different from …
maxieds Oct 18, 2020
2189f91
Merge branch 'master' into desfire-emulation-support
fptrs Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing logging issue where if starting from a logmode different from … 
…LIVE with -DLOG_SETTING_GLOBAL set in the Makefile, the active configuration does not respond to LOGMODE=LIVE.
  • Loading branch information
@maxieds
maxieds committed Oct 18, 2020
commit 54128d4ec7f7f002981e11b154e877865875213f
4 changes: 2 additions & 2 deletions Firmware/Chameleon-Mini/Application/MifareDESFire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ uint16_t MifareDesfireProcess(uint8_t* Buffer, uint16_t BitCount) {
ISO14443AAppendCRCA(Buffer, BitCount);
BitCount += 2;
}
LogEntry(LOG_INFO_DESFIRE_OUTGOING_DATA, Buffer, BitCount);
//LogEntry(LOG_INFO_DESFIRE_OUTGOING_DATA, Buffer, BitCount);
return BitCount * BITS_PER_BYTE;
}
else {
Expand All @@ -219,7 +219,7 @@ uint16_t MifareDesfireProcess(uint8_t* Buffer, uint16_t BitCount) {

uint16_t MifareDesfireAppProcess(uint8_t* Buffer, uint16_t BitCount) {
size_t ByteCount = (BitCount + BITS_PER_BYTE - 1) / BITS_PER_BYTE;
LogEntry(LOG_INFO_DESFIRE_INCOMING_DATA, Buffer, ByteCount);
//LogEntry(LOG_INFO_DESFIRE_INCOMING_DATA, Buffer, ByteCount);
if(ByteCount >= 8 && DesfireCLA(Buffer[0]) && Buffer[2] == 0x00 &&
Buffer[3] == 0x00 && Buffer[4] == ByteCount - 8) {
return MifareDesfireProcess(Buffer, BitCount);
Expand Down
12 changes: 5 additions & 7 deletions Firmware/Chameleon-Mini/Log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,13 @@ uint16_t LogMemFree(void) {


void LogSetModeById(LogModeEnum Mode) {
#ifndef LOG_SETTING_GLOBAL
GlobalSettings.ActiveSettingPtr->LogMode = Mode;
#else
#ifdef LOG_SETTING_GLOBAL
/* Write Log settings globally */
for (uint8_t i = 0; i < SETTINGS_COUNT; i++) {
GlobalSettings.Settings[i].LogMode = Mode;
}
for (uint8_t i=0; i<SETTINGS_COUNT; i++) {
GlobalSettings.Settings[i].LogMode = Mode;
}
#endif

GlobalSettings.ActiveSettingPtr->LogMode = Mode;
switch (Mode) {
case LOG_MODE_OFF:
EnableLogSRAMtoFRAM = false;
Expand Down