diff --git a/module/mifare.cpp b/module/mifare.cpp index 22eed65..aed8352 100644 --- a/module/mifare.cpp +++ b/module/mifare.cpp @@ -271,3 +271,15 @@ void Mifare::writeAll() } } } + +void Mifare::dump() +{ + util->execCMD("hf mf dump"); + ui->funcTab->setCurrentIndex(1); +} + +void Mifare::restore() +{ + util->execCMD("hf mf restore"); + ui->funcTab->setCurrentIndex(1); +} diff --git a/module/mifare.h b/module/mifare.h index 7d3cbea..a7d34fa 100644 --- a/module/mifare.h +++ b/module/mifare.h @@ -24,6 +24,8 @@ public: void readAll(); void write(); void writeAll(); + void dump(); + void restore(); public slots: signals: diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index 3c2551d..f0ae812 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -112,6 +112,7 @@ void MainWindow::refreshCMD(const QString& cmd) void MainWindow::on_Raw_sendCMDButton_clicked() { util->execCMD(ui->Raw_CMDEdit->text()); + refreshCMD(ui->Raw_CMDEdit->text()); } void MainWindow::on_Raw_clearOutputButton_clicked() @@ -146,6 +147,12 @@ void MainWindow::on_Raw_CMDHistoryWidget_itemDoubleClicked(QListWidgetItem *item ui->Raw_CMDEdit->setFocus(); } +void MainWindow::sendMSG() // send command when pressing Enter +{ + if(ui->Raw_CMDEdit->hasFocus()) + on_Raw_sendCMDButton_clicked(); +} + // ***************************************************** // ******************** mifare ******************** @@ -200,17 +207,21 @@ void MainWindow::on_MF_RW_writeAllButton_clicked() mifare->writeAll(); } +void MainWindow::on_MF_RW_dumpButton_clicked() +{ + mifare->dump(); +} + +void MainWindow::on_MF_RW_restoreButton_clicked() +{ + mifare->restore(); +} + // ************************************************ // ******************** other ******************** -void MainWindow::sendMSG() // send command when pressing Enter -{ - if(ui->Raw_CMDEdit->hasFocus()) - on_Raw_sendCMDButton_clicked(); -} - void MainWindow::uiInit() { connect(ui->Raw_CMDEdit, &QLineEdit::editingFinished, this, &MainWindow::sendMSG); @@ -284,5 +295,3 @@ void MainWindow::setStatusBar(QLabel* target, const QString & text) } // *********************************************** - - diff --git a/ui/mainwindow.h b/ui/mainwindow.h index ecd7a60..b6757a4 100644 --- a/ui/mainwindow.h +++ b/ui/mainwindow.h @@ -74,6 +74,10 @@ private slots: void on_MF_RW_writeAllButton_clicked(); + void on_MF_RW_dumpButton_clicked(); + + void on_MF_RW_restoreButton_clicked(); + private: Ui::MainWindow *ui; PM3Process* pm3;