diff --git a/LaunchControl/LaunchControl-full-v2.2.4.exe b/LaunchControl/LaunchControl-full-v2.2.4.exe new file mode 100644 index 0000000..67d4e69 Binary files /dev/null and b/LaunchControl/LaunchControl-full-v2.2.4.exe differ diff --git a/LaunchControl/LaunchControl-patch-v2.2.4.zip b/LaunchControl/LaunchControl-patch-v2.2.4.zip new file mode 100644 index 0000000..631cecd Binary files /dev/null and b/LaunchControl/LaunchControl-patch-v2.2.4.zip differ diff --git a/LaunchControl/LaunchControl/LaunchControl-full-v2.2.3.exe.part b/LaunchControl/LaunchControl/LaunchControl-full-v2.2.3.exe.part deleted file mode 100644 index 76c058a..0000000 Binary files a/LaunchControl/LaunchControl/LaunchControl-full-v2.2.3.exe.part and /dev/null differ diff --git a/LaunchControl/LaunchControl/LaunchControl.exe b/LaunchControl/LaunchControl/LaunchControl.exe index 4b88376..2bbf336 100644 Binary files a/LaunchControl/LaunchControl/LaunchControl.exe and b/LaunchControl/LaunchControl/LaunchControl.exe differ diff --git a/LaunchControl/LaunchControl/config.ini b/LaunchControl/LaunchControl/config.ini index e435861..0c80911 100644 --- a/LaunchControl/LaunchControl/config.ini +++ b/LaunchControl/LaunchControl/config.ini @@ -1,30 +1,25 @@ [energy] -energyA=0.66 -energyB=0.66 -energyC=0.66 -energyD=0.66 -energyFinal=0.1 -energyBak=0 +energyA=0 +energyB=0 +energyC=0 +energyD=0 +energyFinal=0 [software] -launcherSum=6 +launcherSum=12 conType=0 portName=COM6 localIp=127.0.0.1 -localPort=7000 -remoteIp=127.0.0.1 -remotePort=7001 +localPort=0 +remoteIp= +remotePort=0 [delay] -delayTimeA=30 -delayTimeB=30 -delayTimeC=30 -delayTimeD=30 -delayTimeSignal=3 -delayTimeBak=0 +delayTimeA=0 +delayTimeB=0 +delayTimeC=0 +delayTimeD=0 +delayTimeSignal=0 [launcher] -launcherAngle=40 - -[com] -portName=COM6 +launcherAngle=0 diff --git a/LaunchControl/LaunchControl/log/2023-12-26.log b/LaunchControl/LaunchControl/log/2023-12-26.log new file mode 100644 index 0000000..66df130 --- /dev/null +++ b/LaunchControl/LaunchControl/log/2023-12-26.log @@ -0,0 +1,11 @@ +2023-12-26 16:52:03 - [INFO ] (appconfig.cpp:46, void AppConfig::readConfigIni()): "读取配置文件" +2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" +2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow +2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2023.12.21 12:30:55" +2023-12-26 16:52:03 - [INFO ] (main.cpp:36, int qMain(int, char**)): =============== start ================ +2023-12-26 16:52:03 - [INFO ] (main.cpp:37, int qMain(int, char**)): ==================================== +2023-12-26 16:52:03 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() +2023-12-26 16:52:04 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-26 16:52:04 - [WARN ] (main.cpp:40, int qMain(int, char**)): ==================================== +2023-12-26 16:52:06 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-26 16:52:06 - [INFO ] (appconfig.cpp:39, void AppConfig::closeLogger()): "关闭配置文件" diff --git a/LaunchControl/LaunchControl/log/today.log b/LaunchControl/LaunchControl/log/today.log index 66df130..657d8c8 100644 --- a/LaunchControl/LaunchControl/log/today.log +++ b/LaunchControl/LaunchControl/log/today.log @@ -1,11 +1,38 @@ -2023-12-26 16:52:03 - [INFO ] (appconfig.cpp:46, void AppConfig::readConfigIni()): "读取配置文件" -2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2023-12-26 16:52:03 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2023.12.21 12:30:55" -2023-12-26 16:52:03 - [INFO ] (main.cpp:36, int qMain(int, char**)): =============== start ================ -2023-12-26 16:52:03 - [INFO ] (main.cpp:37, int qMain(int, char**)): ==================================== -2023-12-26 16:52:03 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2023-12-26 16:52:04 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" -2023-12-26 16:52:04 - [WARN ] (main.cpp:40, int qMain(int, char**)): ==================================== -2023-12-26 16:52:06 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" -2023-12-26 16:52:06 - [INFO ] (appconfig.cpp:39, void AppConfig::closeLogger()): "关闭配置文件" +2023-12-27 16:05:01 - [INFO ] (appconfig.cpp:46, void AppConfig::readConfigIni()): "读取配置文件" +2023-12-27 16:05:01 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" +2023-12-27 16:05:01 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow +2023-12-27 16:05:01 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2023.12.26 17:00:36" +2023-12-27 16:05:01 - [INFO ] (main.cpp:36, int qMain(int, char**)): =============== start ================ +2023-12-27 16:05:01 - [INFO ] (main.cpp:37, int qMain(int, char**)): ==================================== +2023-12-27 16:05:01 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() +2023-12-27 16:05:02 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:02 - [WARN ] (main.cpp:40, int qMain(int, char**)): ==================================== +2023-12-27 16:05:05 - [INFO ] (settingwidget.cpp:39, QStringList SettingWidget::searchSerial()): "搜索串口" +2023-12-27 16:05:07 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:07 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:07 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:07 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:11 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:11 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:13 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:13 - [INFO ] (appconfig.cpp:39, void AppConfig::closeLogger()): "关闭配置文件" +2023-12-27 16:05:50 - [INFO ] (appconfig.cpp:46, void AppConfig::readConfigIni()): "读取配置文件" +2023-12-27 16:05:50 - [WARN ] (appconfig.cpp:51, void AppConfig::readConfigIni()): "配置文件不存在,创建配置文件" +2023-12-27 16:05:50 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" +2023-12-27 16:05:50 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow +2023-12-27 16:05:50 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2023.12.26 17:00:36" +2023-12-27 16:05:50 - [INFO ] (main.cpp:36, int qMain(int, char**)): =============== start ================ +2023-12-27 16:05:50 - [INFO ] (main.cpp:37, int qMain(int, char**)): ==================================== +2023-12-27 16:05:50 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() +2023-12-27 16:05:50 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:50 - [WARN ] (main.cpp:40, int qMain(int, char**)): ==================================== +2023-12-27 16:05:53 - [INFO ] (settingwidget.cpp:501, void SettingWidget::on_comboBox_Com_2_currentTextChanged(const QString&)): "发射筒数量变为12" +2023-12-27 16:05:53 - [INFO ] (settingwidget.cpp:39, QStringList SettingWidget::searchSerial()): "搜索串口" +2023-12-27 16:05:55 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:55 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:05:55 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:05:55 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:06:00 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:06:00 - [INFO ] (mainwindow.cpp:634, void MainWindow::updatePressureAndDelayBytes()): "重置buff" +2023-12-27 16:06:04 - [INFO ] (appconfig.cpp:102, void AppConfig::writeConfigIni()): "写配置文件" +2023-12-27 16:06:04 - [INFO ] (appconfig.cpp:39, void AppConfig::closeLogger()): "关闭配置文件" diff --git a/LaunchControl/deploy.iss b/LaunchControl/deploy.iss index e3df109..5757029 100644 --- a/LaunchControl/deploy.iss +++ b/LaunchControl/deploy.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LaunchControl" -#define MyAppVersion "2.2.3" +#define MyAppVersion "2.2.4" #define MyAppPublisher "My Company, Inc." #define MyAppURL "https://www.example.com/" #define MyAppExeName "LaunchControl.exe"