V0.2.2

I forgot I have designed "Keep the client active" for issue #22
isBusy() is deprecated for blocking the port, but it doesn't matter.

Proxmark3GUI.pro

@@ -56,7 +56,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-VERSION = 0.2.0
+VERSION = 0.2.2
 QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
 QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
 QMAKE_TARGET_COMPANY = "wh201906"

README.md

@@ -34,8 +34,8 @@ A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) clie
 
 ## About Iceman fork/repo
 
-The [Iceman fork/repo](https://github.com/RfidResearchGroup/proxmark3) has more powerful functions like offline sniff. These guys even developed a new hardware called Proxmark3 RDV4 with smart card support. But the official repo and the Iceman repo is not fully compatible.  
-This GUI is compatible with Iceman/RRG repo(tested on v4.9237)  
+The [Iceman fork/repo](https://github.com/RfidResearchGroup/proxmark3) has more powerful functions. These guys even developed a new hardware called Proxmark3 RDV4 with smart card support. But the official repo and the Iceman repo is not fully compatible.  
+This GUI is compatible with Iceman/RRG repo(tested on v4.13441)  
 
 ***
 
@@ -51,7 +51,9 @@ Great thanks to him.
 ## Build on Linux
 
     cd ~
-    git clone https://github.com/wh201906/Proxmark3GUI.git
+    sudo apt-get update
+    sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev 
+    git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
     cd Proxmark3GUI
     mkdir build
     cd build
@@ -59,12 +61,23 @@ Great thanks to him.
     make
     make clean
     cp -r ../lang ./
+    cp -r ../config ./
     ./Proxmark3GUI
 
 ***
 
 ## Update Log:
 
+### V0.2.2
++ Load command format from external json file  
++ Fix bug [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)  
++ Support Iceman/RRG repo v4.13441
+
+### V0.2.1
++ Optimize MIFARE Classic reading logic  
++ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16)  
++ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now)  
+
 ### V0.2
 + Use Dock widget for more flexible layout  
 + Support basic LF commands  

README/doc/README_zh_CN.md

@@ -34,7 +34,7 @@
 
  ## 关于冰人版
  [冰人版](https://github.com/RfidResearchGroup/proxmark3)(Iceman/RRG)的客户端和固件更新更为激进，相比官方版具有更多的功能  
- 此GUI所有功能均兼容冰人版（在v4.9237上测试通过）  
+ 此GUI所有功能均兼容冰人版（在v4.13441上测试通过）  
 
 ***
 
@@ -50,7 +50,9 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
 ## 在Linux系统下编译
 
     cd ~
-    git clone https://github.com/wh201906/Proxmark3GUI.git
+    sudo apt-get update
+    sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev 
+    git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
     cd Proxmark3GUI
     mkdir build
     cd build
@@ -58,12 +60,23 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
     make
     make clean
     cp -r ../lang ./
+    cp -r ../config ./
     ./Proxmark3GUI
 
 ***
 
 ## 更新日志:
 
+### V0.2.2
++ 从外部文件加载客户端命令格式  
++ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)  
++ 兼容冰人版客户端 v4.13441
+
+### V0.2.1
++ 优化MIFARE Classic读卡逻辑
++ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) （配合新版RRG固件时无法读取扇区数据）
++ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) （路径中支持空格）
+
 ### V0.2
 + 使用浮动窗口，界面配置更加灵活  
 + 支持部分低频命令  

common/pm3process.cpp

@@ -26,7 +26,7 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
     currArgs = args;
 
     // using "-f" option to make the client output flushed after every print.
-    start(path, args, QProcess::Unbuffered | QProcess::ReadWrite);
+    start(path, args, QProcess::Unbuffered | QProcess::ReadWrite | QProcess::Text);
     if(waitForStarted(10000))
     {
         waitForReadyRead(10000);
@@ -36,11 +36,13 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
         {
             clientType = Util::CLIENTTYPE_ICEMAN;
             setRequiringOutput(true);
-            write("hw version\r\n");
-            for(int i = 0; i < 10; i++)
+            write("hw version\n");
+            for(int i = 0; i < 50; i++)
             {
                 waitForReadyRead(200);
                 result += *requiredOutput;
+                if(result.indexOf("os: ") != -1)
+                    break;
             }
             setRequiringOutput(false);
         }
@@ -52,8 +54,8 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
         {
             emit changeClientType(clientType);
             result = result.mid(result.indexOf("os: "));
-            result = result.left(result.indexOf("\r\n"));
-            result = result.mid(3, result.lastIndexOf(" ") - 3);
+            result = result.left(result.indexOf("\n"));
+            result = result.mid(4, result.indexOf(" ", 4) - 4);
             emit PM3StatedChanged(true, result);
         }
         else
@@ -105,6 +107,10 @@ void PM3Process::setSerialListener(bool state)
 
 void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly terminated or the PM3 hardware is removed, the isBusy() will return false(only tested on Windows);
 {
+//    isBusy() is a deprecated function because it will block the serial port when the port is not in use.
+//    However, the PM3 client is supposed to use the target serial port exclusively, so it should be fine
+//    isBusy() will always return false on Raspbian, in this case, check "Keep the client active" in the Settings panel.
+//
 //    qDebug()<<portInfo->isBusy();
     if(!portInfo->isBusy())
     {

common/util.cpp

@@ -31,10 +31,10 @@ void Util::execCMD(const QString& cmd)
 {
     qDebug() << "executing: " << cmd;
     if(isRunning)
-        emit write(cmd + "\r\n");
+        emit write(cmd + "\n");
 }
 
-QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger)
+QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger, bool rawOutput)
 {
     // if the trigger is empty, this function will wait trigger.waitTime then return all outputs during the wait time.
     // otherwise, this function will return empty string if no trigger is detected, or return outputs if any trigger is detected.
@@ -78,7 +78,7 @@ QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger)
         }
     }
     isRequiringOutput = false;
-    return (isResultFound || trigger.expectedOutputs.isEmpty() ? *requiredOutput : "");
+    return (isResultFound || trigger.expectedOutputs.isEmpty() || rawOutput ? *requiredOutput : "");
 }
 
 void Util::delay(unsigned int msec)

common/util.h

@@ -53,7 +53,7 @@ public:
     explicit Util(QObject *parent = nullptr);
 
     void execCMD(const QString& cmd);
-    QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000);
+    QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000, bool rawOutput = false);
     void delay(unsigned int msec);
     static ClientType getClientType();
     static int rawTabIndex;

config/config_official.json

@@ -0,0 +1,195 @@
+{
+    "//": "Based on Proxmark3 official repo v3.1.0, commit 6116334",
+    "//": "You can change this file if the command format of client changes",
+    "mifare classic": {
+        "nested": {
+            "cmd": "hf mf nested <card type> *",
+            "card type": {
+                "mini": "0",
+                "1k": "1",
+                "2k": "2",
+                "4k": "4"
+            },
+            "key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
+            "key A index": 2,
+            "key B index": 4
+        },
+        "check": {
+            "cmd": "hf mf chk *<card type> ?",
+            "card type": {
+                "mini": "0",
+                "1k": "1",
+                "2k": "2",
+                "4k": "4"
+            },
+            "key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
+            "key A index": 2,
+            "key B index": 3
+        },
+        "info": {
+            "cmd": "hf 14a info"
+        },
+        "sniff": {
+            "cmd": "hf mf sniff"
+        },
+        "sniff 14a": {
+            "cmd": "hf 14a snoop"
+        },
+        "list": {
+            "cmd": "hf list mf"
+        },
+        "dump": {
+            "cmd": "hf mf dump"
+        },
+        "restore": {
+            "cmd": "hf mf restore"
+        },
+        "emulator wipe": {
+            "cmd": "hf mf eclr"
+        },
+        "Magic Card wipe": {
+            "cmd": "hf mf cwipe <card type> f",
+            "card type": {
+                "mini": "0",
+                "1k": "1",
+                "2k": "2",
+                "4k": "4"
+            }
+        },
+        "emulator read block": {
+            "cmd": "hf mf eget <block>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "Magic Card read block": {
+            "cmd": "hf mf cgetblk <block>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "normal read block": {
+            "cmd": "hf mf rdbl <block> <key type> <key>",
+            "key type": {
+                "A": "A",
+                "B": "B"
+            },
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "darkside": {
+            "cmd": "hf mf mifare"
+        },
+        "save sniff": {
+            "cmd": "hf list mf -s <filename>"
+        },
+        "load sniff": {
+            "cmd": "hf list mf -l <filename>"
+        },
+        "hardnested": {
+            "cmd": "hf mf hardnested <known key block> <known key type> <known key> <target key block> <target key type>",
+            "known key type": {
+                "A": "A",
+                "B": "B"
+            },
+            "target key type": {
+                "A": "A",
+                "B": "B"
+            }
+        },
+        "normal read sector": {
+            "cmd": "hf mf rdsc <sector> <key type> <key>",
+            "key type": {
+                "A": "A",
+                "B": "B"
+            },
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "Magic Card read sector": {
+            "cmd": "hf mf cgetsc <sector>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "//": "When writing a block, if the result is not empty and doesn't contain the failed flag, the function will return true",
+        "normal write block": {
+            "cmd": "hf mf wrbl <block> <key type> <key> <data>",
+            "key type": {
+                "A": "A",
+                "B": "B"
+            },
+            "failed flag": [
+                "isOk:00"
+            ]
+        },
+        "Magic Card write block": {
+            "cmd": "hf mf csetblk <block> <data>",
+            "failed flag": [
+                "No chinese magic"
+            ]
+        },
+        "emulator write block": {
+            "cmd": "hf mf eset <block> <data>"
+        },
+        "Magic Card lock": {
+            "cmd": "hf 14a raw ",
+            "sequence": [
+                "-pa -b7 40",
+                "-pa 43",
+                "-pa E0 00 39 F7",
+                "-pa E1 00 E1 EE",
+                "-pa 85 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 18 47",
+                "-a 52"
+            ]
+        },
+        "Magic Card set parameter": {
+            "cmd": "hf mf csetuid <uid> <atqa> <sak>"
+        }
+    },
+    "lf": {
+        "read": {
+            "cmd": "lf read",
+            "show cmd": "data plot"
+        },
+        "sniff": {
+            "cmd": "lf snoop",
+            "show cmd": "data plot"
+        },
+        "search": {
+            "cmd": "lf search u"
+        },
+        "tune": {
+            "cmd": "hw tune l"
+        },
+        "get config": {
+            "cmd": "hw status",
+            "field start": "LF Sampling config:",
+            "field end": "USB Speed:",
+            "divisor": {
+                "flag": "divisor:",
+                "pattern": "\\d+"
+            },
+            "bits per sample": {
+                "flag": "bps:",
+                "pattern": "\\d+"
+            },
+            "decimation": {
+                "flag": "decimation:",
+                "pattern": "\\d+"
+            },
+            "averaging": {
+                "flag": "averaging:",
+                "pattern": "\\d+"
+            },
+            "trigger threshold": {
+                "flag": "trigger threshold:",
+                "pattern": "\\d+"
+            },
+            "samples to skip": {
+                "flag": "samples to skip:",
+                "pattern": "\\d+"
+            },
+            "//": "execute 'cmd' then find parameters between 'field stard' and 'field end'",
+            "//": "for each line, if the line doesn't have any flag, skip",
+            "//": "otherwise, delete characters before 'flag' and 'flag' itself, then use 'pattern' to get the parameter",
+            "//": "If 'replace' dict exists, replace all keys with respective values before getting parameters"
+        },
+        "set config": {
+            "cmd": "lf config q <divisor> b <bits per sample> d <decimation> a <averaging> t <trigger threshold> s <samples to skip>",
+            "divisor cmd": "hw setlfdivisor <divisor>"
+        }
+    }
+}

config/config_rrgv4.13.json

@@ -0,0 +1,203 @@
+{
+    "//": "Based on Proxmark3 rrg repo v4.13441, commit 35ddebc",
+    "//": "You can change this file if the command format of client changes",
+    "mifare classic": {
+        "nested": {
+            "cmd": "hf mf nested --<card type> --blk <block> -<key type> -k <key>",
+            "static cmd": "hf mf staticnested --<card type> --blk <block> -<key type> -k <key>",
+            "card type": {
+                "mini": "mini",
+                "1k": "1k",
+                "2k": "2k",
+                "4k": "4k"
+            },
+            "key type": {
+                "A": "a",
+                "B": "b"
+            },
+            "key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
+            "key A index": 2,
+            "key B index": 4
+        },
+        "check": {
+            "cmd": "hf mf chk --<card type>",
+            "card type": {
+                "mini": "mini",
+                "1k": "1k",
+                "2k": "2k",
+                "4k": "4k"
+            },
+            "key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
+            "key A index": 2,
+            "key B index": 4
+        },
+        "info": {
+            "cmd": "hf 14a info"
+        },
+        "sniff": {
+            "cmd": "hf sniff"
+        },
+        "sniff 14a": {
+            "cmd": "hf 14a sniff"
+        },
+        "list": {
+            "cmd": "trace list -t mf"
+        },
+        "dump": {
+            "cmd": "hf mf dump"
+        },
+        "restore": {
+            "cmd": "hf mf restore"
+        },
+        "emulator wipe": {
+            "cmd": "hf mf eclr"
+        },
+        "Magic Card wipe": {
+            "cmd": "hf mf cwipe"
+        },
+        "emulator read block": {
+            "cmd": "hf mf egetblk --blk <block>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "Magic Card read block": {
+            "cmd": "hf mf cgetblk --blk <block>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "normal read block": {
+            "cmd": "hf mf rdbl --blk <block> -<key type> -k <key>",
+            "key type": {
+                "A": "a",
+                "B": "b"
+            },
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "darkside": {
+            "cmd": "hf mf darkside"
+        },
+        "save sniff": {
+            "cmd": "trace save -f <filename>"
+        },
+        "load sniff": {
+            "cmd": "trace load -f <filename>",
+            "show cmd": "trace list --buffer -t mf"
+        },
+        "hardnested": {
+            "cmd": "hf mf hardnested --blk <known key block> -<known key type> -k <known key> --tblk <target key block> --t<target key type>",
+            "known key type": {
+                "A": "a",
+                "B": "b"
+            },
+            "target key type": {
+                "A": "a",
+                "B": "b"
+            }
+        },
+        "normal read sector": {
+            "cmd": "hf mf rdsc --sec <sector> -<key type> -k <key>",
+            "key type": {
+                "A": "a",
+                "B": "b"
+            },
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "Magic Card read sector": {
+            "cmd": "hf mf cgetsc --sec <sector>",
+            "data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
+        },
+        "//": "When writing a block, if the result is not empty and doesn't contain the failed flag, the function will return true",
+        "normal write block": {
+            "cmd": "hf mf wrbl --blk <block> -<key type> -k <key> -d <data>",
+            "key type": {
+                "A": "a",
+                "B": "b"
+            },
+            "failed flag": [
+                "fail",
+                "error"
+            ]
+        },
+        "Magic Card write block": {
+            "cmd": "hf mf csetblk --blk <block> -d <data>",
+            "failed flag": [
+                "fail",
+                "error"
+            ]
+        },
+        "emulator write block": {
+            "cmd": "hf mf esetblk --blk <block> -d <data>"
+        },
+        "Magic Card lock": {
+            "cmd": "hf 14a raw ",
+            "sequence": [
+                "-ak -b 7 40",
+                "-ak 43",
+                "-ak E0 00 39 F7",
+                "-ak E1 00 E1 EE",
+                "-ak 85 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 18 47",
+                "-a 52"
+            ]
+        },
+        "Magic Card set parameter": {
+            "cmd": "hf mf csetuid --uid <uid> --atqa <atqa> --sak <sak>"
+        }
+    },
+    "lf": {
+        "read": {
+            "cmd": "lf read -v",
+            "show cmd": "data plot"
+        },
+        "sniff": {
+            "cmd": "lf sniff -v",
+            "show cmd": "data plot"
+        },
+        "search": {
+            "cmd": "lf search -u"
+        },
+        "tune": {
+            "cmd": "lf tune --divisor <divisor>"
+        },
+        "get config": {
+            "cmd": "hw status",
+            "field start": "LF Sampling config",
+            "field end": "LF Sampling Stack",
+            "divisor": {
+                "flag": "divisor",
+                "pattern": "\\d+"
+            },
+            "bits per sample": {
+                "flag": "bits per sample",
+                "pattern": "\\d+"
+            },
+            "decimation": {
+                "flag": "decimation",
+                "pattern": "\\d+"
+            },
+            "averaging": {
+                "flag": "averaging",
+                "pattern": "\\d+",
+                "replace": {
+                    "yes": "1",
+                    "no": "0",
+                    "Yes": "1",
+                    "No": "0"
+                }
+            },
+            "trigger threshold": {
+                "flag": "trigger threshold",
+                "pattern": "\\d+"
+            },
+            "samples to skip": {
+                "flag": "samples to skip",
+                "pattern": "\\d+"
+            },
+            "//": "execute 'cmd' then find parameters between 'field stard' and 'field end'",
+            "//": "for each line, if the line doesn't have any flag, skip",
+            "//": "otherwise, delete characters before 'flag' and 'flag' itself, then use 'pattern' to get the parameter",
+            "//": "If 'replace' dict exists, replace all keys with respective values before getting parameters"
+        },
+        "set config": {
+            "cmd": "lf config --divisor <divisor> --bps <bits per sample> --dec <decimation> --avg <averaging> --trig <trigger threshold> --skip <samples to skip>",
+            "divisor cmd": "hw setlfdivisor -d <divisor>"
+        }
+    }
+}

main.cpp

@@ -5,11 +5,13 @@
 #include <QTranslator>
 #include <QMessageBox>
 #include <QTextCodec>
+#include <QDir>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    QDir *langPath = new QDir();
     QApplication a(argc, argv);
     MainWindow w;
 
@@ -29,14 +31,10 @@ int main(int argc, char *argv[])
         else
             currLang = "en_US";
     }
-    currLang = "lang/" + currLang;
-#ifdef Q_OS_WIN
     currLang += ".qm";
-#else
-    currLang += ".ts";;
-#endif
+    langPath->cd("lang");
     QTranslator* translator = new QTranslator(&w);
-    if(translator->load(currLang))
+    if(translator->load(currLang, langPath->absolutePath()))
     {
         a.installTranslator(translator);
     }
@@ -45,6 +43,7 @@ int main(int argc, char *argv[])
         QMessageBox::information(&w, "Error", "Can't load " + currLang + " as translation file.");
     }
     delete settings;
+    delete langPath;
     w.initUI();
     w.show();
     return a.exec();

module/lf.cpp

@@ -1,6 +1,7 @@
 #include "lf.h"
+#include <QJsonArray>
 
-const LF::Config LF::defaultConfig;
+const LF::LFConfig LF::defaultLFConfig;
 
 LF::LF(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
 {
@@ -8,142 +9,122 @@ LF::LF(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
     util = addr;
     this->ui = ui;
 
-    configPattern = new QRegularExpression("(\\d+)|Yes|No");
-    currConfig = defaultConfig;
+    LFconfigPattern = new QRegularExpression("(\\d+)|Yes|No");
+    currLFConfig = defaultLFConfig;
 }
 
 void LF::read()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("lf read");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("lf read -v");
+    QVariantMap config = configMap["read"].toMap();
+    util->execCMD(config["cmd"].toString());
     Util::gotoRawTab();
-    util->execCMD("data plot");
+    util->execCMD(config["show cmd"].toString());
 }
 
 void LF::sniff()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("lf snoop");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("lf sniff -v");
+    QVariantMap config = configMap["sniff"].toMap();
+    util->execCMD(config["cmd"].toString());
     Util::gotoRawTab();
-    util->execCMD("data plot");
+    util->execCMD(config["show cmd"].toString());
 }
 
 void LF::search()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("lf search u");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("lf search -u");
+    QVariantMap config = configMap["search"].toMap();
+    util->execCMD(config["cmd"].toString());
     Util::gotoRawTab();
 }
 
 void LF::tune()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hw tune l");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("lf tune --divisor " + QString::number(currConfig.divisor));
+    QVariantMap config = configMap["tune"].toMap();
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
+    util->execCMD(cmd);
     Util::gotoRawTab();
 }
 
-void LF::getConfig()
+bool LF::getLFConfig_helper(const QVariantMap& map, QString& str, int* result)
 {
+    int len;
+    QString flag = map["flag"].toString();
+    QRegularExpressionMatch reMatch;
+    if(!str.contains(flag))
+        return false;
+    len = str.length() - (str.indexOf(flag) + flag.length());
+    str = str.right(len);
+    if(map.contains("replace"))
+    {
+        QVariantMap table = map["replace"].toMap();
+        for(auto it = table.begin(); it != table.end(); it++)
+        {
+            str.replace(it.key(), it.value().toString());
+        }
+    }
+    reMatch = QRegularExpression(map["pattern"].toString()).match(str);
+    if(!reMatch.hasMatch())
+        return false;
+    *result = reMatch.captured().toInt();
+    qDebug() << *result;
+    return true;
+
+}
+
+void LF::getLFConfig()
+{
+
     QRegularExpressionMatch reMatch;
     QString result;
     QStringList resultList;
-    QStringList symbolList =
+    int start, end, temp;
+    QVariantMap config = configMap["get config"].toMap();
+    QString cmd = config["cmd"].toString();
+    result = util->execCMDWithOutput(cmd, 400);
+    start = result.indexOf(config["field start"].toString());
+    end = result.indexOf(config["field end"].toString());
+    result = result.mid(start, end - start);
+    resultList = result.split("\n", Qt::SkipEmptyParts);
+    qDebug() << "LF CONFIG GET\n" << resultList;
+    for(auto it = resultList.begin(); it != resultList.end(); it++)
     {
-        "divisor",
-        "bps",
-        "bits per sample",
-        "decimation",
-        "averaging",
-        "trigger threshold",
-        "samples to skip"
-    };
-    int offset;
-    QStringList configList = {"", "", "", "", "", "", ""};
-    result = util->execCMDWithOutput("hw status", 400); // not all output from "hw status will be processed".
-    result = result.right(result.length() - result.indexOf("LF Sampling config"));
-    offset = result.indexOf("samples to skip");
-    offset = result.indexOf("\r\n", offset);
-    result = result.mid(0, offset + 2);
-    qDebug() << "LF CONFIG GET\n" << result;
-    resultList = result.split("\r\n");
-    for(int i = 0; i < resultList.length(); i++)
-    {
-        for(int j = 0; j < symbolList.length(); j++)
-        {
-            if(!configList[j].isEmpty())
-                continue;
-            offset = resultList[i].indexOf(symbolList[j]);
-            if(offset != -1)
-            {
-                reMatch = configPattern->match(resultList[i]);
-                qDebug() << "finded: " << resultList[i];
-                if(!reMatch.hasMatch())
-                    continue;
-                qDebug() << "captured: " << reMatch.captured();
-                configList[j] = reMatch.captured();
-                break;
-            }
-        }
-    }
-    qDebug() << "configList: " << configList;
-    currConfig.divisor = configList[0].toUInt();
-    currConfig.decimation = configList[3].toUInt();
-    currConfig.triggerThreshold = configList[5].toUInt();
-    currConfig.samplesToSkip = configList[6].toUInt();
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-    {
-        currConfig.bitPerSample = configList[1].toUInt();
-        currConfig.averaging = (configList[4] == "1");
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        currConfig.bitPerSample = configList[2].toUInt();
-        currConfig.averaging = (configList[4] == "Yes");
+        if(getLFConfig_helper(config["divisor"].toMap(), *it, &temp))
+            currLFConfig.divisor = temp;
+        else if(getLFConfig_helper(config["bits per sample"].toMap(), *it, &temp))
+            currLFConfig.bitsPerSample = temp;
+        else if(getLFConfig_helper(config["decimation"].toMap(), *it, &temp))
+            currLFConfig.decimation = temp;
+        else if(getLFConfig_helper(config["averaging"].toMap(), *it, &temp))
+            currLFConfig.averaging = (bool)temp;
+        else if(getLFConfig_helper(config["trigger threshold"].toMap(), *it, &temp))
+            currLFConfig.triggerThreshold = temp;
+        else if(getLFConfig_helper(config["samples to skip"].toMap(), *it, &temp))
+            currLFConfig.samplesToSkip = temp;
     }
     syncWithUI();
 }
 
-void LF::setConfig(LF::Config config)
+void LF::setLFConfig(LF::LFConfig lfconfig)
 {
-    currConfig = config;
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-    {
-        util->execCMDWithOutput(QString("lf config")
-                                + " q " + QString::number(currConfig.divisor)
-                                + " b " + QString::number(currConfig.bitPerSample)
-                                + " d " + QString::number(currConfig.decimation)
-                                + " a " + QString(currConfig.averaging ? "1" : "0")
-                                + " t " + QString::number(currConfig.triggerThreshold)
-                                + " s " + QString::number(currConfig.samplesToSkip),
-                                500);
-        util->execCMDWithOutput("hw setlfdivisor " + QString::number(currConfig.divisor), 500);
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        util->execCMDWithOutput(QString("lf config")
-                                + " -a " + QString(currConfig.averaging ? "1" : "0")
-                                + " -b " + QString::number(currConfig.bitPerSample)
-                                + " --dec " + QString::number(currConfig.decimation)
-                                + " --divisor " + QString::number(currConfig.divisor)
-                                + " -s " + QString::number(currConfig.samplesToSkip)
-                                + " -t " + QString::number(currConfig.triggerThreshold),
-                                500);
-        util->execCMDWithOutput("hw setlfdivisor -d " + QString::number(currConfig.divisor), 500);
-    }
+    currLFConfig = lfconfig;
+    QVariantMap config = configMap["set config"].toMap();
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
+    cmd.replace("<bits per sample>", QString::number(currLFConfig.bitsPerSample));
+    cmd.replace("<decimation>", QString::number(currLFConfig.decimation));
+    cmd.replace("<averaging>", currLFConfig.averaging ? "1" : "0");
+    cmd.replace("<trigger threshold>", QString::number(currLFConfig.triggerThreshold));
+    cmd.replace("<samples to skip>", QString::number(currLFConfig.samplesToSkip));
+    util->execCMDWithOutput(cmd, 500);
+    cmd = config["divisor cmd"].toString();
+    cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
+    util->execCMDWithOutput(cmd, 500);
 }
 
-void LF::resetConfig()
+void LF::resetLFConfig()
 {
-    setConfig(defaultConfig);
-    getConfig();
+    setLFConfig(defaultLFConfig);
+    getLFConfig();
 }
 
 float LF::divisor2Freq(uint8_t divisor)
@@ -158,10 +139,16 @@ uint8_t LF::freq2Divisor(float freq)
 
 void LF::syncWithUI()
 {
-    ui->LF_Conf_freqDivisorBox->setValue(currConfig.divisor); // will trigger valueChanged()
-    ui->LF_Conf_bitPerSampleBox->setValue(currConfig.bitPerSample);
-    ui->LF_Conf_decimationBox->setValue(currConfig.decimation);
-    ui->LF_Conf_averagingBox->setChecked(currConfig.averaging);
-    ui->LF_Conf_thresholdBox->setValue(currConfig.triggerThreshold);
-    ui->LF_Conf_skipsBox->setValue(currConfig.samplesToSkip);
+    ui->LF_LFConf_freqDivisorBox->setValue(currLFConfig.divisor); // will trigger valueChanged()
+    ui->LF_LFConf_bitsPerSampleBox->setValue(currLFConfig.bitsPerSample);
+    ui->LF_LFConf_decimationBox->setValue(currLFConfig.decimation);
+    ui->LF_LFConf_averagingBox->setChecked(currLFConfig.averaging);
+    ui->LF_LFConf_thresholdBox->setValue(currLFConfig.triggerThreshold);
+    ui->LF_LFConf_skipsBox->setValue(currLFConfig.samplesToSkip);
+}
+
+void LF::setConfigMap(const QVariantMap& configMap)
+{
+    this->configMap = configMap;
+    qDebug() << configMap;
 }

module/lf.h

@@ -12,17 +12,17 @@ class LF : public QObject
 public:
     explicit LF(Ui::MainWindow *ui, Util *addr, QWidget *parent = nullptr);
 
-    struct Config
+    struct LFConfig
     {
         uint8_t divisor;
-        uint8_t bitPerSample;
+        uint8_t bitsPerSample;
         uint8_t decimation;
         bool averaging;
         uint8_t triggerThreshold;
         uint16_t samplesToSkip;
     };
 
-    static constexpr Config defaultConfig =
+    static constexpr LFConfig defaultLFConfig =
     {
         95,
         8,
@@ -36,19 +36,22 @@ public:
     void sniff();
     void search();
     void tune();
-    void getConfig();
-    void setConfig(LF::Config config);
-    void resetConfig();
+    void getLFConfig();
+    void setLFConfig(LF::LFConfig lfconfig);
+    void resetLFConfig();
     static float divisor2Freq(uint8_t divisor);
     static uint8_t freq2Divisor(float freq);
 
+    void setConfigMap(const QVariantMap &configMap);
 private:
     QWidget* parent;
     Ui::MainWindow *ui;
     Util* util;
-    Config currConfig;
-    QRegularExpression* configPattern;
+    LFConfig currLFConfig;
+    QRegularExpression* LFconfigPattern;
+    QVariantMap configMap;
     void syncWithUI();
+    bool getLFConfig_helper(const QVariantMap& map, QString& str, int* result);
 signals:
 
 };

module/mifare.cpp

@@ -1,4 +1,5 @@
 #include "mifare.h"
+#include <QJsonArray>
 
 const Mifare::CardType Mifare::card_mini =
 {
@@ -87,29 +88,37 @@ Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
     keyPattern = new QRegularExpression("\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|");
 }
 
-QString Mifare::info(bool isRequiringOutput)
+void Mifare::setConfigMap(const QVariantMap& configMap)
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
+    this->configMap = configMap;
+    qDebug() << configMap;
+}
+
+QMap<QString, QString> Mifare::info(bool isRequiringOutput)
 {
+    QMap<QString, QString> map;
+    QVariantMap config = configMap["info"].toMap();
     if(isRequiringOutput)
     {
-            QString result = util->execCMDWithOutput("hf 14a info", 500);
-            int begin, end;
-            begin = result.indexOf("UID");
-            if(begin != -1)
+        QString result = util->execCMDWithOutput(config["cmd"].toString(), 500);
+        QStringList lineList = result.split("\n");
+
+        for(auto line = lineList.begin(); line != lineList.end(); line++)
         {
-                end = result.indexOf("SAK", begin);
-                end = result.indexOf("\n", end);
-                return result.mid(begin, end - begin + 1);
+            if(line->contains("UID"))
+                map["UID"] = line->replace("UID", "").replace(QRegularExpression("[^0-9a-fA-F]"), "").trimmed();
+            else if(line->contains("ATQA"))
+                map["ATQA"] = line->replace("ATQA", "").replace(QRegularExpression("[^0-9a-fA-F]"), "").trimmed();
+            else if(line->contains("SAK"))
+                map["SAK"] = line->replace("SAK", "").replace(QRegularExpression("\\[.+?\\]"), "").replace(QRegularExpression("[^0-9a-fA-F]"), "").trimmed();
         }
     }
     else
     {
-            util->execCMD("hf 14a info");
+        util->execCMD(config["cmd"].toString());
         Util::gotoRawTab();
     }
-    }
-    return "";
+    return map;
 }
 
 void Mifare::chk()
@@ -118,131 +127,117 @@ void Mifare::chk()
     QString result;
     int offset = 0;
     QString data;
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-    {
+    QVariantMap config = configMap["check"].toMap();
+    QString cmd = config["cmd"].toString();
+    int keyAindex = config["key A index"].toInt();
+    int keyBindex = config["key B index"].toInt();
+    QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString());
+    cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
+
     result = util->execCMDWithOutput(
-                     "hf mf chk *"
-                     + QString::number(cardType.type)
-                     + " ?",
-                     Util::ReturnTrigger(1000 + cardType.sector_size * 200, {"No valid", keyPattern->pattern()}));
-        qDebug() << result;
+                 cmd,
+                 Util::ReturnTrigger(1000 + cardType.sector_size * 200, {"No valid", keyPattern.pattern()}));
     for(int i = 0; i < cardType.sector_size; i++)
     {
-            reMatch = keyPattern->match(result, offset);
+        reMatch = keyPattern.match(result, offset);
         offset = reMatch.capturedStart();
         if(reMatch.hasMatch())
         {
             data = reMatch.captured().toUpper();
             offset += data.length();
             QStringList cells = data.remove(" ").split("|");
-                if(!cells[2].contains("?"))
+            if(!cells[keyAindex].contains(QRegularExpression("[^0-9a-fA-F]")))
             {
-                    keyAList->replace(i, cells[2]);
+                keyAList->replace(i, cells[keyAindex]);
             }
-                if(!cells[3].contains("?"))
+            if(!cells[keyBindex].contains(QRegularExpression("[^0-9a-fA-F]")))
             {
-                    keyBList->replace(i, cells[3]);
-                }
-            }
-        }
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        result = util->execCMDWithOutput(
-                     "hf mf chk --"
-                     + cardType.typeText,
-                     Util::ReturnTrigger(1000 + cardType.sector_size * 200, {"No valid", keyPattern_res->pattern()}));
-        qDebug() << "mf_chk_iceman_result" << result;
-        for(int i = 0; i < cardType.sector_size; i++)
-        {
-            reMatch = keyPattern_res->match(result, offset);
-            offset = reMatch.capturedStart();
-            if(reMatch.hasMatch())
-            {
-                data = reMatch.captured().toUpper();
-                offset += data.length();
-                QStringList cells = data.remove(" ").split("|");
-                if(cells[3] == "1")
-                {
-                    keyAList->replace(i, cells[2]);
-                }
-                if(cells[5] == "1")
-                {
-                    keyBList->replace(i, cells[4]);
+                keyBList->replace(i, cells[keyBindex]);
             }
         }
     }
 
-    }
     data_syncWithKeyWidget();
 }
 
-void Mifare::nested()
+void Mifare::nested(bool isStaticNested)
 {
+    QVariantMap config = configMap["nested"].toMap();
+    QString cmd;
+    if(isStaticNested)
+        cmd = config["static cmd"].toString();
+    else
+        cmd = config["cmd"].toString();
+    int keyAindex = config["key A index"].toInt();
+    int keyBindex = config["key B index"].toInt();
+    QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString());
     QRegularExpressionMatch reMatch;
     QString result;
     int offset = 0;
     QString data;
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
+
+    cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
+    if(cmd.contains(QRegularExpression("<.+>"))) // need at least one section key
     {
-        result = util->execCMDWithOutput(
-                     "hf mf nested "
-                     + QString::number(cardType.type)
-                     + " *",
-                     Util::ReturnTrigger(15000, {"Can't found", "\\|000\\|"}));
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        QString knownKeyInfo = "";
+        QString knownKey, knownKeyType;
+        int knownKeySector = -1;
         for(int i = 0; i < cardType.sector_size; i++)
         {
             if(data_isKeyValid(keyAList->at(i)))
             {
-                knownKeyInfo = " --blk " + QString::number(i * 4) + " -a -k " + keyAList->at(i);
+                knownKeyType = "A";
+                knownKey = keyAList->at(i);
+                knownKeySector = i;
+                break;
+            }
+            else if(data_isKeyValid(keyBList->at(i)))
+            {
+                knownKeyType = "B";
+                knownKey = keyBList->at(i);
+                knownKeySector = i;
                 break;
             }
         }
-        if(knownKeyInfo == "")
+        if(knownKeySector != -1)
         {
-            for(int i = 0; i < cardType.sector_size; i++)
-            {
-                if(data_isKeyValid(keyBList->at(i)))
-                {
-                    knownKeyInfo = " --blk " + QString::number(i * 4) + " -b -k " + keyBList->at(i);
-                    break;
-                }
-            }
-        }
-        if(knownKeyInfo != "")
-        {
-            result = util->execCMDWithOutput(
-                         "hf mf nested --"
-                         + cardType.typeText
-                         + knownKeyInfo,
-                         Util::ReturnTrigger(15000, {"Can't authenticate", keyPattern_res->pattern()}));
+            cmd.replace("<block>", QString::number(cardType.blks[knownKeySector]));
+            cmd.replace("<key type>", config["key type"].toMap()[knownKeyType].toString());
+            cmd.replace("<key>", knownKey);
         }
         else
         {
             QMessageBox::information(parent, tr("Info"), tr("Plz provide at least one known key"));
+            return;
         }
 
     }
+    result = util->execCMDWithOutput(
+                 cmd,
+                 Util::ReturnTrigger(15000, {"Can't found", "Can't authenticate", keyPattern_res->pattern()}),
+                 true);
+
+    if(result.contains("static") && !isStaticNested)
+    {
+        nested(true);
+        return;
+    }
+
     for(int i = 0; i < cardType.sector_size; i++)
     {
-        reMatch = keyPattern_res->match(result, offset);
+        reMatch = keyPattern.match(result, offset);
         offset = reMatch.capturedStart();
         if(reMatch.hasMatch())
         {
             data = reMatch.captured().toUpper();
             offset += data.length();
             QStringList cells = data.remove(" ").split("|");
-            if(cells[3] == "1")
+            if(!cells[keyAindex].contains(QRegularExpression("[^0-9a-fA-F]")))
             {
-                keyAList->replace(i, cells[2]);
+                keyAList->replace(i, cells[keyAindex]);
             }
-            if(cells[5] == "1")
+            if(!cells[keyBindex].contains(QRegularExpression("[^0-9a-fA-F]")))
             {
-                keyBList->replace(i, cells[4]);
+                keyBList->replace(i, cells[keyBindex]);
             }
         }
     }
@@ -252,7 +247,8 @@ void Mifare::nested()
 
 void Mifare::hardnested()
 {
-    MF_Attack_hardnestedDialog dialog(cardType.block_size);
+    QVariantMap config = configMap["hardnested"].toMap();
+    MF_Attack_hardnestedDialog dialog(cardType.block_size, config);
     connect(&dialog, &MF_Attack_hardnestedDialog::sendCMD, util, &Util::execCMD);
     if(dialog.exec() == QDialog::Accepted)
         Util::gotoRawTab();
@@ -260,40 +256,32 @@ void Mifare::hardnested()
 
 void Mifare::darkside()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf mf mifare");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf mf darkside");
+    QVariantMap config = configMap["darkside"].toMap();
+    util->execCMD(config["cmd"].toString());
 
     Util::gotoRawTab();
 }
 
 void Mifare::sniff()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf mf sniff");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf sniff");
+    QVariantMap config = configMap["sniff"].toMap();
+    util->execCMD(config["cmd"].toString());
 
     Util::gotoRawTab();
 }
 
 void Mifare::sniff14a()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf 14a snoop");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf 14a sniff");
+    QVariantMap config = configMap["sniff 14a"].toMap();
+    util->execCMD(config["cmd"].toString());
 
     Util::gotoRawTab();
 }
 
 void Mifare::list()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf list mf");
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("trace list -t mf");
+    QVariantMap config = configMap["list"].toMap();
+    util->execCMD(config["cmd"].toString());
 
     Util::gotoRawTab();
 }
@@ -305,24 +293,22 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
     QRegularExpressionMatch currMatch;
     bool isTrailerBlock = (blockId < 128 && ((blockId + 1) % 4 == 0)) || ((blockId + 1) % 16 == 0);
 
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
     if(targetType == TARGET_MIFARE)
     {
         if(!data_isKeyValid(key))
         {
             return "";
         }
+        QVariantMap config = configMap["normal read block"].toMap();
+        QString cmd = config["cmd"].toString();
+        QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
+        cmd.replace("<block>", QString::number(blockId));
+        cmd.replace("<key type>", config["key type"].toMap()[QString((char)keyType)].toString());
+        cmd.replace("<key>", key);
         // use the given key type to read the target block
-            result = util->execCMDWithOutput(
-                         "hf mf rdbl "
-                         + QString::number(blockId)
-                         + " "
-                         + (char)keyType
-                         + " "
-                         + key,
-                         waitTime);
-            currMatch = dataPattern->match(result);
+        result = util->execCMDWithOutput(cmd, waitTime);
+
+        currMatch = dataPattern.match(result);
         if(currMatch.hasMatch())
         {
             data = currMatch.captured().toUpper();
@@ -349,11 +335,12 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
     }
     else if(targetType == TARGET_UID)
     {
-            result = util->execCMDWithOutput(
-                         "hf mf cgetblk "
-                         + QString::number(blockId),
-                         waitTime);
-            currMatch = dataPattern->match(result);
+        QVariantMap config = configMap["Magic Card read block"].toMap();
+        QString cmd = config["cmd"].toString();
+        QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
+        cmd.replace("<block>", QString::number(blockId));
+        result = util->execCMDWithOutput(cmd, waitTime);
+        currMatch = dataPattern.match(result);
         if(currMatch.hasMatch())
         {
             data = currMatch.captured().toUpper();
@@ -362,36 +349,23 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
         else
             data = "";
     }
-    }
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
+    else if(targetType == TARGET_EMULATOR)
     {
-        if(targetType == TARGET_EMULATOR)
-        {
-            result = util->execCMDWithOutput(
-                         "hf mf eget "
-                         + QString::number(blockId),
-                         150);
-            data = dataPattern->match(result).captured().toUpper();
+        QVariantMap config = configMap["emulator read block"].toMap();
+        QString cmd = config["cmd"].toString();
+        QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
+        cmd.replace("<block>", QString::number(blockId));
+        result = util->execCMDWithOutput(cmd, 150);
+        data = dataPattern.match(result).captured().toUpper();
         data.remove(" ");
     }
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        if(targetType == TARGET_EMULATOR)
-        {
-            result = util->execCMDWithOutput(
-                         "hf mf egetblk "
-                         + QString::number(blockId),
-                         150);
-            data = dataPattern->match(result).captured().toUpper();
-            data.remove(" ");
-        }
-    }
+
     return data;
 }
 
 QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key, TargetType targetType, int waitTime)
 {
+    QVariantMap config;
     QStringList data;
     QString result, tmp;
     QRegularExpressionMatch reMatch;
@@ -402,8 +376,6 @@ QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key,
         data.append("");
     }
 
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
     // try to read all blocks together
     if(targetType == TARGET_MIFARE)
     {
@@ -411,29 +383,37 @@ QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key,
         {
             return data;
         }
-            result = util->execCMDWithOutput(
-                         "hf mf rdsc "
-                         + QString::number(sectorId)
-                         + " "
-                         + (char)keyType
-                         + " "
-                         + key,
-                         waitTime);
-            offset = result.indexOf("isOk:01"); // find successful flag
+        config = configMap["normal read sector"].toMap();
+        QString cmd = config["cmd"].toString();
+        cmd.replace("<sector>", QString::number(sectorId));
+        cmd.replace("<key type>", config["key type"].toMap()[QString((char)keyType)].toString());
+        cmd.replace("<key>", key);
+        result = util->execCMDWithOutput(cmd, waitTime);
     }
     else if(targetType == TARGET_UID)
     {
-            result = util->execCMDWithOutput(
-                         "hf mf cgetsc "
-                         + QString::number(sectorId),
-                         waitTime);
-            offset = result.indexOf("error") == -1 ? 0 : -1; // find failed flag
+        config = configMap["Magic Card read sector"].toMap();
+        QString cmd = config["cmd"].toString();
+        cmd.replace("<sector>", QString::number(sectorId));
+        result = util->execCMDWithOutput(cmd, waitTime);
     }
-        if(offset != -1)
+    else if(targetType == TARGET_EMULATOR)
+    {
+        for(int i = 0; i < cardType.blk[sectorId]; i++)
+            data[i] = _readblk(cardType.blks[sectorId] + i, keyType, key, targetType, waitTime);
+        return data;
+    }
+
+    // for TARGET_MIFARE and TARGET_UID
+    // if targetType == TARGET_EMULATOR, this function has returned
+    QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
+    reMatch = dataPattern.match(result);
+    offset = reMatch.capturedStart();
+    if(reMatch.hasMatch()) // read successful
     {
         for(int i = 0; i < cardType.blk[sectorId]; i++)
         {
-                reMatch = dataPattern->match(result, offset);
+            reMatch = dataPattern.match(result, offset);
             offset = reMatch.capturedStart();
             if(reMatch.hasMatch())
             {
@@ -444,13 +424,11 @@ QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key,
             }
         }
     }
-        // if failed, try to read them seperately.
-        // (when one of the block cannot be read, the rdsc will return nothing, so you need to read the rest of blocks manually)
-        else if(targetType == TARGET_UID || targetType == TARGET_EMULATOR) // if the targetType is Chinese Magic Card, then the result implies the backdoor command is invalid.
-        {
-            for(int i = 0; i < cardType.blk[sectorId]; i++)
-                data[i] = _readblk(cardType.blks[sectorId] + i, keyType, key, targetType, waitTime);
-        }
+    // when one of the block cannot be read, the rdsc will return nothing, so you need to read the rest of blocks manually
+    // the following rdbl operation is not handled there, for better speed(rdsc_A->rdsc_B->rdbl0~3)
+    else if(targetType == TARGET_UID) // treat as MIFARE
+        data = _readsec(sectorId, keyType, key, TARGET_MIFARE, waitTime);
+
 
     //process trailer(like _readblk())
     QString trailer = data[cardType.blk[sectorId] - 1];
@@ -472,7 +450,7 @@ QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key,
         }
         data[cardType.blk[sectorId] - 1] = trailer;
     }
-    }
+
     return data;
 }
 
@@ -493,7 +471,6 @@ void Mifare::readOne(TargetType targetType)
 
 void Mifare::readSelected(TargetType targetType)
 {
-    QStringList data, dataA, dataB;
     QString trailerA, trailerB;
     QList<bool> selectedSectors;
     QList<int> selectedBlocks;
@@ -513,12 +490,11 @@ void Mifare::readSelected(TargetType targetType)
     }
 
     for(int i = 0; i < cardType.sector_size; i++)
-    {
     {
         if(!selectedSectors[i])
-            {
             continue;
-            }
+
+        QStringList data, dataA, dataB;
         for(int j = 0; j < cardType.blk[i]; j++)
         {
             // dataA is always filled with "" because of the _readsec()
@@ -529,24 +505,41 @@ void Mifare::readSelected(TargetType targetType)
         dataA = _readsec(i, Mifare::KEY_A, keyAList->at(i), targetType);
 
         // in other situations, the key doesn't matters
+        // so the dataA is the final result
+        //
+        // if the targetType is TARGET_MIFARE and the dataA has unknown part, try to read by keyB
         if(targetType == TARGET_MIFARE && (dataA.contains("") || dataA[cardType.blk[i] - 1].right(12) == "????????????"))
             dataB = _readsec(i, Mifare::KEY_B, keyBList->at(i), targetType);
 
+        // process trailer block seperately
+        if(dataA[cardType.blk[i] - 1] == "" && selectedBlocks.contains(getTrailerBlockId(i)))
+            dataA[cardType.blk[i] - 1] = _readblk(getTrailerBlockId(i), Mifare::KEY_A, keyAList->at(i), targetType);
+        if(dataB[cardType.blk[i] - 1] == "" && dataA[cardType.blk[i] - 1].right(12) == "????????????" && selectedBlocks.contains(getTrailerBlockId(i)))
+            dataB[cardType.blk[i] - 1] = _readblk(getTrailerBlockId(i), Mifare::KEY_B, keyBList->at(i), targetType);
+
+
         for(int j = 0; j < cardType.blk[i]; j++)
         {
             if(dataA[j] != "")
                 data[j] = dataA[j];
             else
                 data[j] = dataB[j];
+
+            if(data[j] == "" && selectedBlocks.contains(cardType.blks[i] + j)) // try rdbl seperately
+            {
+                data[j] = _readblk(cardType.blks[i] + j, Mifare::KEY_A, keyAList->at(i), targetType);
+                if(data[j] == "")
+                    data[j] = _readblk(cardType.blks[i] + j, Mifare::KEY_B, keyBList->at(i), targetType);
+            }
         }
 
         // process trailer block seperately
         trailerA = dataA[cardType.blk[i] - 1];
         trailerB = dataB[cardType.blk[i] - 1];
-            if(trailerA != "" && trailerB != "")
+        if(trailerA != "" && trailerB != "") // if KeyA and KeyB can both read the trailer, then concat them
         {
             QString ACbits = trailerA.mid(12, 8);
-                QString key_A = trailerA.left(12);
+            QString key_A = trailerA.left(12); // KeyA cannot be read by KeyB
             QString key_B = trailerA.at(31) != '?' ? trailerA.right(12) : trailerB.right(12);
             data[cardType.blk[i] - 1] = key_A + ACbits + key_B;
         }
@@ -560,7 +553,7 @@ void Mifare::readSelected(TargetType targetType)
             }
         }
 
-            if(selectedBlocks.contains(cardType.blks[i] + cardType.blk[i] - 1))
+        if(selectedBlocks.contains(getTrailerBlockId(i)))
         {
             // data widget has been updated, so this is just a temporary varient.
             if(data[cardType.blk[i] - 1] == "")
@@ -574,8 +567,6 @@ void Mifare::readSelected(TargetType targetType)
             data_syncWithKeyWidget(false, i, KEY_A);
             data_syncWithKeyWidget(false, i, KEY_B);
         }
-
-        }
     }
 }
 
@@ -588,45 +579,57 @@ bool Mifare::_writeblk(int blockId, KeyType keyType, const QString& key, const Q
     if(data_isDataValid(input) != DATA_NOSPACE)
         return false;
 
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
     if(targetType == TARGET_MIFARE)
     {
         if(!data_isKeyValid(key))
             return false;
-            result = util->execCMDWithOutput(
-                         "hf mf wrbl "
-                         + QString::number(blockId)
-                         + " "
-                         + (char)keyType
-                         + " "
-                         + key
-                         + " "
-                         + input,
-                         waitTime);
-            return (result.indexOf("isOk:01") != -1);
+        QVariantMap config = configMap["normal write block"].toMap();
+        QString cmd = config["cmd"].toString();
+        cmd.replace("<block>", QString::number(blockId));
+        cmd.replace("<key type>", config["key type"].toMap()[QString((char)keyType)].toString());
+        cmd.replace("<key>", key);
+        cmd.replace("<data>", input);
+        result = util->execCMDWithOutput(cmd, waitTime);
+        if(result.isEmpty())
+            return false;
+
+        QVariantList failedFlag = config["failed flag"].toJsonArray().toVariantList();
+        for(auto flag = failedFlag.begin(); flag != failedFlag.end(); flag++)
+        {
+            if(result.contains(flag->toString()))
+                return false;
+        }
+        return true;
     }
     else if(targetType == TARGET_UID)
     {
-            result = util->execCMDWithOutput(
-                         "hf mf csetblk "
-                         + QString::number(blockId)
-                         + " "
-                         + input,
-                         waitTime);
-            return (result.indexOf("error") == -1); // failed flag
+        QVariantMap config = configMap["Magic Card write block"].toMap();
+        QString cmd = config["cmd"].toString();
+        cmd.replace("<block>", QString::number(blockId));
+        cmd.replace("<data>", input);
+        result = util->execCMDWithOutput(cmd, waitTime);
+        if(result.isEmpty())
+            return false;
+
+        QVariantList failedFlag = config["failed flag"].toJsonArray().toVariantList();
+        for(auto flag = failedFlag.begin(); flag != failedFlag.end(); flag++)
+        {
+            if(result.contains(flag->toString()))
+                return false;
+        }
+        return true;
     }
     else if(targetType == TARGET_EMULATOR)
     {
-            util->execCMD(
-                "hf mf eset "
-                + QString::number(blockId)
-                + " "
-                + input);
+        QVariantMap config = configMap["emulator write block"].toMap();
+        QString cmd = config["cmd"].toString();
+        cmd.replace("<block>", QString::number(blockId));
+        cmd.replace("<data>", input);
+        util->execCMD(cmd);
         util->delay(5);
         return true;
     }
-    }
+
     return false;
 }
 
@@ -740,50 +743,40 @@ void Mifare::writeSelected(TargetType targetType)
 
 void Mifare::dump()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf mf dump");
+    QVariantMap config = configMap["dump"].toMap();
+    util->execCMD(config["cmd"].toString());
     Util::gotoRawTab();
 }
 
 void Mifare::restore()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf mf restore");
+    QVariantMap config = configMap["restore"].toMap();
+    util->execCMD(config["cmd"].toString());
     Util::gotoRawTab();
 }
 
 void Mifare::wipeC()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-    {
-        util->execCMD(
-            "hf mf cwipe "
-            + QString::number(cardType.type)
-            + " f");
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        util->execCMD("hf mf cwipe");
-    }
+    QVariantMap config = configMap["Magic Card wipe"].toMap();
+    QString cmd = config["cmd"].toString();
+    if(cmd.contains("<card type>"))
+        cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
+    util->execCMD(cmd);
     Util::gotoRawTab();
 }
 
 void Mifare::setParameterC()
 {
-    QString result = info(true);
-    if(result == "")
+    QVariantMap config = configMap["Magic Card set parameter"].toMap();
+    QMap<QString, QString> result = info(true);
+    if(result.isEmpty())
+    {
         QMessageBox::information(parent, tr("Info"), tr("Failed to read card."));
+        return;
+    }
     else
     {
-        result.replace("\r\n", "");
-        result.replace(QRegularExpression("\\[.\\]"), "");
-        result.replace("UID", "");
-        result.replace("ATQA", "");
-        result.replace("SAK", "");
-        result.replace(" ", "");
-        QStringList lis = result.split(':');
-        qDebug() << lis;
-        MF_UID_parameterDialog dialog(lis[1].toUpper(), lis[2].toUpper(), lis[3].toUpper());
+        MF_UID_parameterDialog dialog(result["UID"].toUpper(), result["ATQA"].toUpper(), result["SAK"].toUpper(), config);
         connect(&dialog, &MF_UID_parameterDialog::sendCMD, util, &Util::execCMD);
         if(dialog.exec() == QDialog::Accepted)
             Util::gotoRawTab();
@@ -792,30 +785,20 @@ void Mifare::setParameterC()
 
 void Mifare::lockC()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
+    QVariantMap config = configMap["Magic Card lock"].toMap();
+    QString cmd = config["cmd"].toString();
+    QVariantList list = config["sequence"].toJsonArray().toVariantList();
+    for(auto item = list.begin(); item != list.end(); item++)
     {
-        util->execCMD("hf 14a raw -pa -b7 40");
-        util->execCMD("hf 14a raw -pa 43");
-        util->execCMD("hf 14a raw -pa E0 00 39 F7");
-        util->execCMD("hf 14a raw -pa E1 00 E1 EE");
-        util->execCMD("hf 14a raw -pa 85  00  00  00  00  00  00  00  00  00  00  00  00  00  00  08  18  47");
-        util->execCMD("hf 14a raw -a 52");
-    }
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-    {
-        util->execCMD("hf 14a raw -ak -b 7 40");
-        util->execCMD("hf 14a raw -ak 43");
-        util->execCMD("hf 14a raw -ak E0 00 39 F7");
-        util->execCMD("hf 14a raw -ak E1 00 E1 EE");
-        util->execCMD("hf 14a raw -ak 85  00  00  00  00  00  00  00  00  00  00  00  00  00  00  08  18  47");
-        util->execCMD("hf 14a raw -a 52");
+        qDebug() << cmd + item->toString();
+        util->execCMD(cmd + item->toString());
     }
 }
 
 void Mifare::wipeE()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("hf mf eclr");
+    QVariantMap config = configMap["emulator wipe"].toMap();
+    util->execCMD(config["cmd"].toString());
 }
 
 void Mifare::simulate()
@@ -828,12 +811,17 @@ void Mifare::simulate()
 
 void Mifare::loadSniff(const QString& file)
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf list mf -l " + file);
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
+    QVariantMap config = configMap["load sniff"].toMap();
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<filename>", file);
+    if(config.contains("show cmd"))
     {
-        if(util->execCMDWithOutput("trace load -f " + file, Util::ReturnTrigger({"loaded"})) != "")
-            util->execCMD("trace list -t mf");
+        if(util->execCMDWithOutput(cmd, Util::ReturnTrigger({"loaded"})) != "")
+            util->execCMD(config["show cmd"].toString());
+    }
+    else
+    {
+        util->execCMD(cmd);
     }
 
     Util::gotoRawTab();
@@ -841,10 +829,10 @@ void Mifare::loadSniff(const QString& file)
 
 void Mifare::saveSniff(const QString& file)
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        util->execCMD("hf list mf -s " + file);
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
-        util->execCMD("trace save -f " + file);
+    QVariantMap config = configMap["save sniff"].toMap();
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<filename>", file);
+    util->execCMD(cmd);
 
     Util::gotoRawTab();
 }
@@ -860,11 +848,11 @@ void Mifare::data_syncWithDataWidget(bool syncAll, int block)
             tmp = "";
             if(dataList->at(i) != "")
             {
-                tmp += dataList->at(i).mid(0, 2);
+                tmp += dataList->at(i).midRef(0, 2);
                 for(int j = 1; j < 16; j++)
                 {
                     tmp += " ";
-                    tmp += dataList->at(i).mid(j * 2, 2);
+                    tmp += dataList->at(i).midRef(j * 2, 2);
                 }
             }
             ui->MF_dataWidget->item(i, 2)->setText(tmp);
@@ -875,11 +863,11 @@ void Mifare::data_syncWithDataWidget(bool syncAll, int block)
         tmp = "";
         if(dataList->at(block) != "")
         {
-            tmp += dataList->at(block).mid(0, 2);
+            tmp += dataList->at(block).midRef(0, 2);
             for(int j = 1; j < 16; j++)
             {
                 tmp += " ";
-                tmp += dataList->at(block).mid(j * 2, 2);
+                tmp += dataList->at(block).midRef(j * 2, 2);
             }
         }
         ui->MF_dataWidget->item(block, 2)->setText(tmp);
@@ -1052,7 +1040,7 @@ bool Mifare::data_loadDataFile(const QString& filename)
         else
         {
             QString tmp = buff.left(cardType.block_size * 34);
-            QStringList tmpList = tmp.split("\r\n");
+            QStringList tmpList = tmp.split("\n");
             for(int i = 0; i < cardType.block_size; i++)
             {
                 dataList->replace(i, tmpList[i].toUpper());
@@ -1090,7 +1078,7 @@ bool Mifare::data_loadKeyFile(const QString& filename)
         {
             for(int i = 0; i < cardType.sector_size; i++)
             {
-                int blk = cardType.blks[i] + cardType.blk[i] - 1;
+                int blk = getTrailerBlockId(i);
                 QString tmp = bin2text(buff, blk, 16);
                 keyAList->replace(i, tmp.left(12).toUpper());
                 keyBList->replace(i, tmp.right(12).toUpper());
@@ -1155,7 +1143,7 @@ bool Mifare::data_saveDataFile(const QString& filename, bool isBin)
             for(int i = 0; i < cardType.block_size; i++)
             {
                 buff += dataList->at(i);
-                buff += "\r\n";
+                buff += "\n";
             }
         }
         bool ret = file.write(buff) != -1;
@@ -1230,17 +1218,17 @@ void Mifare::data_key2Data()
         else
             tmp += "????????????";
 
-        if(dataList->at(cardType.blks[i] + cardType.blk[i] - 1) == "")
+        if(dataList->at(getTrailerBlockId(i)) == "")
             tmp += "FF078069"; // default control bytes
         else
-            tmp += dataList->at(cardType.blks[i] + cardType.blk[i] - 1).mid(12, 8);
+            tmp += dataList->at(getTrailerBlockId(i)).midRef(12, 8);
 
         if(data_isKeyValid(keyBList->at(i)))
             tmp += keyBList->at(i);
         else
             tmp += "????????????";
 
-        dataList->replace(cardType.blks[i] + cardType.blk[i] - 1, tmp);
+        dataList->replace(getTrailerBlockId(i), tmp);
         data_syncWithDataWidget();
     }
 }
@@ -1249,15 +1237,15 @@ void Mifare::data_data2Key()
 {
     for(int i = 0; i < cardType.sector_size; i++)
     {
-        if(dataList->at(cardType.blks[i] + cardType.blk[i] - 1) == "")
+        if(dataList->at(getTrailerBlockId(i)) == "")
         {
             keyAList->replace(i, "????????????");
             keyBList->replace(i, "????????????");
         }
         else
         {
-            keyAList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12));
-            keyBList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12));
+            keyAList->replace(i, dataList->at(getTrailerBlockId(i)).left(12));
+            keyBList->replace(i, dataList->at(getTrailerBlockId(i)).right(12));
         }
         data_syncWithKeyWidget();
     }
@@ -1348,3 +1336,18 @@ QString Mifare::data_getUID()
     else
         return "";
 }
+
+quint16 Mifare::getTrailerBlockId(quint8 sectorId, qint8 cardTypeId)
+{
+    if(cardTypeId == 0)
+        return (card_mini.blks[sectorId] + card_mini.blk[sectorId] - 1);
+    else if(cardTypeId == 1)
+        return (card_1k.blks[sectorId] + card_1k.blk[sectorId] - 1);
+    else if(cardTypeId == 2)
+        return (card_2k.blks[sectorId] + card_2k.blk[sectorId] - 1);
+    else if(cardTypeId == 4)
+        return (card_4k.blks[sectorId] + card_4k.blk[sectorId] - 1);
+    else
+        // other cardTypeId: use current cardtype(include default -1)
+        return (cardType.blks[sectorId] + cardType.blk[sectorId] - 1);
+}

module/mifare.h

@@ -11,6 +11,7 @@
 #include <QStringList>
 #include <QRegularExpression>
 #include <QMessageBox>
+#include <QJsonObject>
 class Mifare : public QObject
 {
     Q_OBJECT
@@ -64,9 +65,9 @@ public:
     static const AccessType trailerReadCondition[8][3];
     static const AccessType trailerWriteCondition[8][3];
 
-    QString info(bool isRequiringOutput = false);
+    QMap<QString, QString> info(bool isRequiringOutput = false);
     void chk();
-    void nested();
+    void nested(bool isStaticNested = false);
     void darkside();
     void hardnested();
     void sniff();
@@ -112,6 +113,8 @@ public:
     static int data_b2s(int block);
     static bool data_isACBitsValid(const QString& text, QList<quint8> *returnHalfBytes = nullptr);
     QString data_getUID();
+    quint16 getTrailerBlockId(quint8 sectorId, qint8 cardTypeId = -1); // -1: use current cardtype
+    void setConfigMap(const QVariantMap& configMap);
 public slots:
 signals:
 
@@ -120,6 +123,8 @@ private:
     Ui::MainWindow *ui;
     Util* util;
 
+    QVariantMap configMap;
+
     QStringList* keyAList;
     QStringList* keyBList;
     QStringList* dataList;

ui/mainwindow.cpp

@@ -1,6 +1,8 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
+#include <QJsonDocument>
+
 MainWindow::MainWindow(QWidget *parent):
     QMainWindow(parent)
     , ui(new Ui::MainWindow)
@@ -70,6 +72,22 @@ MainWindow::~MainWindow()
     delete pm3Thread;
 }
 
+void MainWindow::loadConfig()
+{
+    QFile configList(ui->Set_Client_configPathEdit->text());
+    if(!configList.open(QFile::ReadOnly | QFile::Text))
+    {
+        QMessageBox::information(this, tr("Info"), tr("Failed to load config file"));
+        return;
+    }
+
+    QByteArray configData = configList.readAll();
+    QJsonDocument configJson(QJsonDocument::fromJson(configData));
+    mifare->setConfigMap(configJson.object()["mifare classic"].toObject().toVariantMap());
+    lf->setConfigMap(configJson.object()["lf"].toObject().toVariantMap());
+
+}
+
 void MainWindow::initUI() // will be called by main.app
 {
     ui->retranslateUi(this);
@@ -108,7 +126,7 @@ void MainWindow::on_PM3_connectButton_clicked()
     // on RRG repo, if no port is specified, the client will search the available port
     if(port == "" && startArgs.contains("<port>")) // has <port>, no port
     {
-        QMessageBox::information(NULL, tr("Info"), tr("Plz choose a port first"), QMessageBox::Ok);
+        QMessageBox::information(this, tr("Info"), tr("Plz choose a port first"), QMessageBox::Ok);
         return;
     }
 
@@ -123,20 +141,32 @@ void MainWindow::on_PM3_connectButton_clicked()
     if(envScriptPath.exists())
     {
         qDebug() << envScriptPath.absoluteFilePath();
+        // use the shell session to keep the environment then read it
 #ifdef Q_OS_WIN
         // cmd /c "<path>">>nul && set
-        envSetProcess.start("cmd /c \"" + envScriptPath.absoluteFilePath() + "\">>nul && set");
+        envSetProcess.start("cmd", {}, QProcess::Unbuffered | QProcess::ReadWrite | QProcess::Text);
+        envSetProcess.write(QString("\"" + envScriptPath.absoluteFilePath() + "\">>nul\n").toLatin1());
+        envSetProcess.waitForReadyRead(10000);
+        envSetProcess.readAll();
+        envSetProcess.write("set\n");
 #else
+        // need implementation(or test if space works)
         // sh -c '. "<path>">>/dev/null && env'
         envSetProcess.start("sh -c \' . \"" + envScriptPath.absoluteFilePath() + "\">>/dev/null && env");
 #endif
         envSetProcess.waitForReadyRead(10000);
-        clientEnv = QString(envSetProcess.readAll()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts);
+        QString envSetResult = QString(envSetProcess.readAll());
+        clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
+        if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
+        {
+            clientEnv.removeFirst();
+            clientEnv.removeLast();
+            emit setProcEnv(&clientEnv);
+        }
 //      qDebug() << "Get Env List" << clientEnv;
     }
     else
         clientEnv.clear();
-    emit setProcEnv(&clientEnv);
 
     clientWorkingDir->setPath(QApplication::applicationDirPath());
     qDebug() << clientWorkingDir->absolutePath();
@@ -146,13 +176,14 @@ void MainWindow::on_PM3_connectButton_clicked()
     qDebug() << clientWorkingDir->absolutePath();
     emit setWorkingDir(clientWorkingDir->absolutePath());
 
+    loadConfig();
     emit connectPM3(ui->PM3_pathEdit->text(), args);
     if(port != "" && !keepClientActive)
         emit setSerialListener(port, true);
     else if(!keepClientActive)
         emit setSerialListener(false);
 
-
+    envSetProcess.kill();
 }
 
 void MainWindow::onPM3StateChanged(bool st, const QString& info)
@@ -842,15 +873,16 @@ void MainWindow::on_MF_Sniff_loadButton_clicked() // use a tmp file to support c
     QString filename = "";
 
     title = tr("Plz select the trace file:");
-    filename = QFileDialog::getOpenFileName(this, title, "./", tr("Trace Files(*.trc);;All Files(*.*)"));
+    filename = QFileDialog::getOpenFileName(this, title, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc);;All Files(*.*)"));
     qDebug() << filename;
     if(filename != "")
     {
         QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc";
-        if(QFile::copy(filename, "./" + tmpFile))
+        if(QFile::copy(filename, clientWorkingDir->absolutePath() + "/" + tmpFile))
         {
             mifare->loadSniff(tmpFile);
-            QFile::remove("./" + tmpFile);
+            util->delay(3000);
+            QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
         }
         else
         {
@@ -865,17 +897,23 @@ void MainWindow::on_MF_Sniff_saveButton_clicked()
     QString filename = "";
 
     title = tr("Plz select the location to save trace file:");
-    filename = QFileDialog::getSaveFileName(this, title, "./", tr("Trace Files(*.trc)"));
+    filename = QFileDialog::getSaveFileName(this, title, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc)"));
     qDebug() << filename;
     if(filename != "")
     {
         QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc";
         mifare->saveSniff(tmpFile);
-        if(!QFile::copy("./" + tmpFile, filename))
+        for(int i = 0; i < 100; i++)
+        {
+            util->delay(100);
+            if(QFile::exists(clientWorkingDir->absolutePath() + "/" + tmpFile))
+                break;
+        }
+        if(!QFile::copy(clientWorkingDir->absolutePath() + "/" + tmpFile, filename))
         {
             QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
         }
-        QFile::remove("./" + tmpFile);
+        QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
     }
 
 }
@@ -967,17 +1005,9 @@ void MainWindow::uiInit()
     ui->statusbar->addPermanentWidget(programStatusBar, 1);
     ui->statusbar->addPermanentWidget(stopButton);
 
-    ui->MF_dataWidget->setColumnCount(3);
-    ui->MF_dataWidget->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Sec")));
-    ui->MF_dataWidget->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Blk")));
-    ui->MF_dataWidget->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Data")));
     ui->MF_dataWidget->setColumnWidth(0, 55);
     ui->MF_dataWidget->setColumnWidth(1, 55);
 
-    ui->MF_keyWidget->setColumnCount(3);
-    ui->MF_keyWidget->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Sec")));
-    ui->MF_keyWidget->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("KeyA")));
-    ui->MF_keyWidget->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("KeyB")));
     ui->MF_keyWidget->setColumnWidth(0, 45);
 
     MF_widgetReset();
@@ -1034,6 +1064,7 @@ void MainWindow::uiInit()
     settings->beginGroup("Client_Env");
     ui->Set_Client_envScriptEdit->setText(settings->value("scriptPath").toString());
     ui->Set_Client_workingDirEdit->setText(settings->value("workingDir", "../data").toString());
+    ui->Set_Client_configPathEdit->setText(settings->value("configPath", "config.json").toString());
     settings->endGroup();
 
     ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A);
@@ -1152,7 +1183,7 @@ void MainWindow::setButtonsEnabled(bool st)
     ui->MF_sniffGroupBox->setEnabled(st);
     ui->Raw_CMDEdit->setEnabled(st);
     ui->Raw_sendCMDButton->setEnabled(st);
-    ui->LF_configGroupBox->setEnabled(st);
+    ui->LF_LFconfigGroupBox->setEnabled(st);
     ui->LF_operationGroupBox->setEnabled(st);
 }
 
@@ -1225,13 +1256,21 @@ void MainWindow::on_Set_Client_envScriptEdit_editingFinished()
     settings->endGroup();
 }
 
-void MainWindow::on_Set_Client_saveWorkingDirButton_clicked()
+void MainWindow::on_Set_Client_workingDirEdit_editingFinished()
 {
     settings->beginGroup("Client_Env");
     settings->setValue("workingDir", ui->Set_Client_workingDirEdit->text());
     settings->endGroup();
 }
 
+
+void MainWindow::on_Set_Client_configPathEdit_editingFinished()
+{
+    settings->beginGroup("Client_Env");
+    settings->setValue("configPath", ui->Set_Client_configPathEdit->text());
+    settings->endGroup();
+}
+
 void MainWindow::on_Set_Client_keepClientActiveBox_stateChanged(int arg1)
 {
     settings->beginGroup("Client_keepClientActive");
@@ -1241,37 +1280,37 @@ void MainWindow::on_Set_Client_keepClientActiveBox_stateChanged(int arg1)
     emit setSerialListener(!keepClientActive);
 }
 
-void MainWindow::on_LF_Conf_freqSlider_valueChanged(int value)
+void MainWindow::on_LF_LFConf_freqSlider_valueChanged(int value)
 {
     onLFfreqConfChanged(value, true);
 }
 
 void MainWindow::onLFfreqConfChanged(int value, bool isCustomized)
 {
-    ui->LF_Conf_freqDivisorBox->blockSignals(true);
-    ui->LF_Conf_freqSlider->blockSignals(true);
+    ui->LF_LFConf_freqDivisorBox->blockSignals(true);
+    ui->LF_LFConf_freqSlider->blockSignals(true);
 
     if(isCustomized)
-        ui->LF_Conf_freqOtherButton->setChecked(true);
-    ui->LF_Conf_freqLabel->setText(tr("Actural Freq: ") + QString("%1kHz").arg(LF::divisor2Freq(value), 0, 'f', 3));
-    ui->LF_Conf_freqDivisorBox->setValue(value);
-    ui->LF_Conf_freqSlider->setValue(value);
+        ui->LF_LFConf_freqOtherButton->setChecked(true);
+    ui->LF_LFConf_freqLabel->setText(tr("Actural Freq: ") + QString("%1kHz").arg(LF::divisor2Freq(value), 0, 'f', 3));
+    ui->LF_LFConf_freqDivisorBox->setValue(value);
+    ui->LF_LFConf_freqSlider->setValue(value);
 
-    ui->LF_Conf_freqDivisorBox->blockSignals(false);
-    ui->LF_Conf_freqSlider->blockSignals(false);
+    ui->LF_LFConf_freqDivisorBox->blockSignals(false);
+    ui->LF_LFConf_freqSlider->blockSignals(false);
 }
 
-void MainWindow::on_LF_Conf_freqDivisorBox_valueChanged(int arg1)
+void MainWindow::on_LF_LFConf_freqDivisorBox_valueChanged(int arg1)
 {
     onLFfreqConfChanged(arg1, true);
 }
 
-void MainWindow::on_LF_Conf_freq125kButton_clicked()
+void MainWindow::on_LF_LFConf_freq125kButton_clicked()
 {
     onLFfreqConfChanged(95, false);
 }
 
-void MainWindow::on_LF_Conf_freq134kButton_clicked()
+void MainWindow::on_LF_LFConf_freq134kButton_clicked()
 {
     onLFfreqConfChanged(88, false);
 }
@@ -1337,31 +1376,32 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
     contextMenu->exec(event->globalPos());
 }
 
-void MainWindow::on_LF_Conf_getButton_clicked()
+void MainWindow::on_LF_LFConf_getButton_clicked()
 {
     setState(false);
-    lf->getConfig();
+    lf->getLFConfig();
     setState(true);
 }
 
-void MainWindow::on_LF_Conf_setButton_clicked()
+void MainWindow::on_LF_LFConf_setButton_clicked()
 {
-    LF::Config config;
+    LF::LFConfig config;
     setState(false);
-    config.divisor = ui->LF_Conf_freqDivisorBox->value();
-    config.bitPerSample = ui->LF_Conf_bitPerSampleBox->value();
-    config.decimation = ui->LF_Conf_decimationBox->value();
-    config.averaging = ui->LF_Conf_averagingBox->isChecked();
-    config.triggerThreshold = ui->LF_Conf_thresholdBox->value();
-    config.samplesToSkip = ui->LF_Conf_skipsBox->value();
-    lf->setConfig(config);
+    config.divisor = ui->LF_LFConf_freqDivisorBox->value();
+    config.bitsPerSample = ui->LF_LFConf_bitsPerSampleBox->value();
+    config.decimation = ui->LF_LFConf_decimationBox->value();
+    config.averaging = ui->LF_LFConf_averagingBox->isChecked();
+    config.triggerThreshold = ui->LF_LFConf_thresholdBox->value();
+    config.samplesToSkip = ui->LF_LFConf_skipsBox->value();
+    lf->setLFConfig(config);
     Util::gotoRawTab();
     setState(true);
 }
 
-void MainWindow::on_LF_Conf_resetButton_clicked()
+void MainWindow::on_LF_LFConf_resetButton_clicked()
 {
     setState(false);
-    lf->resetConfig();
+    lf->resetLFConfig();
     setState(true);
 }
+

ui/mainwindow.h

@@ -177,17 +177,15 @@ private slots:
 
     void on_Set_Client_envScriptEdit_editingFinished();
 
-    void on_Set_Client_saveWorkingDirButton_clicked();
-
     void on_Set_Client_keepClientActiveBox_stateChanged(int arg1);
 
-    void on_LF_Conf_freqSlider_valueChanged(int value);
+    void on_LF_LFConf_freqSlider_valueChanged(int value);
 
-    void on_LF_Conf_freqDivisorBox_valueChanged(int arg1);
+    void on_LF_LFConf_freqDivisorBox_valueChanged(int arg1);
 
-    void on_LF_Conf_freq125kButton_clicked();
+    void on_LF_LFConf_freq125kButton_clicked();
 
-    void on_LF_Conf_freq134kButton_clicked();
+    void on_LF_LFConf_freq134kButton_clicked();
 
     void on_LF_Op_searchButton_clicked();
 
@@ -197,11 +195,15 @@ private slots:
 
     void on_LF_Op_sniffButton_clicked();
 
-    void on_LF_Conf_getButton_clicked();
+    void on_LF_LFConf_getButton_clicked();
 
-    void on_LF_Conf_setButton_clicked();
+    void on_LF_LFConf_setButton_clicked();
 
-    void on_LF_Conf_resetButton_clicked();
+    void on_LF_LFConf_resetButton_clicked();
+
+    void on_Set_Client_workingDirEdit_editingFinished();
+
+    void on_Set_Client_configPathEdit_editingFinished();
 
 private:
     Ui::MainWindow* ui;
@@ -249,6 +251,7 @@ private:
     void saveClientPath(const QString& path);
     void onLFfreqConfChanged(int value, bool isCustomized);
     void dockInit();
+    void loadConfig();
 protected:
     void contextMenuEvent(QContextMenuEvent *event) override;
 signals:

ui/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1050</width>
-    <height>700</height>
+    <height>750</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -198,6 +198,21 @@
             <attribute name="verticalHeaderDefaultSectionSize">
              <number>20</number>
             </attribute>
+            <column>
+             <property name="text">
+              <string>Sec</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Blk</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Data</string>
+             </property>
+            </column>
            </widget>
           </item>
           <item>
@@ -360,6 +375,21 @@
             <attribute name="verticalHeaderDefaultSectionSize">
              <number>20</number>
             </attribute>
+            <column>
+             <property name="text">
+              <string>Sec</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>KeyA</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>KeyB</string>
+             </property>
+            </column>
            </widget>
           </item>
          </layout>
@@ -1217,7 +1247,7 @@
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_14">
           <item>
-           <widget class="QGroupBox" name="LF_configGroupBox">
+           <widget class="QGroupBox" name="LF_LFconfigGroupBox">
             <property name="title">
              <string>LF Config</string>
             </property>
@@ -1238,7 +1268,7 @@
               <number>2</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="LF_Conf_freqGroupBox">
+              <widget class="QGroupBox" name="LF_LFConf_freqGroupBox">
                <property name="title">
                 <string>Frequency</string>
                </property>
@@ -1261,7 +1291,7 @@
                 <item>
                  <layout class="QHBoxLayout" name="horizontalLayout_13">
                   <item>
-                   <widget class="QRadioButton" name="LF_Conf_freq125kButton">
+                   <widget class="QRadioButton" name="LF_LFConf_freq125kButton">
                     <property name="sizePolicy">
                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                       <horstretch>0</horstretch>
@@ -1277,7 +1307,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QRadioButton" name="LF_Conf_freq134kButton">
+                   <widget class="QRadioButton" name="LF_LFConf_freq134kButton">
                     <property name="sizePolicy">
                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                       <horstretch>0</horstretch>
@@ -1290,7 +1320,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QRadioButton" name="LF_Conf_freqOtherButton">
+                   <widget class="QRadioButton" name="LF_LFConf_freqOtherButton">
                     <property name="sizePolicy">
                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                       <horstretch>0</horstretch>
@@ -1310,7 +1340,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QSpinBox" name="LF_Conf_freqDivisorBox">
+                   <widget class="QSpinBox" name="LF_LFConf_freqDivisorBox">
                     <property name="minimum">
                      <number>19</number>
                     </property>
@@ -1323,7 +1353,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QLabel" name="LF_Conf_freqLabel">
+                   <widget class="QLabel" name="LF_LFConf_freqLabel">
                     <property name="text">
                      <string>Actural Freq: 125.000kHz</string>
                     </property>
@@ -1345,7 +1375,7 @@
                  </layout>
                 </item>
                 <item>
-                 <widget class="QSlider" name="LF_Conf_freqSlider">
+                 <widget class="QSlider" name="LF_LFConf_freqSlider">
                   <property name="minimum">
                    <number>19</number>
                   </property>
@@ -1363,8 +1393,7 @@
                 <item>
                  <widget class="QLabel" name="label_22">
                   <property name="text">
-                   <string>Note:
-You might need a modified LF antenna if the freq is not 125k/134k.
+                   <string>You might need a modified LF antenna if the freq is not 125k/134k.
 When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</string>
                   </property>
                   <property name="wordWrap">
@@ -1395,7 +1424,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                  <item row="0" column="0">
                   <widget class="QLabel" name="label_6">
                    <property name="text">
-                    <string>Bit per sample:</string>
+                    <string>Bits per sample:</string>
                    </property>
                   </widget>
                  </item>
@@ -1407,7 +1436,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                   </widget>
                  </item>
                  <item row="1" column="1">
-                  <widget class="QSpinBox" name="LF_Conf_decimationBox">
+                  <widget class="QSpinBox" name="LF_LFConf_decimationBox">
                    <property name="minimum">
                     <number>1</number>
                    </property>
@@ -1424,7 +1453,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                   </widget>
                  </item>
                  <item row="2" column="1">
-                  <widget class="QCheckBox" name="LF_Conf_averagingBox">
+                  <widget class="QCheckBox" name="LF_LFConf_averagingBox">
                    <property name="text">
                     <string/>
                    </property>
@@ -1438,7 +1467,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                   </widget>
                  </item>
                  <item row="3" column="1">
-                  <widget class="QSpinBox" name="LF_Conf_thresholdBox">
+                  <widget class="QSpinBox" name="LF_LFConf_thresholdBox">
                    <property name="maximum">
                     <number>128</number>
                    </property>
@@ -1452,14 +1481,14 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                   </widget>
                  </item>
                  <item row="4" column="1">
-                  <widget class="QSpinBox" name="LF_Conf_skipsBox">
+                  <widget class="QSpinBox" name="LF_LFConf_skipsBox">
                    <property name="maximum">
                     <number>65535</number>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
-                  <widget class="QSpinBox" name="LF_Conf_bitPerSampleBox">
+                  <widget class="QSpinBox" name="LF_LFConf_bitsPerSampleBox">
                    <property name="minimum">
                     <number>1</number>
                    </property>
@@ -1504,7 +1533,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                 </spacer>
                </item>
                <item>
-                <widget class="QPushButton" name="LF_Conf_getButton">
+                <widget class="QPushButton" name="LF_LFConf_getButton">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
@@ -1523,7 +1552,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                 </widget>
                </item>
                <item>
-                <widget class="QPushButton" name="LF_Conf_setButton">
+                <widget class="QPushButton" name="LF_LFConf_setButton">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
@@ -1542,7 +1571,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
                 </widget>
                </item>
                <item>
-                <widget class="QPushButton" name="LF_Conf_resetButton">
+                <widget class="QPushButton" name="LF_LFConf_resetButton">
                  <property name="text">
                   <string>Reset</string>
                  </property>
@@ -1853,15 +1882,640 @@ or the communication between a tag and a reader.</string>
        <attribute name="title">
         <string>T55xx</string>
        </attribute>
-       <widget class="QTableWidget" name="T55_dataWidget">
+       <widget class="QGroupBox" name="groupBox">
         <property name="geometry">
          <rect>
-          <x>20</x>
-          <y>10</y>
-          <width>256</width>
-          <height>192</height>
+          <x>360</x>
+          <y>20</y>
+          <width>281</width>
+          <height>511</height>
          </rect>
         </property>
+        <property name="title">
+         <string>Basic Configuration(Page 0 Block 0)</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_21">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <item>
+          <layout class="QFormLayout" name="formLayout_4">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_43">
+             <property name="text">
+              <string>Hex:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_44">
+             <property name="text">
+              <string>Bin:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="lineEdit_4">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>4</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEdit_3">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>1</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_23">
+           <item>
+            <spacer name="horizontalSpacer_15">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton">
+             <property name="text">
+              <string>Get from Data</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_2">
+             <property name="text">
+              <string>Set to Data</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_14">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QFormLayout" name="formLayout_2">
+           <property name="horizontalSpacing">
+            <number>5</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>5</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_28">
+             <property name="text">
+              <string>Locked:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QCheckBox" name="checkBox"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_29">
+             <property name="text">
+              <string>Master Key:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_30">
+             <property name="text">
+              <string>Data Bit Rate:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QComboBox" name="comboBox"/>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_31">
+             <property name="text">
+              <string>eXtended Mode:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_32">
+             <property name="text">
+              <string>Modulation:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_33">
+             <property name="text">
+              <string>PSK Clock Freq:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_34">
+             <property name="text">
+              <string>Answer on Request:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QCheckBox" name="checkBox_2"/>
+           </item>
+           <item row="4" column="1">
+            <widget class="QComboBox" name="comboBox_2"/>
+           </item>
+           <item row="7" column="0">
+            <widget class="QLabel" name="label_35">
+             <property name="text">
+              <string>One Time Pad:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="0">
+            <widget class="QLabel" name="label_36">
+             <property name="text">
+              <string>Max Block:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="0">
+            <widget class="QLabel" name="label_37">
+             <property name="text">
+              <string>Password:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="0">
+            <widget class="QLabel" name="label_38">
+             <property name="text">
+              <string>Seq. Terminator:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="11" column="0">
+            <widget class="QLabel" name="label_39">
+             <property name="text">
+              <string>Seq. Start Marker:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="12" column="0">
+            <widget class="QLabel" name="label_40">
+             <property name="text">
+              <string>Fast Downlink:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="13" column="0">
+            <widget class="QLabel" name="label_41">
+             <property name="text">
+              <string>Inverse Data:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="14" column="0">
+            <widget class="QLabel" name="label_42">
+             <property name="text">
+              <string>Init-Delay:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="14" column="1">
+            <widget class="QCheckBox" name="checkBox_3"/>
+           </item>
+           <item row="13" column="1">
+            <widget class="QCheckBox" name="checkBox_4"/>
+           </item>
+           <item row="12" column="1">
+            <widget class="QCheckBox" name="checkBox_5"/>
+           </item>
+           <item row="11" column="1">
+            <widget class="QCheckBox" name="checkBox_6"/>
+           </item>
+           <item row="10" column="1">
+            <widget class="QCheckBox" name="checkBox_7"/>
+           </item>
+           <item row="9" column="1">
+            <widget class="QCheckBox" name="checkBox_8"/>
+           </item>
+           <item row="1" column="1">
+            <widget class="QSpinBox" name="spinBox"/>
+           </item>
+           <item row="5" column="1">
+            <widget class="QComboBox" name="comboBox_3"/>
+           </item>
+           <item row="6" column="1">
+            <widget class="QCheckBox" name="checkBox_9"/>
+           </item>
+           <item row="7" column="1">
+            <widget class="QCheckBox" name="checkBox_10"/>
+           </item>
+           <item row="8" column="1">
+            <widget class="QSpinBox" name="spinBox_2"/>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_10">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="geometry">
+         <rect>
+          <x>670</x>
+          <y>20</y>
+          <width>311</width>
+          <height>511</height>
+         </rect>
+        </property>
+        <property name="title">
+         <string>Analog Front-End Option(Page 1 Block 3)</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_22">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <item>
+          <layout class="QFormLayout" name="formLayout_5">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_45">
+             <property name="text">
+              <string>Hex:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_46">
+             <property name="text">
+              <string>Bin:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="lineEdit_5">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>4</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEdit_6">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>1</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_24">
+           <item>
+            <spacer name="horizontalSpacer_16">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_3">
+             <property name="text">
+              <string>Get from Data</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_4">
+             <property name="text">
+              <string>Set to Data</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_20">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QFormLayout" name="formLayout_6">
+           <property name="rowWrapPolicy">
+            <enum>QFormLayout::WrapLongRows</enum>
+           </property>
+           <property name="horizontalSpacing">
+            <number>5</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>5</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_47">
+             <property name="text">
+              <string>Locked:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QCheckBox" name="checkBox_11"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_48">
+             <property name="text">
+              <string>Option Key:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QSpinBox" name="spinBox_3"/>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_49">
+             <property name="text">
+              <string>Soft Modulation:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QComboBox" name="comboBox_4"/>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_50">
+             <property name="text">
+              <string>Clamp Voltage:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QComboBox" name="comboBox_7"/>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_51">
+             <property name="text">
+              <string>Modulation Voltage:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QComboBox" name="comboBox_5"/>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_52">
+             <property name="text">
+              <string>Clock Detection Threshold:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="QComboBox" name="comboBox_6"/>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_53">
+             <property name="text">
+              <string>Gap Detection Threshold:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="QComboBox" name="comboBox_8"/>
+           </item>
+           <item row="7" column="0">
+            <widget class="QLabel" name="label_54">
+             <property name="text">
+              <string>Write Dampling:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="0">
+            <widget class="QLabel" name="label_55">
+             <property name="text">
+              <string>Demod Delay:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="0">
+            <widget class="QLabel" name="label_56">
+             <property name="text">
+              <string>Downlink Protocol:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="1">
+            <widget class="QComboBox" name="comboBox_9"/>
+           </item>
+           <item row="8" column="1">
+            <widget class="QComboBox" name="comboBox_10"/>
+           </item>
+           <item row="9" column="1">
+            <widget class="QComboBox" name="comboBox_11"/>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_11">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="verticalLayoutWidget">
+        <property name="geometry">
+         <rect>
+          <x>50</x>
+          <y>150</y>
+          <width>221</width>
+          <height>201</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_19">
+         <item>
+          <widget class="QLabel" name="label_57">
+           <property name="text">
+            <string>Data:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTableWidget" name="T55_dataWidget"/>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QGroupBox" name="groupBox_4">
+        <property name="geometry">
+         <rect>
+          <x>50</x>
+          <y>370</y>
+          <width>194</width>
+          <height>231</height>
+         </rect>
+        </property>
+        <property name="title">
+         <string>T55xx Read Config</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_20">
+         <item>
+          <layout class="QFormLayout" name="formLayout_7">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_58">
+             <property name="text">
+              <string>Modulation:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_59">
+             <property name="text">
+              <string>Bit Rate:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_60">
+             <property name="text">
+              <string>Seq. Term.</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_61">
+             <property name="text">
+              <string>Offset:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_62">
+             <property name="text">
+              <string>Inverted:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBox_12"/>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="comboBox_13"/>
+           </item>
+           <item row="2" column="1">
+            <widget class="QCheckBox" name="checkBox_12">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QSpinBox" name="spinBox_4"/>
+           </item>
+           <item row="4" column="1">
+            <widget class="QCheckBox" name="checkBox_13">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_28">
+           <item>
+            <widget class="QRadioButton" name="radioButton">
+             <property name="text">
+              <string>T5577</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="radioButton_2">
+             <property name="text">
+              <string>T5555</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_12">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </widget>
       </widget>
       <widget class="QWidget" name="rawTab">
@@ -1995,7 +2649,7 @@ or the communication between a tag and a reader.</string>
              <item>
               <widget class="QLabel" name="label_11">
                <property name="text">
-                <string>Preload script path:</string>
+                <string>Preload script path(Reconnect to apply):</string>
                </property>
               </widget>
              </item>
@@ -2009,9 +2663,7 @@ or the communication between a tag and a reader.</string>
              <item>
               <widget class="QLabel" name="label_13">
                <property name="text">
-                <string>Note:
-If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them,
-then put the path of the script there</string>
+                <string>If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them, then put the path of the script there.</string>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>
@@ -2028,12 +2680,10 @@ then put the path of the script there</string>
              <item>
               <widget class="QLabel" name="label_19">
                <property name="text">
-                <string>Client working directory:</string>
+                <string>Client working directory(Reconnect to apply):</string>
                </property>
               </widget>
              </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_15">
              <item>
               <widget class="QLineEdit" name="Set_Client_workingDirEdit">
                <property name="text">
@@ -2041,20 +2691,10 @@ then put the path of the script there</string>
                </property>
               </widget>
              </item>
-               <item>
-                <widget class="QPushButton" name="Set_Client_saveWorkingDirButton">
-                 <property name="text">
-                  <string>Save</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
              <item>
               <widget class="QLabel" name="label_20">
                <property name="text">
-                <string>Note:
-On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file.</string>
+                <string>On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file.</string>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>
@@ -2071,7 +2711,7 @@ On Windows, the client working directory should not be identical to the path of
              <item>
               <widget class="QLabel" name="label_12">
                <property name="text">
-                <string>Start arguments</string>
+                <string>Start arguments(Reconnect to apply):</string>
                </property>
               </widget>
              </item>
@@ -2085,10 +2725,7 @@ On Windows, the client working directory should not be identical to the path of
              <item>
               <widget class="QLabel" name="label_14">
                <property name="text">
-                <string>Note: 
--f is necessary because the GUI need to handle the output in time
-In some cases the arguments should be set to &quot;-p /dev/&lt;port&gt; -f&quot;
-or &quot;-p &lt;port&gt; -f&quot;</string>
+                <string>-f is necessary because the GUI need to handle the output in time. In some cases, the arguments should be set to &quot;-p /dev/&lt;port&gt; -f&quot; or &quot;-p &lt;port&gt; -f&quot;.</string>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>
@@ -2102,6 +2739,37 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
                </property>
               </widget>
              </item>
+             <item>
+              <widget class="QLabel" name="label_63">
+               <property name="text">
+                <string>Config file path(Reconnect to apply):</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="Set_Client_configPathEdit">
+               <property name="text">
+                <string>config.json</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="label_64">
+               <property name="text">
+                <string>Different clients require different config files. You can change the content of config file if the command format changes.</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="Line" name="line_8">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+              </widget>
+             </item>
              <item>
               <layout class="QHBoxLayout" name="horizontalLayout_16">
                <item>
@@ -2178,7 +2846,7 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
                   </sizepolicy>
                  </property>
                  <property name="text">
-                  <string>Keep te client active even the PM3 hardware is disconnected.(Experimental)</string>
+                  <string>Keep the client active even the PM3 hardware is disconnected.(Experimental)</string>
                  </property>
                  <property name="wordWrap">
                   <bool>true</bool>
@@ -2257,6 +2925,9 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Minimum</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>0</width>

ui/mf_attack_hardnesteddialog.cpp

@@ -1,16 +1,17 @@
 #include "mf_attack_hardnesteddialog.h"
 #include "ui_mf_attack_hardnesteddialog.h"
 
-MF_Attack_hardnestedDialog::MF_Attack_hardnestedDialog(int blocks, QWidget *parent) :
+MF_Attack_hardnestedDialog::MF_Attack_hardnestedDialog(int blocks, const QVariantMap& config, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::MF_Attack_hardnestedDialog)
 {
     ui->setupUi(this);
     for(int i = 0; i < blocks; i++)
     {
-        ui->knownKeySectorBox->addItem(QString::number(i));
-        ui->targetKeySectorBox->addItem(QString::number(i));
+        ui->knownKeyBlockBox->addItem(QString::number(i));
+        ui->targetKeyBlockBox->addItem(QString::number(i));
     }
+    this->config = config;
 
 }
 
@@ -21,26 +22,11 @@ MF_Attack_hardnestedDialog::~MF_Attack_hardnestedDialog()
 
 void MF_Attack_hardnestedDialog::on_buttonBox_accepted()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        emit sendCMD("hf mf hardnested "
-                     + ui->knownKeySectorBox->currentText()
-                     + " "
-                     + ui->knownKeyTypeBox->currentText()
-                     + " "
-                     + ui->knownKeyBox->text()
-                     + " "
-                     + ui->targetKeySectorBox->currentText()
-                     + " "
-                     + ui->targetKeyTypeBox->currentText());
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN) // same format in v4.9237
-        emit sendCMD("hf mf hardnested "
-                     + ui->knownKeySectorBox->currentText()
-                     + " "
-                     + ui->knownKeyTypeBox->currentText()
-                     + " "
-                     + ui->knownKeyBox->text()
-                     + " "
-                     + ui->targetKeySectorBox->currentText()
-                     + " "
-                     + ui->targetKeyTypeBox->currentText());
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<known key block>", ui->knownKeyBlockBox->currentText());
+    cmd.replace("<known key type>", config["known key type"].toMap()[ui->knownKeyTypeBox->currentText()].toString());
+    cmd.replace("<known key>", ui->knownKeyBox->text());
+    cmd.replace("<target key block>", ui->targetKeyBlockBox->currentText());
+    cmd.replace("<target key type>", config["target key type"].toMap()[ui->targetKeyTypeBox->currentText()].toString());
+    emit sendCMD(cmd);
 }

ui/mf_attack_hardnesteddialog.h

@@ -14,12 +14,13 @@ class MF_Attack_hardnestedDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit MF_Attack_hardnestedDialog(int blocks, QWidget *parent = nullptr);
+    explicit MF_Attack_hardnestedDialog(int blocks, const QVariantMap& config, QWidget *parent = nullptr);
     ~MF_Attack_hardnestedDialog();
 
 
 private:
     Ui::MF_Attack_hardnestedDialog *ui;
+    QVariantMap config;
 signals:
     void sendCMD(const QString& cmd);
 private slots:

ui/mf_attack_hardnesteddialog.ui

@@ -31,7 +31,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="knownKeySectorBox">
+      <widget class="QComboBox" name="knownKeyBlockBox">
        <property name="minimumSize">
         <size>
          <width>60</width>
@@ -106,7 +106,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="targetKeySectorBox">
+      <widget class="QComboBox" name="targetKeyBlockBox">
        <property name="minimumSize">
         <size>
          <width>60</width>

ui/mf_uid_parameterdialog.cpp

@@ -1,7 +1,7 @@
 #include "mf_uid_parameterdialog.h"
 #include "ui_mf_uid_parameterdialog.h"
 
-MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, QWidget *parent) :
+MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, const QVariantMap& config, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::MF_UID_parameterDialog)
 {
@@ -9,6 +9,7 @@ MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString
     ui->UIDLineEdit->setText(uid);
     ui->ATQALineEdit->setText(atqa);
     ui->SAKLineEdit->setText(sak);
+    this->config = config;
 }
 
 MF_UID_parameterDialog::~MF_UID_parameterDialog()
@@ -18,18 +19,9 @@ MF_UID_parameterDialog::~MF_UID_parameterDialog()
 
 void MF_UID_parameterDialog::on_buttonBox_accepted()
 {
-    if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
-        emit sendCMD("hf mf csetuid "
-                     + ui->UIDLineEdit->text()
-                     + " "
-                     + ui->ATQALineEdit->text()
-                     + " "
-                     + ui->SAKLineEdit->text());
-    else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN) // same format in v4.9237
-        emit sendCMD("hf mf csetuid "
-                     + ui->UIDLineEdit->text()
-                     + " "
-                     + ui->ATQALineEdit->text()
-                     + " "
-                     + ui->SAKLineEdit->text());
+    QString cmd = config["cmd"].toString();
+    cmd.replace("<uid>", ui->UIDLineEdit->text());
+    cmd.replace("<atqa>", ui->ATQALineEdit->text());
+    cmd.replace("<sak>", ui->SAKLineEdit->text());
+    emit sendCMD(cmd);
 }

ui/mf_uid_parameterdialog.h

@@ -14,11 +14,12 @@ class MF_UID_parameterDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, QWidget *parent = nullptr);
+    explicit MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, const QVariantMap& config, QWidget *parent = nullptr);
     ~MF_UID_parameterDialog();
 
 private:
     Ui::MF_UID_parameterDialog *ui;
+    QVariantMap config;
 signals:
     void sendCMD(const QString& cmd);
 private slots: