Browse Source

update

master
zhaohe 1 year ago
parent
commit
9cb4bd6d0f
  1. 4
      CMakeLists.txt
  2. 6
      iflytop_canbus/iflytop_canbus_master.cpp

4
CMakeLists.txt

@ -14,7 +14,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
# find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets PrintSupport SerialPort Charts Concurrent REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets SerialPort Charts Concurrent REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets SerialPort Concurrent REQUIRED)
# PrintSupportEnigmaVirtual使try...catch便
include_directories(libxsync/include)
@ -94,7 +94,7 @@ add_executable(a8000_pc_upper WIN32
target_link_options(a8000_pc_upper PRIVATE -static -static-libgcc -static-libstdc++)
# target_link_libraries(a8000_pc_upper PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32)
target_link_libraries(a8000_pc_upper 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(a8000_pc_upper PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Concurrent wsock32)
set_target_properties(a8000_pc_upper PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com

6
iflytop_canbus/iflytop_canbus_master.cpp

@ -105,7 +105,7 @@ void IflytopCanbusMaster::ping(int32_t device_id) {
void IflytopCanbusMaster::readreg(int32_t device_id, int32_t regaddr, int32_t *val) {
int32_t param[4];
param[0] = regaddr;
callcmd(device_id, kmodule_get_reg, (uint8_t *)param, 4, 10);
callcmd(device_id, kmodule_get_reg, (uint8_t *)param, 4, 200);
*val = *(int32_t *)(&m_receipt_frame->data[0]);
}
@ -137,7 +137,7 @@ void IflytopCanbusMaster::callcmd3(int32_t device_id, int32_t cmdid, int32_t par
param[2] = param2;
callcmd(device_id, cmdid, (uint8_t *)param, 12, G_OVERTIME);
}
void IflytopCanbusMaster::callcmd4(int32_t device_id, int32_t cmdid, int32_t param0, int32_t param1, int32_t param2,int32_t param3) {
void IflytopCanbusMaster::callcmd4(int32_t device_id, int32_t cmdid, int32_t param0, int32_t param1, int32_t param2, int32_t param3) {
int32_t param[4];
param[0] = param0;
param[1] = param1;
@ -154,7 +154,7 @@ void IflytopCanbusMaster::callcmd(int32_t device_id, int32_t cmdid, uint8_t *par
}
frame->packetindex = m_txindex;
frame->moduleid = device_id;
frame->moduleid = device_id;
frame->packetType = kptv2_cmd;
if (paramLen != 0) memcpy(frame->data, param, paramLen);

Loading…
Cancel
Save