diff --git a/README.md b/README.md index 5334cbc..85bdf52 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ reader. I do not have as an objective to explain the NFC norms or modulation techniques, there is a multitude of documentation accessible through Google, I will describe as simply as possible the method that i have used to implement this software. -Currently, detection and decoding for NFC-A (ISO14443A), NFC-B (ISO14443B) and NFC-V (ISO15693) modulation has been implemented. +Currently, detection and decoding for NFC-A (ISO14443A), NFC-B (ISO14443B), NFC-V (ISO15693) and preliminary NFC-F (Felica) +modulation has been implemented. ## Signal processing diff --git a/dat/conf/nfc-lab.conf b/dat/conf/nfc-lab.conf index fa6d76a..53a20fa 100644 --- a/dat/conf/nfc-lab.conf +++ b/dat/conf/nfc-lab.conf @@ -14,12 +14,12 @@ timeLimit=10000 powerLevelThreshold=0.01 [decoder.nfca] -enabled=false +enabled=true minimumModulationDeep=0.90 maximumModulationDeep=1.00 [decoder.nfcb] -enabled=false +enabled=true minimumModulationDeep=0.10 maximumModulationDeep=0.90 @@ -29,7 +29,7 @@ minimumModulationDeep=0.10 maximumModulationDeep=0.90 [decoder.nfcv] -enabled=false +enabled=true minimumModulationDeep=0.90 maximumModulationDeep=1.00 diff --git a/src/nfc-app/app-qt/CMakeLists.txt b/src/nfc-app/app-qt/CMakeLists.txt index 507d779..9dca7e6 100644 --- a/src/nfc-app/app-qt/CMakeLists.txt +++ b/src/nfc-app/app-qt/CMakeLists.txt @@ -8,8 +8,8 @@ set(PRIVATE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp) find_package(Qt5 COMPONENTS Core Widgets PrintSupport OpenGL REQUIRED) -#add_executable(nfc-lab WIN32 -add_executable(nfc-lab +add_executable(nfc-lab WIN32 +#add_executable(nfc-lab src/main/cpp/main.cpp src/main/cpp/main.rc src/main/cpp/QtApplication.cpp diff --git a/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp b/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp index d57d694..1266199 100644 --- a/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp +++ b/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp @@ -43,8 +43,8 @@ //#define NULL_LOG //#define STDERR_LOG -#define STDOUT_LOG -//#define FSTREAM_LOG +//#define STDOUT_LOG +#define FSTREAM_LOG namespace rt {