From 3831bcd0213110d4803160f0a2fd55dccae3ab29 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 11 Mar 2024 14:02:36 +0800 Subject: [PATCH] update --- CMakeLists.txt | 9 +- CMakeLists.txt.user | 96 +++++++++++++++++++++- README.md | 2 + libzqt/logger.cpp | 2 +- mainwindow.cpp | 9 +- .../clst_controler.cpp | 3 +- .../qt_serial_datachannel.hpp | 6 +- 7 files changed, 116 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94a46c9..51a2c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets console REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets SerialPort Charts Concurrent REQUIRED) include_directories(libxsync/include) @@ -20,6 +20,7 @@ include_directories(src) include_directories(./) include_directories(libzqt) +add_compile_options(-Wall ) set(PROJECT_SOURCES libzqt/logger.cpp libzqt/zqthread.cpp @@ -46,8 +47,14 @@ set(PROJECT_SOURCES add_executable(CameraLightingController ${PROJECT_SOURCES} ) +target_link_options(CameraLightingController PRIVATE -static -static-libgcc -static-libstdc++) target_link_libraries(CameraLightingController PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) +target_link_libraries(CameraLightingController PRIVATE Qt${QT_VERSION_MAJOR}::Widgets # + Qt${QT_VERSION_MAJOR}::SerialPort # + Qt${QT_VERSION_MAJOR}::Charts # + Qt${QT_VERSION_MAJOR}::Concurrent # +wsock32) set_target_properties(CameraLightingController PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index be2eb83..528aad8 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -107,7 +107,7 @@ -DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} D:/workspace/p_camera_light_source_timing_controller/camera_light_src_timing_controller_pc - D:\workspace\p_camera_light_source_timing_controller\build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug + D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug @@ -143,7 +143,97 @@ Debug CMakeProjectManager.CMakeBuildConfiguration - 1 + + MinSizeRel + -GMinGW Makefiles +-DCMAKE_BUILD_TYPE:STRING=MinSizeRel +-DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake +-DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} +-DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} +-DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} +-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + D:\workspace\p_camera_light_source_timing_controller\build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Minimum-Size-Release + + + + all + + true + Build + CMakeProjectManager.MakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + + clean + + true + Build + CMakeProjectManager.MakeStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Minimum Size Release + CMakeProjectManager.CMakeBuildConfiguration + + + Release + -GMinGW Makefiles +-DCMAKE_BUILD_TYPE:STRING=Release +-DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake +-DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} +-DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} +-DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} +-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + D:\workspace\p_camera_light_source_timing_controller\build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release + + + + all + + true + Build + CMakeProjectManager.MakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + + clean + + true + Build + CMakeProjectManager.MakeStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Release + CMakeProjectManager.CMakeBuildConfiguration + + 3 0 diff --git a/README.md b/README.md index f281ef8..f5b149b 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,6 @@ TODO: 2. 显示STM32版本号 3. 显示PC软件版本号 4. 修改窗口名称 +QT打包 +https://blog.csdn.net/ColinFhz/article/details/107879769 ``` diff --git a/libzqt/logger.cpp b/libzqt/logger.cpp index e18fe88..e2d0b28 100644 --- a/libzqt/logger.cpp +++ b/libzqt/logger.cpp @@ -10,7 +10,7 @@ void zos_log(const char *fmt, ...) { va_start(args, fmt); char buf[1024] = {0}; vsnprintf(buf, sizeof(buf), fmt, args); - qDebug() << buf; + qInfo() << buf; va_end(args); } diff --git a/mainwindow.cpp b/mainwindow.cpp index e4d7f82..5d5c470 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -153,6 +153,7 @@ void MainWindow::updatePage() { UPDATE(2); UPDATE(3); UPDATE(4); + #undef UPDATE } { @@ -184,6 +185,7 @@ void MainWindow::updatePage() { UPDATE(2); UPDATE(3); UPDATE(4); + #undef UPDATE } } @@ -255,6 +257,7 @@ void MainWindow::refreshReadonlyPage2() { UPDATE(2); UPDATE(3); UPDATE(4); + #undef UPDATE } } void MainWindow::refreshReadonlyPage3() { @@ -369,6 +372,7 @@ void MainWindow::refreshPage() { UPDATE(2); UPDATE(3); UPDATE(4); + #undef UPDATE } { @@ -402,6 +406,7 @@ void MainWindow::refreshPage() { UPDATE(2); UPDATE(3); UPDATE(4); + #undef UPDATE } } @@ -780,7 +785,7 @@ void MainWindow::dumpLog(const char *fmt, ...) { va_start(args, fmt); char buf[1024] = {0}; vsnprintf(buf, sizeof(buf), fmt, args); - qDebug() << buf; + // qDebug() << buf; va_end(args); QString text(buf); @@ -799,4 +804,4 @@ void MainWindow::dumpLog(const char *fmt, ...) { })); } -MainWindow::~MainWindow() { delete ui; } \ No newline at end of file +MainWindow::~MainWindow() { delete ui; } diff --git a/src/camera_light_src_timing_controller/clst_controler.cpp b/src/camera_light_src_timing_controller/clst_controler.cpp index 530008d..a4fbcb8 100644 --- a/src/camera_light_src_timing_controller/clst_controler.cpp +++ b/src/camera_light_src_timing_controller/clst_controler.cpp @@ -26,7 +26,6 @@ CLSTControler *CLSTControler::ins() { void CLSTControler::initialize(IDataChannel *channel) { // m_channel = channel; m_channel->regRxListener([this](uint8_t *data, size_t len) { - // ZLOGI(TAG, "Rx1....."); { lock_guard lock(lock_); if (len + m_rxlen > sizeof(m_rxcache)) { @@ -42,7 +41,7 @@ void CLSTControler::initialize(IDataChannel *channel) { // uint8_t rx_process_cache[1024]; uint32_t rx_process_cache_len; while (true) { - this_thread::sleep_for(chrono::milliseconds(3)); + this_thread::sleep_for(chrono::milliseconds(4)); { lock_guard lock(lock_); diff --git a/src/camera_light_src_timing_controller/qt_serial_datachannel.hpp b/src/camera_light_src_timing_controller/qt_serial_datachannel.hpp index 3e9a4cd..4c54db6 100644 --- a/src/camera_light_src_timing_controller/qt_serial_datachannel.hpp +++ b/src/camera_light_src_timing_controller/qt_serial_datachannel.hpp @@ -12,9 +12,11 @@ #include #include // -#include + #include // +#include +// #include #include // @@ -74,4 +76,4 @@ class QTDataChannel : public IDataChannel { int com_receive(uint8_t *rxbuf, int rxbufsize); }; } // namespace clst -} // namespace iflytop \ No newline at end of file +} // namespace iflytop