diff --git a/README.md b/README.md index 7f099ad..9a2cd19 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,18 @@ ``` - -TimecodeInputModule_XXXXX --> ExternalTimecode_XXXXX -GenlockInputModule_XXXXX --> ExternalGenlock_XXXXX -XXXXFreq(uint32_t freq) --> XXXXFreq(float freq) - -Xsync --> IXsync - -删除 connect,disconnect, 添加方法 changeXsyncIp - +V2 + 1. 时码输入模块修改方法前缀 + TimecodeInputModule_XXXXX --> ExternalTimecode_XXXXX + 2. Genlock输入模块修改方法前缀 + GenlockInputModule_XXXXX --> ExternalGenlock_XXXXX + 3. 所有读取频率的方法,方法参数由uint32_t 修改成float类型,频率精度为0.01HZ + XXXXFreq(uint32_t freq) --> XXXXFreq(float freq) + 4. 增加IXsync接口类,类的初始化流程修改成如下: + XsyncInit(XSyncUdpFactoryImpl::Ins(), "192.168.8.10"); + 5. 通过XsyncIns获取IXync句柄 + 6. 方法说明参考IXsync类中的注释 + 7. 删除 connect,disconnect, 添加方法changeXsyncIp + 8. 测试阶段所有设备的SN码均为X1001000000000 + 9. ``` \ No newline at end of file diff --git a/src/xsync_v2.cpp b/src/xsync_v2.cpp index 220b4f0..7fde8c4 100644 --- a/src/xsync_v2.cpp +++ b/src/xsync_v2.cpp @@ -326,11 +326,20 @@ void Xsync::registerOnCameraSyncMsgCallback(xsync_on_camera_sync_msg_t cb) { m_o void Xsync::registerOnRecordSigChangeMsgCallback(xsync_on_record_sig_change_msg_t cb) { m_on_record_sig_change_msg_cb = cb; } xs_error_code_t Xsync::readSn(string &sn) { - sn = ""; + sn = "X1001000000000"; return kxs_ec_success; } xs_error_code_t Xsync::readMac(string &mac) { - mac = ""; + // mac = ""; + uint32_t mac0; + uint32_t mac1; + + DO_XSYNC(reg_read(reg::kmac0, mac0)); + DO_XSYNC(reg_read(reg::kmac1, mac1)); + + char buf[128] = {0}; + sprintf(buf, "%02x-%02x-%02x-%02x-%02x-%02x", (mac0 >> 0) & 0xff, (mac0 >> 8) & 0xff, (mac0 >> 16) & 0xff, (mac0 >> 24) & 0xff, (mac1 >> 0) & 0xff, (mac1 >> 8) & 0xff); + mac = buf; return kxs_ec_success; }