p_dynamic_electrocardiograph
/
electrocardiograph_upper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 1 year ago
parent
cb785a93c5
commit
3831bcd021
7 changed files with 116 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      CMakeLists.txt
  2. 96
      CMakeLists.txt.user
  3. 2
      README.md
  4. 2
      libzqt/logger.cpp
  5. 7
      mainwindow.cpp
  6. 3
      src/camera_light_src_timing_controller/clst_controler.cpp
  7. 4
      src/camera_light_src_timing_controller/qt_serial_datachannel.hpp

9
CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS 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) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets SerialPort Charts Concurrent REQUIRED)
include_directories(libxsync/include) include_directories(libxsync/include)
@ -20,6 +20,7 @@ include_directories(src)
include_directories(./) include_directories(./)
include_directories(libzqt) include_directories(libzqt)
add_compile_options(-Wall )
set(PROJECT_SOURCES set(PROJECT_SOURCES
libzqt/logger.cpp libzqt/logger.cpp
libzqt/zqthread.cpp libzqt/zqthread.cpp
@ -46,8 +47,14 @@ set(PROJECT_SOURCES
add_executable(CameraLightingController add_executable(CameraLightingController
${PROJECT_SOURCES} ${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)
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 set_target_properties(CameraLightingController PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com

96
CMakeLists.txt.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 5.0.2, 2024-03-07T22:20:57. -->
<!-- Written by QtCreator 5.0.2, 2024-03-11T13:38:12. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -107,7 +107,7 @@
-DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} -DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value> -DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
<value type="QString" key="CMake.Source.Directory">D:/workspace/p_camera_light_source_timing_controller/camera_light_src_timing_controller_pc</value> <value type="QString" key="CMake.Source.Directory">D:/workspace/p_camera_light_source_timing_controller/camera_light_src_timing_controller_pc</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\workspace\p_camera_light_source_timing_controller\build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
@ -143,7 +143,97 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="CMake.Build.Type">MinSizeRel</value>
<value type="QString" key="CMake.Initial.Parameters">-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}</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">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</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
<value type="QString">all</value>
</valuelist>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
<value type="QString">clean</value>
</valuelist>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Minimum Size Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="QString" key="CMake.Build.Type">Release</value>
<value type="QString" key="CMake.Initial.Parameters">-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}</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\workspace\p_camera_light_source_timing_controller\build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
<value type="QString">all</value>
</valuelist>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
<value type="QString">clean</value>
</valuelist>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>

2
README.md
View File

@ -4,4 +4,6 @@ TODO:
2. 显示STM32版本号 2. 显示STM32版本号
3. 显示PC软件版本号 3. 显示PC软件版本号
4. 修改窗口名称 4. 修改窗口名称
QT打包
https://blog.csdn.net/ColinFhz/article/details/107879769
``` ```

2
libzqt/logger.cpp
View File

@ -10,7 +10,7 @@ void zos_log(const char *fmt, ...) {
va_start(args, fmt); va_start(args, fmt);
char buf[1024] = {0}; char buf[1024] = {0};
vsnprintf(buf, sizeof(buf), fmt, args); vsnprintf(buf, sizeof(buf), fmt, args);
qDebug() << buf;
qInfo() << buf;
va_end(args); va_end(args);
} }

7
mainwindow.cpp
View File

@ -153,6 +153,7 @@ void MainWindow::updatePage() {
UPDATE(2); UPDATE(2);
UPDATE(3); UPDATE(3);
UPDATE(4); UPDATE(4);
#undef UPDATE
} }
{ {
@ -184,6 +185,7 @@ void MainWindow::updatePage() {
UPDATE(2); UPDATE(2);
UPDATE(3); UPDATE(3);
UPDATE(4); UPDATE(4);
#undef UPDATE
} }
} }
@ -255,6 +257,7 @@ void MainWindow::refreshReadonlyPage2() {
UPDATE(2); UPDATE(2);
UPDATE(3); UPDATE(3);
UPDATE(4); UPDATE(4);
#undef UPDATE
} }
} }
void MainWindow::refreshReadonlyPage3() { void MainWindow::refreshReadonlyPage3() {
@ -369,6 +372,7 @@ void MainWindow::refreshPage() {
UPDATE(2); UPDATE(2);
UPDATE(3); UPDATE(3);
UPDATE(4); UPDATE(4);
#undef UPDATE
} }
{ {
@ -402,6 +406,7 @@ void MainWindow::refreshPage() {
UPDATE(2); UPDATE(2);
UPDATE(3); UPDATE(3);
UPDATE(4); UPDATE(4);
#undef UPDATE
} }
} }
@ -780,7 +785,7 @@ void MainWindow::dumpLog(const char *fmt, ...) {
va_start(args, fmt); va_start(args, fmt);
char buf[1024] = {0}; char buf[1024] = {0};
vsnprintf(buf, sizeof(buf), fmt, args); vsnprintf(buf, sizeof(buf), fmt, args);
qDebug() << buf;
// qDebug() << buf;
va_end(args); va_end(args);
QString text(buf); QString text(buf);

3
src/camera_light_src_timing_controller/clst_controler.cpp
View File

@ -26,7 +26,6 @@ CLSTControler *CLSTControler::ins() {
void CLSTControler::initialize(IDataChannel *channel) { // void CLSTControler::initialize(IDataChannel *channel) { //
m_channel = channel; m_channel = channel;
m_channel->regRxListener([this](uint8_t *data, size_t len) { m_channel->regRxListener([this](uint8_t *data, size_t len) {
// ZLOGI(TAG, "Rx1.....");
{ {
lock_guard<mutex> lock(lock_); lock_guard<mutex> lock(lock_);
if (len + m_rxlen > sizeof(m_rxcache)) { if (len + m_rxlen > sizeof(m_rxcache)) {
@ -42,7 +41,7 @@ void CLSTControler::initialize(IDataChannel *channel) { //
uint8_t rx_process_cache[1024]; uint8_t rx_process_cache[1024];
uint32_t rx_process_cache_len; uint32_t rx_process_cache_len;
while (true) { while (true) {
this_thread::sleep_for(chrono::milliseconds(3));
this_thread::sleep_for(chrono::milliseconds(4));
{ {
lock_guard<mutex> lock(lock_); lock_guard<mutex> lock(lock_);

4
src/camera_light_src_timing_controller/qt_serial_datachannel.hpp
View File

@ -12,9 +12,11 @@
#include <string> #include <string>
#include <vector> #include <vector>
// //
#include <Windows.h>
#include <winsock2.h> #include <winsock2.h>
// //
#include <Windows.h>
//
#include <QtSerialPort/QSerialPort> #include <QtSerialPort/QSerialPort>
#include <QtSerialPort/QSerialPortInfo> #include <QtSerialPort/QSerialPortInfo>
// //

Write Preview
Loading…
Cancel
Save