diff --git a/mainwindow.cpp b/mainwindow.cpp index 173e782..204811d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -392,7 +392,7 @@ void MainWindow::onMenuActionTriggered() { }else if (action->text() == "更新配置") { ConfigSubCard(button_id); }else if (action->text() == "获取日志") { - ConfigSubCard(button_id); + GetSubLog(button_id); } break; // 找到按钮后,跳出循环 } @@ -570,8 +570,8 @@ void MainWindow::onMenuAction_relay() { relay_setting->setWindowModality(Qt::ApplicationModal); relay_setting->show(); } -uint8_t calculate_crc(uint8_t c, const QByteArray &data) { - uint8_t crc = c; +uint8_t calculate_crc(const QByteArray &data) { + uint8_t crc = 0; for (int i = 0; i < data.size(); ++i) { crc += static_cast(data[i]); // 累加每个字节 } @@ -667,12 +667,12 @@ void MainWindow::sendUpgradePackage(int slot) { file.close(); return; } - for (int var = 0; var < 10; ++var) { - qDebug() << "Byte" << var << ":" << static_cast(fileData[var]); - } - for (int var = fileSize - 10; var < fileSize; ++var) { - qDebug() << "Byte" << var << ":" << static_cast(fileData[var]); - } +// for (int var = 0; var < 10; ++var) { +// qDebug() << "Byte" << var << ":" << static_cast(fileData[var]); +// } +// for (int var = fileSize - 10; var < fileSize; ++var) { +// qDebug() << "Byte" << var << ":" << static_cast(fileData[var]); +// } qDebug() << "fileSize" << fileSize ; // 计算文件的 CRC 校验和 qDebug() << "filheader.slot" << slot ; @@ -682,8 +682,7 @@ void MainWindow::sendUpgradePackage(int slot) { } else { upgrade_car_req.card_id = slot & 0xFF; } - upgrade_car_req.crc = calculate_crc(upgrade_car_req.card_id, fileData); - upgrade_car_req.len = fileSize + sizeof(UpgradeCardReq); + upgrade_car_req.crc = calculate_crc(fileData); qDebug() << "filheader.crc" << upgrade_car_req.crc << "card_id" << upgrade_car_req.card_id << "header len" << upgrade_car_req.len; char *send_buf = NULL; send_buf = (char *)malloc(sizeof(UpgradeCardReq) + fileData.size() + 1); @@ -782,6 +781,11 @@ void MainWindow::readData(const QByteArray &data) { } else if (cmd == kUpgradeCard) { UpgradeRsp resp; memcpy(&resp, data.data(), sizeof(UpgradeRsp)); + if (resp.code == 0) { + statusBar()->showMessage("上传成功!", 3000); + }else { + statusBar()->showMessage("上传失败!", 3000); + } } else if (cmd == kUpgradeProgress) { UpgradeRsp upgrade_resp; memcpy(&upgrade_resp, data.data(), sizeof(UpgradeRsp)); @@ -822,7 +826,8 @@ void MainWindow::readData(const QByteArray &data) { log_file = (char*)malloc(sub_card_log_rsp.len + 1); memset(log_file,0,sub_card_log_rsp.len + 1); memcpy(log_file, data.data() + sizeof(GetSubCardLogRsp), sub_card_log_rsp.len); - QString file_name = QString("tsi_card_%1.tar.gz").arg(sub_card_log_rsp.card_id); + QDateTime now_time = QDateTime::currentDateTime(); + QString file_name = QString("log_%1_%2.tar.gz").arg(sub_card_log_rsp.card_id).arg(now_time.toString("yyyy-MM-dd_HHmmss")); QString log_path = QCoreApplication::applicationDirPath() + "\\log\\" + file_name; QFile file(log_path); file.open(QIODevice::WriteOnly); @@ -928,7 +933,7 @@ void MainWindow::UploadConfigFile(uint8_t sub_cmd){ // 创建 PackageHead 结构体 UploadConfigReq upload_config_req = { {0xAA, 0x55, 0xAA}, kUploadConfigFile,1, fileSize, sub_cmd, 0, {} }; // 计算文件的 CRC 校验和 - upload_config_req.crc = calculate_crc(0, fileData); + upload_config_req.crc = calculate_crc(fileData); upload_config_req.len = fileSize; char *send_buf = NULL; send_buf = (char *)malloc(sizeof(UploadConfigReq) + fileData.size() + 1); diff --git a/singlerelay.ui b/singlerelay.ui index 077eb7c..784c808 100644 --- a/singlerelay.ui +++ b/singlerelay.ui @@ -49,7 +49,7 @@ - NCT6100T + NCS6100T @@ -947,7 +947,7 @@ 230 380 - 371 + 391 131 diff --git a/tmrrelayassociation.cpp b/tmrrelayassociation.cpp index cb5b2b3..3250ce4 100644 --- a/tmrrelayassociation.cpp +++ b/tmrrelayassociation.cpp @@ -476,6 +476,7 @@ void TMRRelayAssociation::onComboBoxIndexChanged(int index){ QString("错误位置:%1\n错误描述:%2").arg(result.errorPos).arg(result.errorMsg)); return; } + qDebug() << "finalExpr" << finalExpr; relay_data->tmr_relay[current_index].logic_expression = finalExpr; current_index = index; diff --git a/tmrrelayassociation.ui b/tmrrelayassociation.ui index 5a0b93b..7f3e769 100644 --- a/tmrrelayassociation.ui +++ b/tmrrelayassociation.ui @@ -271,7 +271,7 @@ - NCT6100T + NCS6100T