diff --git a/Proxmark3GUI.pro b/Proxmark3GUI.pro index 642c458..14ca8be 100644 --- a/Proxmark3GUI.pro +++ b/Proxmark3GUI.pro @@ -17,22 +17,22 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += \ main.cpp \ - mainwindow.cpp \ - mf_attack_hardnesteddialog.cpp \ - mifare.cpp \ - pm3process.cpp \ - util.cpp + common/pm3process.cpp \ + common/util.cpp \ + module/mifare.cpp \ + ui/mainwindow.cpp \ + ui/mf_attack_hardnesteddialog.cpp \ HEADERS += \ - mainwindow.h \ - mf_attack_hardnesteddialog.h \ - mifare.h \ - pm3process.h \ - util.h + common/pm3process.h \ + common/util.h \ + module/mifare.h \ + ui/mainwindow.h \ + ui/mf_attack_hardnesteddialog.h \ FORMS += \ - mainwindow.ui \ - mf_attack_hardnesteddialog.ui + ui/mainwindow.ui \ + ui/mf_attack_hardnesteddialog.ui # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin diff --git a/pm3process.cpp b/common/pm3process.cpp similarity index 91% rename from pm3process.cpp rename to common/pm3process.cpp index 308862d..a3435f8 100644 --- a/pm3process.cpp +++ b/common/pm3process.cpp @@ -98,3 +98,15 @@ qint64 PM3Process::write(QString data) { return QProcess::write(data.toLatin1()); } + +void PM3Process::onReadyRead() +{ + QString btay = readLine(); +// while(btay != "") +// { +// qDebug() << btay; +// ui->Raw_outputEdit->insertPlainText(btay); +// btay = pm3->readLine(); +// } +// ui->Raw_outputEdit->moveCursor(QTextCursor::End); +} diff --git a/pm3process.h b/common/pm3process.h similarity index 94% rename from pm3process.h rename to common/pm3process.h index d30dc89..444babb 100644 --- a/pm3process.h +++ b/common/pm3process.h @@ -27,6 +27,7 @@ public slots: qint64 write(QString data); private slots: void onTimeout(); + void onReadyRead(); private: bool isRequiringOutput; QString* requiredOutput; @@ -34,6 +35,7 @@ private: QSerialPortInfo* portInfo; signals: void PM3StatedChanged(bool st, QString info=""); + void newOutput(QString output); }; #endif // PM3PROCESS_H diff --git a/common/util.cpp b/common/util.cpp new file mode 100644 index 0000000..1a0415d --- /dev/null +++ b/common/util.cpp @@ -0,0 +1,11 @@ +#include "util.h" + +Util::Util(QObject *parent) : QObject(parent) +{ + +} + +void Util::processOutput() +{ + +} diff --git a/util.h b/common/util.h similarity index 73% rename from util.h rename to common/util.h index 262fd4e..d935aa2 100644 --- a/util.h +++ b/common/util.h @@ -1,4 +1,4 @@ -#ifndef UTIL_H +#ifndef UTIL_H #define UTIL_H #include @@ -11,6 +11,8 @@ public: signals: +private slots: + void processOutput(); }; #endif // UTIL_H diff --git a/main.cpp b/main.cpp index aff48df..9928c62 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "ui/mainwindow.h" #include diff --git a/mifare.cpp b/module/mifare.cpp similarity index 90% rename from mifare.cpp rename to module/mifare.cpp index e831f78..4db8426 100644 --- a/mifare.cpp +++ b/module/mifare.cpp @@ -1,7 +1,8 @@ #include "mifare.h" -Mifare::Mifare(QObject *parent) : QObject(parent) +Mifare::Mifare(Util *addr,QObject *parent) : QObject(parent) { + util=addr; isProcessingData=false; isProcessingKey=false; } diff --git a/mifare.h b/module/mifare.h similarity index 86% rename from mifare.h rename to module/mifare.h index 7d447f3..9c68719 100644 --- a/mifare.h +++ b/module/mifare.h @@ -1,13 +1,14 @@ #ifndef MIFARE_H #define MIFARE_H +#include "common/util.h" #include class Mifare : public QObject { Q_OBJECT public: - explicit Mifare(QObject *parent = nullptr); + explicit Mifare(Util *addr,QObject *parent = nullptr); enum ProcessingState { NONE, @@ -30,6 +31,7 @@ public slots: signals: private: + Util* util; bool isProcessingData=false; bool isProcessingKey=false; InputType inputType; diff --git a/mainwindow.cpp b/ui/mainwindow.cpp similarity index 99% rename from mainwindow.cpp rename to ui/mainwindow.cpp index f68f91f..f3e1400 100644 --- a/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -14,7 +14,9 @@ MainWindow::MainWindow(QWidget *parent) pm3Thread->start(); pm3state=false; - mifare = new Mifare; + util = new Util(this); + mifare = new Mifare(util,this); + uiInit(); signalInit(); @@ -456,7 +458,7 @@ void MainWindow::uiInit() void MainWindow::signalInit() { - connect(pm3, &PM3Process::readyRead, this, &MainWindow::refresh); +// connect(pm3, &PM3Process::readyRead, util, &MainWindow::refresh); connect(this,&MainWindow::requiringOutput,pm3,&PM3Process::setRequiringOutput); connect(this,&MainWindow::connectPM3,pm3,&PM3Process::connectPM3); diff --git a/mainwindow.h b/ui/mainwindow.h similarity index 93% rename from mainwindow.h rename to ui/mainwindow.h index 274fcdd..c595fa8 100644 --- a/mainwindow.h +++ b/ui/mainwindow.h @@ -10,9 +10,10 @@ #include #include -#include "pm3process.h" -#include "mifare.h" -#include "mf_attack_hardnesteddialog.h" +#include "common/pm3process.h" +#include "module/mifare.h" +#include "common/util.h" +#include "ui/mf_attack_hardnesteddialog.h" QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } @@ -79,6 +80,7 @@ private: bool pm3state; QThread* pm3Thread; Mifare* mifare; + Util* util; void uiInit(); QLabel* connectStatusBar; QLabel* programStatusBar; diff --git a/mainwindow.ui b/ui/mainwindow.ui similarity index 100% rename from mainwindow.ui rename to ui/mainwindow.ui diff --git a/mf_attack_hardnesteddialog.cpp b/ui/mf_attack_hardnesteddialog.cpp similarity index 100% rename from mf_attack_hardnesteddialog.cpp rename to ui/mf_attack_hardnesteddialog.cpp diff --git a/mf_attack_hardnesteddialog.h b/ui/mf_attack_hardnesteddialog.h similarity index 100% rename from mf_attack_hardnesteddialog.h rename to ui/mf_attack_hardnesteddialog.h diff --git a/mf_attack_hardnesteddialog.ui b/ui/mf_attack_hardnesteddialog.ui similarity index 100% rename from mf_attack_hardnesteddialog.ui rename to ui/mf_attack_hardnesteddialog.ui diff --git a/util.cpp b/util.cpp deleted file mode 100644 index cf92d3f..0000000 --- a/util.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "util.h" - -Util::Util(QObject *parent) : QObject(parent) -{ - -}