From 7b7c6a3b5442f59c6dd14715eedd7275b00b0765 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 29 Mar 2024 11:34:38 +0800 Subject: [PATCH] v3.3 --- include/xsync_v2.hpp | 2 +- src/xsync_v2.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/xsync_v2.hpp b/include/xsync_v2.hpp index f16d07b..1080187 100644 --- a/include/xsync_v2.hpp +++ b/include/xsync_v2.hpp @@ -16,7 +16,7 @@ #include "i_xsync_udp.hpp" #include "ixsync.hpp" #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) -#define PC_VERSION VERSION(3, 2, 0) +#define PC_VERSION VERSION(3, 3, 0) namespace xsync { using namespace std; diff --git a/src/xsync_v2.cpp b/src/xsync_v2.cpp index e676b51..6d56474 100644 --- a/src/xsync_v2.cpp +++ b/src/xsync_v2.cpp @@ -530,16 +530,23 @@ class Xsync : public IXsync { } else if (sig == SIGNAL_EXT_TIMECODE_FREQ) { return ExternalTimecode_readFreq(freq); } else if (sig == SIGNAL_INTERNAL_TIMECODE_FREQ) { - return InternalTimecode_getFormat((TimecodeFormat_t &)freq); + return InternalTimecode_readFreq(freq); } else if (sig == SIGNAL_INTERNAL_GENLOCK_FREQ) { + return InternalGenlock_readFreq(freq); } else if (sig == SIGNAL_INTERNAL_CLOCK_SIG) { + return InternalClock_readOutFreq(freq); } else if (sig == SIGNAL_SYS_CLK_OUTPUT) { + return SysClock_readOutSigFreq(freq); } else if (sig == SIGNAL_SYS_GENLOCK_OUTPUT) { + return SysGenlock_readFreq(freq); } else if (sig == SIGNAL_SYS_TIMECODE_FREQ_OUTPUT) { + return SysTimecode_readFreq(freq); } else if (sig == SIGNAL_BUSINESS_RECORD_SIG) { + return kxs_ec_param_error; } else if (sig == SIGNAL_BUSINESS_RECORD_EXPOSURE_SIG) { + return kxs_ec_param_error; } - return kxs_ec_success; + return kxs_ec_param_error; } virtual xs_error_code_t TTLInputModule1_detectFreq(float &freq) override { return readfreq(reg::k_ttlin1_freq_detector_reg, freq); } virtual xs_error_code_t TTLInputModule2_detectFreq(float &freq) override { return readfreq(reg::k_ttlin2_freq_detector_reg, freq); }