diff --git a/LaunchControl/LaunchControl-full-v2.4.1.exe b/LaunchControl/LaunchControl-full-v2.4.1.exe new file mode 100644 index 0000000..4459191 Binary files /dev/null and b/LaunchControl/LaunchControl-full-v2.4.1.exe differ diff --git a/LaunchControl/LaunchControl-full-v2.4.4.exe b/LaunchControl/LaunchControl-full-v2.4.4.exe new file mode 100644 index 0000000..d7800d3 Binary files /dev/null and b/LaunchControl/LaunchControl-full-v2.4.4.exe differ diff --git a/LaunchControl/LaunchControl-patch-v2.4.4.zip b/LaunchControl/LaunchControl-patch-v2.4.4.zip new file mode 100644 index 0000000..211e90a Binary files /dev/null and b/LaunchControl/LaunchControl-patch-v2.4.4.zip differ diff --git a/LaunchControl/LaunchControl/LaunchControl.exe b/LaunchControl/LaunchControl/LaunchControl.exe index 34f389b..4f60781 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 deleted file mode 100644 index cca8c14..0000000 --- a/LaunchControl/LaunchControl/config.ini +++ /dev/null @@ -1,33 +0,0 @@ -[energy] -energyA=0.6 -energyB=0.6 -energyC=0.6 -energyD=0.6 -energyFinal=0.1 - -[software] -launcherSum=12 -conType=1 -portName=COM11 -localIp=127.0.0.1 -localPort=7000 -remoteIp=127.0.0.1 -remotePort=7001 - -[delay] -delayTimeA=30 -delayTimeB=30 -delayTimeC=30 -delayTimeD=30 -delayTimeSignal=1 - -[launcher] -launcherAngle=40 -pressureScale=0.9 - -[AppSetting] -language=cjflasogeoghoahjflashgoheglnlasngsdlfhkhn -protocol=0 -retryMethod=0 -retryTime=200 -retryCnt=5 diff --git a/LaunchControl/LaunchControl/logs/2024-01-30_1.log b/LaunchControl/LaunchControl/logs/2024-01-30_1.log deleted file mode 100644 index 28660b7..0000000 --- a/LaunchControl/LaunchControl/logs/2024-01-30_1.log +++ /dev/null @@ -1,13 +0,0 @@ -2024-01-30 11:04:46 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-01-30 11:04:46 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-01-30 11:04:46 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-01-30 11:04:46 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-01-30 11:04:46 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.01.30 11:01:04" -2024-01-30 11:04:46 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-01-30 11:04:46 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-01-30 11:04:47 - [WARN ] (mainwindow.cpp:551, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-01-30 11:04:47 - [WARN ] (mainwindow.cpp:551, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::DeviceNotFoundError -2024-01-30 11:04:47 - [INFO ] (bridge.cpp:66, void Bridge::conSerialSlot(const QString&)): "open serial port:COM11 failed" -2024-01-30 11:04:49 - [INFO ] (appconfig.cpp:115, void AppConfig::writeConfigIni()): "写配置文件" -2024-01-30 11:04:49 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-01-30 11:04:49 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/LaunchControl/logs/2024-02-01_1.log b/LaunchControl/LaunchControl/logs/2024-02-01_1.log deleted file mode 100644 index de29c19..0000000 --- a/LaunchControl/LaunchControl/logs/2024-02-01_1.log +++ /dev/null @@ -1,13 +0,0 @@ -2024-02-01 20:53:35 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-02-01 20:53:35 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-02-01 20:53:35 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-02-01 20:53:35 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-02-01 20:53:35 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.02.01 11:39:35" -2024-02-01 20:53:35 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-02-01 20:53:35 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-02-01 20:53:35 - [WARN ] (mainwindow.cpp:550, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-02-01 20:53:35 - [WARN ] (mainwindow.cpp:550, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::DeviceNotFoundError -2024-02-01 20:53:35 - [INFO ] (bridge.cpp:66, void Bridge::conSerialSlot(const QString&)): "open serial port:COM11 failed" -2024-02-01 20:53:38 - [INFO ] (appconfig.cpp:118, void AppConfig::writeConfigIni()): "写配置文件" -2024-02-01 20:53:38 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-02-01 20:53:38 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/LaunchControl/logs/2024-03-19_1.log b/LaunchControl/LaunchControl/logs/2024-03-19_1.log deleted file mode 100644 index 61743a5..0000000 --- a/LaunchControl/LaunchControl/logs/2024-03-19_1.log +++ /dev/null @@ -1,26 +0,0 @@ -2024-03-19 16:40:36 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-03-19 16:40:36 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-03-19 16:40:36 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-03-19 16:40:36 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-03-19 16:40:36 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.03.19 11:37:42" -2024-03-19 16:40:36 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-03-19 16:40:36 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-03-19 16:40:36 - [WARN ] (mainwindow.cpp:551, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-03-19 16:40:36 - [INFO ] (bridge.cpp:71, void Bridge::conSerialSlot(const QString&)): "open serial port:COM11 success" -2024-03-19 16:40:37 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:39 - [INFO ] (settingwidget.cpp:584, void SettingWidget::on_comboBox_Com_2_currentTextChanged(const QString&)): "发射筒数量变为12" -2024-03-19 16:40:39 - [INFO ] (settingwidget.cpp:37, QStringList SettingWidget::searchSerial()): "搜索串口" -2024-03-19 16:40:39 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:41 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:42 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:43 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:45 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:46 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:48 - [INFO ] (appconfig.cpp:162, void AppConfig::writeConfigIni()): "写配置文件" -2024-03-19 16:40:48 - [INFO ] (settingwidget.cpp:494, void SettingWidget::saveData()): send backToMainWindowSignal start -2024-03-19 16:40:48 - [INFO ] (settingwidget.cpp:496, void SettingWidget::saveData()): send backToMainWindowSignal end -2024-03-19 16:40:48 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:49 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:40:50 - [INFO ] (appconfig.cpp:162, void AppConfig::writeConfigIni()): "写配置文件" -2024-03-19 16:40:50 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-03-19 16:40:50 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/LaunchControl/logs/2024-03-19_2.log b/LaunchControl/LaunchControl/logs/2024-03-19_2.log deleted file mode 100644 index 84d5dc7..0000000 --- a/LaunchControl/LaunchControl/logs/2024-03-19_2.log +++ /dev/null @@ -1,23 +0,0 @@ -2024-03-19 16:42:38 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-03-19 16:42:38 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-03-19 16:42:38 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-03-19 16:42:38 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-03-19 16:42:38 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.03.19 11:37:42" -2024-03-19 16:42:39 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-03-19 16:42:39 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-03-19 16:42:39 - [WARN ] (mainwindow.cpp:551, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-03-19 16:42:39 - [INFO ] (bridge.cpp:71, void Bridge::conSerialSlot(const QString&)): "open serial port:COM11 success" -2024-03-19 16:42:40 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:41 - [INFO ] (settingwidget.cpp:584, void SettingWidget::on_comboBox_Com_2_currentTextChanged(const QString&)): "发射筒数量变为12" -2024-03-19 16:42:41 - [INFO ] (settingwidget.cpp:37, QStringList SettingWidget::searchSerial()): "搜索串口" -2024-03-19 16:42:42 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:43 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:45 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:46 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:47 - [INFO ] (appconfig.cpp:162, void AppConfig::writeConfigIni()): "写配置文件" -2024-03-19 16:42:47 - [INFO ] (settingwidget.cpp:494, void SettingWidget::saveData()): send backToMainWindowSignal start -2024-03-19 16:42:47 - [INFO ] (settingwidget.cpp:496, void SettingWidget::saveData()): send backToMainWindowSignal end -2024-03-19 16:42:48 - [INFO ] (bridge.cpp:240, void Bridge::doSendToLaunchers(QByteArray)): "发送数据：" "eb900a0000005802580258025802640000001e001e001e001e0001009001ef59" -2024-03-19 16:42:49 - [INFO ] (appconfig.cpp:162, void AppConfig::writeConfigIni()): "写配置文件" -2024-03-19 16:42:49 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-03-19 16:42:49 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/pack.iss b/LaunchControl/pack.iss index 08436b2..5c27396 100644 --- a/LaunchControl/pack.iss +++ b/LaunchControl/pack.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LaunchControl" -#define MyAppVersion "2.2.9" +#define MyAppVersion "2.4.4" #define MyAppPublisher "xfd, Inc." #define MyAppURL "https://www.example.com/" #define MyAppExeName "LaunchControl.exe" diff --git a/LaunchControl/updates.json b/LaunchControl/updates.json index 7b8c46d..1a1eae2 100644 --- a/LaunchControl/updates.json +++ b/LaunchControl/updates.json @@ -4,13 +4,13 @@ "windows": { "full-url": "http://www.tianzd.cn:1995/TianZD/deploy/raw/branch/master/", - "full-version": "2.2.9", + "full-version": "2.4.4", "download-full":false, "patch-url": "http://www.tianzd.cn:1995/TianZD/deploy/raw/branch/master/", - "patch-version": "2.3.2", + "patch-version": "2.4.4", "changelog": "1.modify retry method", - "modify-time": "20240225", + "modify-time": "20240415", "modifyCnt": "1" } }