diff --git a/linux32_release_out/ufr b/linux32_release_out/ufr index 75299c894f461a07449dd08e832d2f9700765dc4..9b1186091ad61e69a041e1e2d7f7d7e34d66dc59 100644 Binary files a/linux32_release_out/ufr and b/linux32_release_out/ufr differ diff --git a/linux64_release_out/ufr b/linux64_release_out/ufr index 3805e95d0b15b3f3037639e3ad26fa1f73357140..19ffb63e410aa3d3c38d5eb95c0a06173a9a44cb 100644 Binary files a/linux64_release_out/ufr and b/linux64_release_out/ufr differ diff --git a/macos_release/libuFCoder-x86_64.dylib b/macos_release/libuFCoder-x86_64.dylib index c6a195b9ac18fb606b0dea7e0a917a8e9c6d0967..13a356f4c0360202295b29154d102245c7b12b5a 100644 Binary files a/macos_release/libuFCoder-x86_64.dylib and b/macos_release/libuFCoder-x86_64.dylib differ diff --git a/macos_release/ufr b/macos_release/ufr index a1b567a7a4dabc4c06d7d693f3e48ae5b89342e0..b3fc7cf842bb2df0b6cb77883e571ecbc42114b5 100644 Binary files a/macos_release/ufr and b/macos_release/ufr differ diff --git a/src/main.cpp b/src/main.cpp index 1ba3169297850a659f6409192503c333aff3e070..173abd450aba32fc84db3e1202c86c084184de1f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,7 +37,7 @@ int main(void) printf("--------------------------------------------------\n"); printf(" uFR NFC reader successfully opened.\n"); printf("--------------------------------------------------\n"); - //ReaderUISignal(1, 1); + ReaderUISignal(1, 1); } else { @@ -135,14 +135,17 @@ UFR_STATUS ReaderOpeningMode() case '2': cout << "Enter reader type: " << endl; - cin >> reader_type; + scanf("%d%*c", &reader_type); fflush(stdin); cout << endl << "Enter port name: " << endl; - getline(cin, portNameStr); + cin >> portInterfaceStr; + fflush(stdin); cout << endl << "Enter port interface: " << endl; - getline(cin, portInterfaceStr); + cin >> portInterfaceStr; + fflush(stdin); cout << endl << "Enter argument: " << endl; - getline(cin, argumentStr); + cin >> argumentStr; + fflush(stdin); if(portInterfaceStr == "U") { @@ -282,14 +285,6 @@ c_string GetDlTypeName(uint8_t dl_type_code) { return "DL_MIKRON_MIK640D"; case NFC_T2T_GENERIC: return "NFC_T2T_GENERIC"; - case DL_NT3H_1101: - return "DL_NT3H_1101"; - case DL_NT3H_1201: - return "DL_NT3H_1201"; - case DL_NT3H_2111: - return "DL_NT3H_2111"; - case DL_NT3H_2211: - return "DL_NT3H_2211"; case DL_MIFARE_MINI: return "DL_MIFARE_MINI"; case DL_MIFARE_CLASSIC_1K: diff --git a/src/ufr.cpp b/src/ufr.cpp index b20030422e7285517e6d689471de49e2948cdf03..92a0d23d38dd8f125a8b9dd2532cb94a2f94e098 100644 --- a/src/ufr.cpp +++ b/src/ufr.cpp @@ -109,7 +109,7 @@ void usage(void) printf("+------------------------------------------------+\n" "| Block (Read/Write) and Linear (Read/Write) |\n" "| version 1.0 |\n"); - cout << "| DLL version " << GetDllVersionStr() << " |\n"; + cout << "| DLL version " << GetDllVersionStr() << " |\n"; cout <<"+------------------------------------------------+\n"; printf(" For exit, hit escape.\n"); printf("--------------------------------------------------\n"); diff --git a/win32_release_out/uFCoder-x86.dll b/win32_release_out/uFCoder-x86.dll new file mode 100644 index 0000000000000000000000000000000000000000..3b9f2137d6e80317cf596d32d998e5710abf0f51 Binary files /dev/null and b/win32_release_out/uFCoder-x86.dll differ diff --git a/win32_release_out/ufr.exe b/win32_release_out/ufr.exe index a9d959d3707c569cec5167cc018476bc2f8b2078..f56e420330f36bf345318adc37e2e846b4567195 100644 Binary files a/win32_release_out/ufr.exe and b/win32_release_out/ufr.exe differ diff --git a/win64_release_out/uFCoder-x86_64.dll b/win64_release_out/uFCoder-x86_64.dll index ab056c22e61d630011b4db0c1afc0968cd203152..29ce49e87f4db6bd43004bcf75083853978bfc9c 100644 Binary files a/win64_release_out/uFCoder-x86_64.dll and b/win64_release_out/uFCoder-x86_64.dll differ diff --git a/win64_release_out/ufr.exe b/win64_release_out/ufr.exe index 0fff4244f6e2d605c39509efd86d3033bab0309d..37fcde925b21e835390142fda084311647341637 100644 Binary files a/win64_release_out/ufr.exe and b/win64_release_out/ufr.exe differ