Browse Source

v3.3

master
zhaohe 1 year ago
parent
commit
7b7c6a3b54
  1. 2
      include/xsync_v2.hpp
  2. 11
      src/xsync_v2.cpp

2
include/xsync_v2.hpp

@ -16,7 +16,7 @@
#include "i_xsync_udp.hpp" #include "i_xsync_udp.hpp"
#include "ixsync.hpp" #include "ixsync.hpp"
#define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) #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 { namespace xsync {
using namespace std; using namespace std;

11
src/xsync_v2.cpp

@ -530,16 +530,23 @@ class Xsync : public IXsync {
} else if (sig == SIGNAL_EXT_TIMECODE_FREQ) { } else if (sig == SIGNAL_EXT_TIMECODE_FREQ) {
return ExternalTimecode_readFreq(freq); return ExternalTimecode_readFreq(freq);
} else if (sig == SIGNAL_INTERNAL_TIMECODE_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) { } else if (sig == SIGNAL_INTERNAL_GENLOCK_FREQ) {
return InternalGenlock_readFreq(freq);
} else if (sig == SIGNAL_INTERNAL_CLOCK_SIG) { } else if (sig == SIGNAL_INTERNAL_CLOCK_SIG) {
return InternalClock_readOutFreq(freq);
} else if (sig == SIGNAL_SYS_CLK_OUTPUT) { } else if (sig == SIGNAL_SYS_CLK_OUTPUT) {
return SysClock_readOutSigFreq(freq);
} else if (sig == SIGNAL_SYS_GENLOCK_OUTPUT) { } else if (sig == SIGNAL_SYS_GENLOCK_OUTPUT) {
return SysGenlock_readFreq(freq);
} else if (sig == SIGNAL_SYS_TIMECODE_FREQ_OUTPUT) { } else if (sig == SIGNAL_SYS_TIMECODE_FREQ_OUTPUT) {
return SysTimecode_readFreq(freq);
} else if (sig == SIGNAL_BUSINESS_RECORD_SIG) { } else if (sig == SIGNAL_BUSINESS_RECORD_SIG) {
return kxs_ec_param_error;
} else if (sig == SIGNAL_BUSINESS_RECORD_EXPOSURE_SIG) { } 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 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); } virtual xs_error_code_t TTLInputModule2_detectFreq(float &freq) override { return readfreq(reg::k_ttlin2_freq_detector_reg, freq); }

Loading…
Cancel
Save