Browse Source

V104| 修复上位机通信失败的BUG

master
zhaohe 4 months ago
parent
commit
4bd579abfa
  1. 5
      .gitignore
  2. BIN
      IflytopCom/IflytopCom.exe
  3. BIN
      release/IflytopComV104.exe
  4. 5
      src/app/transmit_disinfection/transmitdisinfection.cpp
  5. 4
      src/app_version.hpp
  6. BIN
      tools/makesfx.exe
  7. 2
      tools/packet.bat
  8. BIN
      单文件制作_x64.exe

5
.gitignore

@ -72,3 +72,8 @@ Thumbs.db
build build
CMakeLists.txt.user CMakeLists.txt.user
*.exe
!makesfx.exe
!release/*.exe
dist

BIN
IflytopCom/IflytopCom.exe

BIN
release/IflytopComV104.exe

5
src/app/transmit_disinfection/transmitdisinfection.cpp

@ -35,6 +35,11 @@ TransmitDisinfection::TransmitDisinfection(QWidget *parent) : QTabWidget(parent)
// Init end // Init end
CAN_MASTER->initialize(&ChannelMgr::ins()->serialCh); CAN_MASTER->initialize(&ChannelMgr::ins()->serialCh);
ChannelMgr::ins()->serialCh.regOnStateChange([this](bool open){
if(open){
CAN_MASTER->getCanProtocolCom()->updateChannelConfig();
}
});
ZQUI::ins()->mainW()->setSerialDefaultBaudrate("2000000"); ZQUI::ins()->mainW()->setSerialDefaultBaudrate("2000000");
ErrorCodeInitializer().regErrorcodeInfo(); ErrorCodeInitializer().regErrorcodeInfo();

4
src/app_version.hpp

@ -1,8 +1,8 @@
#pragma once #pragma once
#define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0)
#define APP_VERSION VERSION(1, 0, 3)
#define APP_VERSION_STR "1.0.3"
#define APP_VERSION VERSION(1, 0, 4)
#define APP_VERSION_STR "1.0.4"
#define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION) #define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION)
#define APP_VERSION_SUB VERSION_SUB(APP_VERSION) #define APP_VERSION_SUB VERSION_SUB(APP_VERSION)

BIN
tools/makesfx.exe

2
tools/packet.bat

@ -0,0 +1,2 @@
@REM #打包指令
.\tools\makesfx.exe -ic -mf -ft -we -di -un -oo .\IflytopCom\ .\dist\IflytopCom.exe .\logo.ico .\IflytopCom\IflytopCom.exe

BIN
单文件制作_x64.exe

Loading…
Cancel
Save