diff --git a/LaunchControl/LaunchControl-full-v2.2.9.exe b/LaunchControl/LaunchControl-full-v2.2.9.exe new file mode 100644 index 0000000..fafce38 Binary files /dev/null and b/LaunchControl/LaunchControl-full-v2.2.9.exe differ diff --git a/LaunchControl/LaunchControl-patch-v2.2.9.zip b/LaunchControl/LaunchControl-patch-v2.2.9.zip new file mode 100644 index 0000000..5fb79c2 Binary files /dev/null and b/LaunchControl/LaunchControl-patch-v2.2.9.zip differ diff --git a/LaunchControl/LaunchControl/LaunchControl.exe b/LaunchControl/LaunchControl/LaunchControl.exe index a224fd9..403cc9b 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 6e3940d..da21117 100644 --- a/LaunchControl/LaunchControl/config.ini +++ b/LaunchControl/LaunchControl/config.ini @@ -6,19 +6,19 @@ energyD=0.6 energyFinal=0.1 [software] -launcherSum=6 +launcherSum=12 conType=1 -portName=COM1 +portName=COM11 localIp=127.0.0.1 -localPort=7001 +localPort=7000 remoteIp=127.0.0.1 -remotePort=7000 +remotePort=7001 [delay] -delayTimeA=3 -delayTimeB=3 -delayTimeC=3 -delayTimeD=3 +delayTimeA=30 +delayTimeB=30 +delayTimeC=30 +delayTimeD=30 delayTimeSignal=1 [launcher] @@ -26,3 +26,4 @@ launcherAngle=40 [AppSetting] language=cjflasogeoghoahjflashgoheglnlasngsdlfhkhn +protocol=0 diff --git a/LaunchControl/LaunchControl/logs/2024-01-01_1.log b/LaunchControl/LaunchControl/logs/2024-01-01_1.log deleted file mode 100644 index cb41a2e..0000000 --- a/LaunchControl/LaunchControl/logs/2024-01-01_1.log +++ /dev/null @@ -1,15 +0,0 @@ -2024-01-01 21:38:52 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-01-01 21:38:52 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-01-01 21:38:52 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-01-01 21:38:52 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-01-01 21:38:52 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.01.01 20:14:38" -2024-01-01 21:38:52 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-01-01 21:38:52 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-01-01 21:38:53 - [WARN ] (mainwindow.cpp:542, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-01-01 21:38:53 - [INFO ] (bridge.cpp:71, void Bridge::conSerialSlot(const QString&)): "open serial port:COM1 success" -2024-01-01 21:38:54 - [INFO ] (bridge.cpp:171, void Bridge::doSendToLaunchers(QByteArray)): "send data:" "0a0000005802580258025802640000000300030003000300010090019002" -2024-01-01 21:38:55 - [INFO ] (bridge.cpp:171, void Bridge::doSendToLaunchers(QByteArray)): "send data:" "0a0000005802580258025802640000000300030003000300010090019002" -2024-01-01 21:38:55 - [INFO ] (appconfig.cpp:104, void AppConfig::writeConfigIni()): "写配置文件" -2024-01-01 21:38:55 - [DEBUG] (appconfig.cpp:142, void AppConfig::writeConfigIni()): "cjflasogeoghoahjflashgoheglnlasngsdlfhkhn" 1 -2024-01-01 21:38:55 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-01-01 21:38:55 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/LaunchControl/logs/2024-01-01_2.log b/LaunchControl/LaunchControl/logs/2024-01-01_2.log deleted file mode 100644 index b98e301..0000000 --- a/LaunchControl/LaunchControl/logs/2024-01-01_2.log +++ /dev/null @@ -1,15 +0,0 @@ -2024-01-01 21:39:20 - [INFO ] (appconfig.cpp:36, void AppConfig::createLogger()): =============== start ================ -2024-01-01 21:39:20 - [INFO ] (appconfig.cpp:48, void AppConfig::readConfigIni()): "read config ini" -2024-01-01 21:39:20 - [INFO ] (src/appinfo.h:31, void printAppInfo()): "LaunchControl WIN" -2024-01-01 21:39:20 - [INFO ] (src/appinfo.h:32, void printAppInfo()): modify:write config.ini after back to mainwindow -2024-01-01 21:39:20 - [INFO ] (src/appinfo.h:35, void printAppInfo()): build time: "2024.01.01 20:14:38" -2024-01-01 21:39:20 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_DeselectAll_clicked() -2024-01-01 21:39:20 - [WARN ] (:0, ): QMetaObject::connectSlotsByName: No matching signal for on_pushButton_Min_clicked() -2024-01-01 21:39:20 - [WARN ] (mainwindow.cpp:542, void MainWindow::errorOccurred(QSerialPort::SerialPortError)): QSerialPort::NoError -2024-01-01 21:39:20 - [INFO ] (bridge.cpp:71, void Bridge::conSerialSlot(const QString&)): "open serial port:COM1 success" -2024-01-01 21:39:21 - [INFO ] (bridge.cpp:171, void Bridge::doSendToLaunchers(QByteArray)): "send data:" "0a0000005802580258025802640000000300030003000300010090019002" -2024-01-01 21:39:22 - [INFO ] (bridge.cpp:171, void Bridge::doSendToLaunchers(QByteArray)): "send data:" "0a0000005802580258025802640000000300030003000300010090019002" -2024-01-01 21:39:23 - [INFO ] (appconfig.cpp:104, void AppConfig::writeConfigIni()): "写配置文件" -2024-01-01 21:39:23 - [DEBUG] (appconfig.cpp:142, void AppConfig::writeConfigIni()): "cjflasogeoghoahjflashgoheglnlasngsdlfhkhn" 1 -2024-01-01 21:39:23 - [INFO ] (appconfig.cpp:41, void AppConfig::closeLogger()): "关闭配置文件" -2024-01-01 21:39:23 - [INFO ] (appconfig.cpp:42, void AppConfig::closeLogger()): ==================================== diff --git a/LaunchControl/pack.iss b/LaunchControl/pack.iss index 50130c7..08436b2 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.8" +#define MyAppVersion "2.2.9" #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 e1091a0..b968bd6 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.8", + "full-version": "2.2.9", "download-full":false, "patch-url": "http://www.tianzd.cn:1995/TianZD/deploy/raw/branch/master/", - "patch-version": "2.2.8", + "patch-version": "2.2.9", "changelog": "1.fix bug", - "modify-time": "20240110", + "modify-time": "20240111", "modifyCnt": "1" } }