From 85d1933348aa86796e642799ccabf5e4b92da005 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 6 Mar 2024 15:23:56 +0800 Subject: [PATCH] update --- README.md | 2 +- include/ixsync.hpp | 8 +------- include/xsync_packet.hpp | 3 --- include/xsync_v2.hpp | 5 ----- include/xsync_v2_sig_type.hpp | 10 ---------- src/xsync_v2.cpp | 21 +++++++++++++-------- 6 files changed, 15 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 116d85f..7f099ad 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,6 @@ XXXXFreq(uint32_t freq) --> XXXXFreq(float freq) Xsync --> IXsync -删除 connect,disconnect, 添加方法 changeXsyncIp 和 isXsyncOnline +删除 connect,disconnect, 添加方法 changeXsyncIp ``` \ No newline at end of file diff --git a/include/ixsync.hpp b/include/ixsync.hpp index bba207a..18b78ad 100644 --- a/include/ixsync.hpp +++ b/include/ixsync.hpp @@ -11,11 +11,7 @@ #include #include -#include "i_xsync_udp.hpp" #include "xsync_errcode.hpp" -#include "xsync_packet.hpp" -#include "xsync_regs.hpp" -#include "xsync_utils.hpp" #include "xsync_v2_sig_type.hpp" namespace xsync { using namespace std; @@ -23,7 +19,6 @@ using namespace std; typedef function xsync_on_timecode_msg_t; typedef function xsync_on_record_sig_change_msg_t; typedef function xsync_on_camera_sync_msg_t; -typedef function xsync_devic_state_cb_t; class IXsync { public: @@ -35,12 +30,11 @@ class IXsync { ***********************************************************************************************/ virtual xs_error_code_t changeXsyncIp(string xsync_ip) = 0; - virtual bool isXsyncOnline() = 0; + virtual bool ping() = 0; virtual void registerOnTimecodeMsgCallback(xsync_on_timecode_msg_t cb) = 0; virtual void registerOnCameraSyncMsgCallback(xsync_on_camera_sync_msg_t cb) = 0; virtual void registerOnRecordSigChangeMsgCallback(xsync_on_record_sig_change_msg_t cb) = 0; - virtual void registerDeviceStateCallback(xsync_devic_state_cb_t cb) = 0; virtual xs_error_code_t generatorNewMac() = 0; virtual xs_error_code_t factoryReset() = 0; diff --git a/include/xsync_packet.hpp b/include/xsync_packet.hpp index 1f4f163..4842811 100644 --- a/include/xsync_packet.hpp +++ b/include/xsync_packet.hpp @@ -12,9 +12,6 @@ #include // -#include "i_xsync_udp.hpp" -#include "xsync_errcode.hpp" -#include "xsync_regs.hpp" namespace xsync { using namespace std; diff --git a/include/xsync_v2.hpp b/include/xsync_v2.hpp index 688201d..2146454 100644 --- a/include/xsync_v2.hpp +++ b/include/xsync_v2.hpp @@ -14,11 +14,6 @@ // #include "i_xsync_udp.hpp" #include "ixsync.hpp" -#include "xsync_errcode.hpp" -#include "xsync_packet.hpp" -#include "xsync_regs.hpp" -#include "xsync_utils.hpp" -#include "xsync_v2_sig_type.hpp" namespace xsync { using namespace std; diff --git a/include/xsync_v2_sig_type.hpp b/include/xsync_v2_sig_type.hpp index 1c78ce7..a694900 100644 --- a/include/xsync_v2_sig_type.hpp +++ b/include/xsync_v2_sig_type.hpp @@ -15,18 +15,8 @@ #include "i_xsync_udp.hpp" #include "xsync_errcode.hpp" #include "xsync_packet.hpp" -#include "xsync_regs.hpp" namespace xsync { using namespace std; -/******************************************************************************* - * XSYNC_STATE * - *******************************************************************************/ - -typedef enum { - kxsync_net_state_disconnect, - kxsync_net_state_connecting, - kxsync_net_state_connected, -} xsync_net_state_t; /******************************************************************************* * TIMECODE * diff --git a/src/xsync_v2.cpp b/src/xsync_v2.cpp index d56397a..613402a 100644 --- a/src/xsync_v2.cpp +++ b/src/xsync_v2.cpp @@ -4,7 +4,10 @@ #include +#include "xsync_errcode.hpp" +#include "xsync_regs.hpp" #include "xsync_utils.hpp" +#include "xsync_v2_sig_type.hpp" #define TAG "XSYNC" @@ -58,11 +61,9 @@ class Xsync : public IXsync { xsync_on_camera_sync_msg_t m_on_camera_sync_msg_cb = nullptr; xsync_on_timecode_msg_t m_on_timecode_msg_cb = nullptr; xsync_on_record_sig_change_msg_t m_on_record_sig_change_msg_cb = nullptr; - xsync_devic_state_cb_t m_xsync_devic_state_cb = nullptr; int txpacket_index = 0; uint8_t m_xync_cmd_rxdata_cache[2560]; - xsync_net_state_t m_net_state = kxsync_net_state_disconnect; std::recursive_mutex lock_; public: @@ -77,12 +78,11 @@ class Xsync : public IXsync { xs_error_code_t disConnect(); virtual xs_error_code_t changeXsyncIp(string xsync_ip) override; - virtual bool isXsyncOnline() override; + virtual bool ping() override; virtual void registerOnTimecodeMsgCallback(xsync_on_timecode_msg_t cb) override; virtual void registerOnCameraSyncMsgCallback(xsync_on_camera_sync_msg_t cb) override; virtual void registerOnRecordSigChangeMsgCallback(xsync_on_record_sig_change_msg_t cb) override; - virtual void registerDeviceStateCallback(xsync_devic_state_cb_t cb) override; virtual xs_error_code_t generatorNewMac() override; virtual xs_error_code_t factoryReset() override; @@ -241,7 +241,14 @@ xs_error_code_t Xsync::changeXsyncIp(string xsync_ip) { disConnect(); return connect(xsync_ip); } -bool Xsync::isXsyncOnline() { return true; } +bool Xsync::ping() { + uint32_t readbak; + xs_error_code_t ecode = reg_read(reg::kproduct_type_id, readbak, 10); + if (ecode != kxs_ec_success) { + return false; + } + return true; +} xs_error_code_t Xsync::connect(string xsync_ip) { lock_guard lock(lock_); @@ -291,7 +298,6 @@ xs_error_code_t Xsync::connect(string xsync_ip) { m_xsync_timecode_udp_listener = xsync_timecode_udp_listener; m_xsync_camera_sync_udp_listener = xsync_camera_sync_udp_listener; - m_net_state = kxsync_net_state_connected; return ecode; } xs_error_code_t Xsync::disConnect() { @@ -312,14 +318,12 @@ xs_error_code_t Xsync::disConnect() { m_xsync_camera_sync_udp_listener = nullptr; } - m_net_state = kxsync_net_state_disconnect; return kxs_ec_success; } void Xsync::registerOnTimecodeMsgCallback(xsync_on_timecode_msg_t cb) { m_on_timecode_msg_cb = cb; } void Xsync::registerOnCameraSyncMsgCallback(xsync_on_camera_sync_msg_t cb) { m_on_camera_sync_msg_cb = cb; } void Xsync::registerOnRecordSigChangeMsgCallback(xsync_on_record_sig_change_msg_t cb) { m_on_record_sig_change_msg_cb = cb; } -void Xsync::registerDeviceStateCallback(xsync_devic_state_cb_t cb) { m_xsync_devic_state_cb = cb; } xs_error_code_t Xsync::readSn(string &sn) { sn = ""; @@ -327,6 +331,7 @@ xs_error_code_t Xsync::readSn(string &sn) { } xs_error_code_t Xsync::readMac(string &mac) { mac = ""; + return kxs_ec_success; }