Project added

a4ff85cb · developer29 · a4ff85cb · a4ff85cb · a4ff85cb · a4ff85cb
21 changed files
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "ufr-lib"]
+path = ufr-lib
+url = https://git.d-logic.net/nfc-rfid-reader-sdk/ufr-lib.git
--- a/bin/Debug/mfp_wxwidgets.exe
+++ b/bin/Debug/mfp_wxwidgets.exe
--- a/bin/Debug/uFCoder-x86.dll
+++ b/bin/Debug/uFCoder-x86.dll
--- a/bin/Debug/wxmsw311u_gcc_custom.dll
+++ b/bin/Debug/wxmsw311u_gcc_custom.dll
--- a/bin/Debug/wxmsw311u_gl_gcc_custom.dll
+++ b/bin/Debug/wxmsw311u_gl_gcc_custom.dll
--- a/bin/Release/mfp_wxwidgets.exe
+++ b/bin/Release/mfp_wxwidgets.exe
--- a/bin/Release/uFCoder-x86.dll
+++ b/bin/Release/uFCoder-x86.dll
--- a/bin/Release/wxmsw311u_gcc_custom.dll
+++ b/bin/Release/wxmsw311u_gcc_custom.dll
--- a/bin/Release/wxmsw311u_gl_gcc_custom.dll
+++ b/bin/Release/wxmsw311u_gl_gcc_custom.dll
--- a/mfp_wxwidgets.cbp
+++ b/mfp_wxwidgets.cbp
+
+
+major="1"minor="6"/>
+
+title="mfp_wxwidgets"/>
+pch_mode="2"/>
+compiler="gcc"/>
+
+title="Debug">
+output="bin/Debug/mfp_wxwidgets"prefix_auto="1"extension_auto="1"/>
+object_output="obj/Debug/"/>
+type="0"/>
+compiler="gcc"/>
+projectLinkerOptionsRelation="2"/>
+
+option="-g"/>
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+
+
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+
+
+library="libwxmsw31u.a"/>
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll"/>
+
+
+title="Release">
+output="bin/Release/mfp_wxwidgets"prefix_auto="1"extension_auto="1"/>
+object_output="obj/Release/"/>
+type="0"/>
+compiler="gcc"/>
+projectLinkerOptionsRelation="2"/>
+
+option="-O2"/>
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+
+
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+
+
+option="-s"/>
+library="libwxmsw31u.a"/>
+directory="C:/wxWidgets-3.1.1/lib/gcc_dll"/>
+
+
+
+
+option="-Wall"/>
+option="-pipe"/>
+option="-mthreads"/>
+option="-D__GNUWIN32__"/>
+option="-D__WXMSW__"/>
+option="-DWXUSINGDLL"/>
+option="-DwxUSE_UNICODE"/>
+directory="C:/wxWidgets-3.1.1/include"/>
+
+
+directory="C:/wxWidgets-3.1.1/include"/>
+
+
+option="-mthreads"/>
+library="ufr-lib/windows/x86/uFCoder-x86.dll"/>
+directory="ufr-lib/windows/x86"/>
+
+filename="mfp_wxwidgetsApp.cpp"/>
+filename="mfp_wxwidgetsApp.h"/>
+filename="mfp_wxwidgetsMain.cpp"/>
+filename="mfp_wxwidgetsMain.h"/>
+filename="resource.rc">
+compilerVar="WINDRES"/>
+
+filename="uFR.cpp"/>
+filename="uFR.h"/>
+filename="wxsmith/mfp_wxwidgetsframe.wxs"/>
+
+/>
+/>
+/>
+version="1">
+name="wxWidgets"src ="mfp_wxwidgetsApp.cpp"main="mfp_wxwidgetsFrame"init_handlers="necessary"language="CPP"/>
+
+wxs="wxsmith/mfp_wxwidgetsframe.wxs"src ="mfp_wxwidgetsMain.cpp"hdr="mfp_wxwidgetsMain.h"fwddecl="0"i18n ="1"name="mfp_wxwidgetsFrame"language="CPP"/>
+
+
+
+
+
--- a/mfp_wxwidgets.depend
+++ b/mfp_wxwidgets.depend
--- a/mfp_wxwidgets.layout
+++ b/mfp_wxwidgets.layout
+
+
+major="1"minor="0"/>
+name="Release"/>
+name="mfp_wxwidgetsMain.cpp"open="1"top="0"tabpos="1"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">
+
+position="299080"topLine="6148"/>
+
+
+
--- a/mfp_wxwidgetsApp.cpp
+++ b/mfp_wxwidgetsApp.cpp
+/***************************************************************
+* Name: mfp_wxwidgetsApp.cpp
+* Purpose: Code for Application Class
+* Author: Aleksandar Krstic (aleksandar.krstic@d-logic.rs)
+* Created: 2019-02-20
+* Copyright: Aleksandar Krstic (www.d-logic.net)
+* License:
+**************************************************************/
+
+#include "mfp_wxwidgetsApp.h"
+
+//(*AppHeaders
+#include "mfp_wxwidgetsMain.h"
+#include 
+//*)
+
+IMPLEMENT_APP(mfp_wxwidgetsApp);
+
+boolmfp_wxwidgetsApp::OnInit()
+{
+//(*AppInitialize
+boolwxsOK=true;
+wxInitAllImageHandlers();
+if(wxsOK)
+{
+mfp_wxwidgetsFrame*Frame=newmfp_wxwidgetsFrame(0);
+Frame->Show();
+SetTopWindow(Frame);
+}
+//*)
+returnwxsOK;
+
+}
--- a/mfp_wxwidgetsApp.h
+++ b/mfp_wxwidgetsApp.h
+/***************************************************************
+* Name: mfp_wxwidgetsApp.h
+* Purpose: Defines Application Class
+* Author: Aleksandar Krstic (aleksandar.krstic@d-logic.rs)
+* Created: 2019-02-20
+* Copyright: Aleksandar Krstic (www.d-logic.net)
+* License:
+**************************************************************/
+
+#ifndef MFP_WXWIDGETSAPP_H
+#define MFP_WXWIDGETSAPP_H
+
+#include 
+
+classmfp_wxwidgetsApp:publicwxApp
+{
+public:
+virtualboolOnInit();
+};
+
+#endif // MFP_WXWIDGETSAPP_H
--- a/mfp_wxwidgetsMain.cpp
+++ b/mfp_wxwidgetsMain.cpp
--- a/mfp_wxwidgetsMain.h
+++ b/mfp_wxwidgetsMain.h
--- a/resource.rc
+++ b/resource.rc
+aaaa ICON "wx/msw/std.ico"
+
+# include“wx /垃圾/ wx.rc”
--- a/uFR.cpp
+++ b/uFR.cpp
+#include "uFR.h"
+#include "ufr-lib/include/uFCoder.h"
+#include 
+#include 
+#include 
+#include 
+
+std::stringUFR::GetDlTypeName(uint8_tdl_type_code){
+
+switch(dl_type_code){
+caseDL_MIFARE_ULTRALIGHT:
+return"DL_MIFARE_ULTRALIGHT";
+caseDL_MIFARE_ULTRALIGHT_EV1_11:
+return"DL_MIFARE_ULTRALIGHT_EV1_11";
+caseDL_MIFARE_ULTRALIGHT_EV1_21:
+return"DL_MIFARE_ULTRALIGHT_EV1_21";
+caseDL_MIFARE_ULTRALIGHT_C:
+return"DL_MIFARE_ULTRALIGHT_C";
+caseDL_NTAG_203:
+return"DL_NTAG_203";
+caseDL_NTAG_210:
+return"DL_NTAG_210";
+caseDL_NTAG_212:
+return"DL_NTAG_212";
+caseDL_NTAG_213:
+return"DL_NTAG_213";
+caseDL_NTAG_215:
+return"DL_NTAG_215";
+caseDL_NTAG_216:
+return"DL_NTAG_216";
+caseDL_MIKRON_MIK640D:
+return"DL_MIKRON_MIK640D";
+caseDL_MIFARE_MINI:
+return"DL_MIFARE_MINI";
+caseDL_MIFARE_CLASSIC_1K:
+return"DL_MIFARE_CLASSIC_1K";
+caseDL_MIFARE_CLASSIC_4K:
+return"DL_MIFARE_CLASSIC_4K";
+caseDL_MIFARE_PLUS_S_2K_SL0:
+return"DL_MIFARE_PLUS_S_2K_SL0";
+caseDL_MIFARE_PLUS_S_4K_SL0:
+return"DL_MIFARE_PLUS_S_4K_SL0";
+caseDL_MIFARE_PLUS_X_2K_SL0:
+return"DL_MIFARE_PLUS_X_2K_SL0";
+caseDL_MIFARE_PLUS_X_4K_SL0:
+return"DL_MIFARE_PLUS_X_4K_SL0";
+caseDL_MIFARE_DESFIRE:
+return"DL_MIFARE_DESFIRE";
+caseDL_MIFARE_DESFIRE_EV1_2K:
+return"DL_MIFARE_DESFIRE_EV1_2K";
+caseDL_MIFARE_DESFIRE_EV1_4K:
+return"DL_MIFARE_DESFIRE_EV1_4K";
+caseDL_MIFARE_DESFIRE_EV1_8K:
+return"DL_MIFARE_DESFIRE_EV1_8K";
+caseDL_MIFARE_DESFIRE_EV2_2K:
+return"DL_MIFARE_DESFIRE_EV2_2K";
+caseDL_MIFARE_DESFIRE_EV2_4K:
+return"DL_MIFARE_DESFIRE_EV2_4K";
+caseDL_MIFARE_DESFIRE_EV2_8K:
+return"DL_MIFARE_DESFIRE_EV2_8K";
+caseDL_MIFARE_PLUS_S_2K_SL1:
+return"DL_MIFARE_PLUS_S_2K_SL1";
+caseDL_MIFARE_PLUS_X_2K_SL1:
+return"DL_MIFARE_PLUS_X_2K_SL1";
+caseDL_MIFARE_PLUS_EV1_2K_SL1:
+return"DL_MIFARE_PLUS_EV1_2K_SL1";
+caseDL_MIFARE_PLUS_X_2K_SL2:
+return"DL_MIFARE_PLUS_X_2K_SL2";
+caseDL_MIFARE_PLUS_S_2K_SL3:
+return"DL_MIFARE_PLUS_S_2K_SL3";
+caseDL_MIFARE_PLUS_X_2K_SL3:
+return"DL_MIFARE_PLUS_X_2K_SL3";
+caseDL_MIFARE_PLUS_EV1_2K_SL3:
+return“DL_MIFARE_PLUS_EV1_2K_SL3”;
+caseDL_MIFARE_PLUS_S_4K_SL1:
+return"DL_MIFARE_PLUS_S_4K_SL1";
+caseDL_MIFARE_PLUS_X_4K_SL1:
+return"DL_MIFARE_PLUS_X_4K_SL1";
+caseDL_MIFARE_PLUS_EV1_4K_SL1:
+return"DL_MIFARE_PLUS_EV1_4K_SL1";
+caseDL_MIFARE_PLUS_X_4K_SL2:
+return"DL_MIFARE_PLUS_X_4K_SL2";
+caseDL_MIFARE_PLUS_S_4K_SL3:
+return"DL_MIFARE_PLUS_S_4K_SL3";
+caseDL_MIFARE_PLUS_X_4K_SL3:
+return"DL_MIFARE_PLUS_X_4K_SL3";
+caseDL_MIFARE_PLUS_EV1_4K_SL3:
+return"DL_MIFARE_PLUS_EV1_4K_SL3";
+caseDL_GENERIC_ISO14443_4:
+return"DL_GENERIC_ISO_14443_4";
+caseDL_GENERIC_ISO14443_4_TYPE_B:
+return"DL_GENERIC_ISO14443_4_TYPE_B";
+caseDL_GENERIC_ISO14443_3_TYPE_B:
+return"DL_GENERIC_ISO14443_3_TYPE_B";
+caseDL_IMEI_UID:
+return"DL_IMEI_UID";
+}
+return"UNKNOWN CARD";
+}
+
+std::stringUFR::ConvertUint8ArrayToStr(uint8_t*arr,uint32_tlength,std::stringdelimiter){
+
+charhex[4];
+std::stringuidStr="";
+
+for(uint32_ti=0;i<length;i++){
+strcpy(hex,"");
+sprintf(hex,"%02X",arr[i]);
+uidStr+=hex;
+}
+
+for(uint32_ti=0;i<uidStr.length();i++){
+
+i=i+2;
+uidStr.insert(i,delimiter);
+}
+
+uidStr=uidStr.substr(0,uidStr.length()-1);
+
+returnuidStr;
+}
+
+voidUFR::ConvertToUint8Array(std::stringstr,uint8_t*array){
+
+for(unsignedinti=0;i<str.length()/2;i++){
+
+std::stringpart=str.substr(i*2,2);
+
+charstr1[32];
+char*ptr;
+strcpy(str1,part.c_str());
+
+array[i]=strtol(str1,&ptr,16);
+
+}
+
+}
--- a/uFR.h
+++ b/uFR.h
+#include 
+#include 
+#include 
+#include 
+
+classUFR{
+
+public:
+
+std::stringGetDlTypeName(uint8_tdl_type_code);
+std::stringConvertUint8ArrayToStr(uint8_t*arr,uint32_tlength,std::stringdelimiter);
+std::stringbyte_2_str(char*bytes,intsize,std::stringdelimiter);
+voidConvertToUint8Array(std::stringstr,uint8_t*array);
+
+};
--- a/ufr-lib@1bb26e64
+++ b/ufr-lib@1bb26e64
+Subproject commit 1bb26e641e5916a89010edb469dc5fa6fa94fa91
--- a/wxsmith/mfp_wxwidgetsframe.wxs
+++ b/wxsmith/mfp_wxwidgetsframe.wxs