Merge pull request #14 from wh201906/dev

V0.1.4

Author: wh201906

.gitignore

@@ -14,7 +14,6 @@
 *.so.*
 *_pch.h.cpp
 *_resource.rc
-*.qm
 .#*
 *.*#
 core

Proxmark3GUI.pro

@@ -16,6 +16,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
+    common/myeventfilter.cpp \
     main.cpp \
     common/pm3process.cpp \
     common/util.cpp \
@@ -27,6 +28,7 @@ SOURCES += \
     ui/mf_attack_hardnesteddialog.cpp \
 
 HEADERS += \
+    common/myeventfilter.h \
     common/pm3process.h \
     common/util.h \
     module/mifare.h \
@@ -52,7 +54,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-VERSION = 0.1.3
+VERSION = 0.1.4
 QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
 QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
 QMAKE_TARGET_COMPANY = "wh201906"

README.md

@@ -1,5 +1,7 @@
 # Proxmark3GUI
-A GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client
+![downloads](https://img.shields.io/github/downloads/wh201906/Proxmark3GUI/total)  
+
+A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client
 
 [中文](README/doc/README_zh_CN.md)
 
@@ -25,32 +27,53 @@ A GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client
 ## Preview
 ![preview](README/img/preview.png)  
 
-more previews [here](README/doc/previews.md)  
+[more previews](README/doc/previews.md)  
 
 ***
 
 ## 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 was designed for only official repo at first, but I'm trying to make it compatible with Iceman repo.  
-
-Supported functions when using Iceman client:  
-
-[supported functions](README/doc/supported_Iceman.md)  
+This GUI is compatible with Iceman/RRG repo(tested on v4.9237)  
 
 ***
 
 ## About Compiled Windows clients
 
 A cool guy [Gator96100](https://github.com/Gator96100) creates [ProxSpace](https://github.com/Gator96100/ProxSpace) and makes it possible to compile both the firmware and client on Windows.  
-Also, he makes the [pre-compiled Windows client](http://www.proxmark.org/forum/viewtopic.php?id=3975) so you can download it and run your PM3 client on Windows instantly.  
+Also, he makes the [pre-compiled Windows client](https://www.proxmarkbuilds.org/) so you can download it and run your PM3 client on Windows instantly.  
 I included his compiled client in my releases so you can use the GUI on the fly, and you can also use the GUI with your prefered client.  
 Great thanks to him.  
 
 ***
 
+## Build on Linux
+
+    cd ~
+    git clone https://github.com/wh201906/Proxmark3GUI.git
+    cd Proxmark3GUI
+    mkdir build
+    cd build
+    qmake ../
+    make
+    make clean
+    cp -r ../lang ./
+    ./Proxmark3GUI
+
+***
+
 ## Update Log:
 
+### V0.1.4
++ Optimize performance  
++ Optimize UI  
++ Search available ports automatically  
++ Add High-DPI support  
++ Support configuring environment variables by script  
+(Useful when the client requires specific environment variables)  
++ All functions are compatible with Iceman/RRG repo(tested on v4.9237)  
++ Fix some bugs
+
 ### V0.1.3
 + Fix Trailer Decoder
 + Add feedback when writing selected blocks

README/doc/README_zh_CN.md

@@ -1,5 +1,7 @@
 # Proxmark3GUI
-一个自制的[Proxmark3](https://github.com/Proxmark/proxmark3) GUI
+![downloads](https://img.shields.io/github/downloads/wh201906/Proxmark3GUI/total)  
+
+一个自制的[Proxmark3](https://github.com/Proxmark/proxmark3) GUI，可在Windows/Linux系统下运行
 
 [English](../../README.md)
 
@@ -30,23 +32,47 @@
 ***
 
  ## 关于冰人版
- 这个GUI一开始是针对官方版本做的，现在正在尽力让它兼容冰人版的功能  
- （没钱买RDV4也没钱买两台PM3，测一次冰人就要烧一次固件 qwq）
+ [冰人版](https://github.com/RfidResearchGroup/proxmark3)(Iceman/RRG)的客户端和固件更新更为激进，相比官方版具有更多的功能  
+ 此GUI所有功能均兼容冰人版（在v4.9237上测试通过）  
 
- [已支持功能](../doc/supported_Iceman.md)
 ***
 
 ## 关于预编译Windows客户端
 
-一个国外大佬 [Gator96100](https://github.com/Gator96100) 做了个 [ProxSpace](https://github.com/Gator96100/ProxSpace) 以便在Windows平台上编译PM3固件和客户端，他还把自己编译好的客户端放到了[论坛](http://www.proxmark.org/forum/viewtopic.php?id=3975)里面  
-文件都是放到Google Drive上面的，国内网络无法访问，所以我在release版本里面放了个带预编译客户端版本的GUI。这个GUI也可以搭配你自己的客户端使用  
+一位国外大佬 [Gator96100](https://github.com/Gator96100) 做了个 [ProxSpace](https://github.com/Gator96100/ProxSpace) 以便在Windows平台上编译PM3固件和客户端，他还把自己编译好的客户端放到了[网站](https://www.proxmarkbuilds.org/)上  
+release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客户端使用  
 (本来打算在CSDN下载里面放几个最新版客户端的，结果不能把下载币改为0)  
 感谢大佬  
 
 ***
 
+## 在Linux系统下编译
+
+    cd ~
+    git clone https://github.com/wh201906/Proxmark3GUI.git
+    cd Proxmark3GUI
+    mkdir build
+    cd build
+    qmake ../
+    make
+    make clean
+    cp -r ../lang ./
+    ./Proxmark3GUI
+
+***
+
 ## 更新日志:
 
+### V0.1.4
++ 优化性能  
++ 优化用户界面  
++ 自动搜索可用端口  
++ 支持高分屏  
++ 可通过外部脚本配置环境变量  
+(在客户端需要配置环境变量时很有用)  
++ 全功能兼容冰人版（在v4.9237上测试通过）  
++ 修复部分bug
+
 ### V0.1.3
 + 修复访问控制位解码器
 + 写多个块时显示写入结果

README/doc/supported_Iceman.md

@@ -0,0 +1,13 @@
+#include "myeventfilter.h"
+
+MyEventFilter::MyEventFilter(QEvent::Type filter)
+{
+    targetEventType = filter;
+}
+
+bool MyEventFilter::eventFilter(QObject *obj, QEvent *event)
+{
+    if(event->type() == targetEventType)
+        emit eventHappened(obj, *event);
+    return QObject::eventFilter(obj, event);
+}

README/img/preview.png

@@ -0,0 +1,22 @@
+#ifndef MYEVENTFILTER_H
+#define MYEVENTFILTER_H
+
+#include <QObject>
+#include <QKeyEvent>
+
+class MyEventFilter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit MyEventFilter(QEvent::Type filter);
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+
+signals:
+    void eventHappened(QObject* obj_addr, QEvent& event);
+private:
+    QEvent::Type targetEventType;
+};
+
+#endif // MYEVENTFILTER_H

README/img/preview_zh_CN.png

@@ -14,28 +14,40 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
     connect(this, &PM3Process::readyRead, this, &PM3Process::onReadyRead);
 }
 
-void PM3Process::connectPM3(const QString path, const QString port)
+void PM3Process::connectPM3(const QString& path, const QString& port, const QStringList args)
 {
     QString result;
-    Util::ClientType clientType = Util::CLIENTTYPE_OFFICIAL;
+    Util::ClientType clientType;
     setRequiringOutput(true);
 
+    // stash for reconnect
+    currPath = path;
+    currPort = port;
+    currArgs = args;
+
     // using "-f" option to make the client output flushed after every print.
-    start(path, QStringList() << port << "-f", QProcess::Unbuffered | QProcess::ReadWrite);
+    start(path, args, QProcess::Unbuffered | QProcess::ReadWrite);
     if(waitForStarted(10000))
     {
-        waitForReadyRead(1000);
+        waitForReadyRead(10000);
         setRequiringOutput(false);
         result = *requiredOutput;
         if(result.indexOf("[=]") != -1)
         {
             clientType = Util::CLIENTTYPE_ICEMAN;
             setRequiringOutput(true);
             write("hw version\r\n");
-            waitForReadyRead(1000);
-            result = *requiredOutput;
+            for(int i = 0; i < 10; i++)
+            {
+                waitForReadyRead(200);
+                result += *requiredOutput;
+            }
             setRequiringOutput(false);
         }
+        else
+        {
+            clientType = Util::CLIENTTYPE_OFFICIAL;
+        }
         if(result.indexOf("os: ") != -1) // make sure the PM3 is connected
         {
             emit changeClientType(clientType);
@@ -50,6 +62,11 @@ void PM3Process::connectPM3(const QString path, const QString port)
     }
 }
 
+void PM3Process::reconnectPM3()
+{
+    connectPM3(currPath, currPort, currArgs);
+}
+
 void PM3Process::setRequiringOutput(bool st)
 {
     isRequiringOutput = st;
@@ -93,7 +110,6 @@ void PM3Process::testThread()
     qDebug() << "PM3:" << QThread::currentThread();
 }
 
-
 qint64 PM3Process::write(QString data)
 {
     return QProcess::write(data.toLatin1());
@@ -111,3 +127,10 @@ void PM3Process::onReadyRead()
 
     }
 }
+
+void PM3Process::setProcEnv(const QStringList* env)
+{
+//    qDebug() << "passed Env List" << *env;
+    this->setEnvironment(*env);
+//    qDebug() << "final Env List" << processEnvironment().toStringList();
+}

common/myeventfilter.cpp

@@ -8,6 +8,7 @@
 #include <QTimer>
 #include <QtSerialPort/QSerialPortInfo>
 #include <QtSerialPort/QSerialPort>
+#include <QProcessEnvironment>
 
 #include "util.h"
 
@@ -21,9 +22,11 @@ class PM3Process : public QProcess
     void testThread();
 
 public slots:
-    void connectPM3(const QString path, const QString port);
-    void setSerialListener(const QString &name, bool state);
+    void connectPM3(const QString& path, const QString& port, const QStringList args);
+    void setSerialListener(const QString& name, bool state);
     qint64 write(QString data);
+    void reconnectPM3();
+    void setProcEnv(const QStringList* env);
 private slots:
     void onTimeout();
     void onReadyRead();
@@ -33,9 +36,13 @@ private slots:
     void setRequiringOutput(bool st);// It only works in this class now
     QTimer* serialListener;
     QSerialPortInfo* portInfo;
+    QString currPath;
+    QString currPort;
+    QStringList currArgs;
+
 signals:
-    void PM3StatedChanged(bool st, QString info = "");
-    void newOutput(QString output);
+    void PM3StatedChanged(bool st, const QString& info = "");
+    void newOutput(const QString& output);
     void changeClientType(Util::ClientType);
 };