Browse Source

update

master
zhaohe 1 year ago
parent
commit
14ad103276
  1. 7
      include/xsync_regs.hpp
  2. 3
      xsync.cpp
  3. 2
      xsync.hpp

7
include/xsync_regs.hpp

@ -16,7 +16,6 @@ using namespace std;
#define REG_ADD_OFF_STM32 (0x0000)
#define REG_ADD_OFF_STM32_CONFIG_START_ADD (0x0010)
#define REGADDOFF__FPGA_INFO (0x0020)
#define REGADDOFF__TTLIN (0x0100)
#define REGADDOFF__EXTERNAL_TIMECODE (0x0120)
@ -262,9 +261,9 @@ typedef enum {
record_sig_gen_exposure_offset_time = REGADDOFF__RECORD_SIG_GENERATOR + 10,
record_sig_gen_manual_ctrl = REGADDOFF__RECORD_SIG_GENERATOR + 11,
record_sig_gen_start_timecode_snapshot0 = REGADDOFF__RECORD_SIG_GENERATOR + 13,
record_sig_gen_start_timecode_snapshot1 = REGADDOFF__RECORD_SIG_GENERATOR + 14,
record_sig_gen_record_state = REGADDOFF__RECORD_SIG_GENERATOR + 15,
record_sig_gen_timecode_snapshot0 = REGADDOFF__RECORD_SIG_GENERATOR + 13,
record_sig_gen_timecode_snapshot1 = REGADDOFF__RECORD_SIG_GENERATOR + 14,
record_sig_gen_record_state = REGADDOFF__RECORD_SIG_GENERATOR + 15,
/*******************************************************************************
* camera_sync_module *

3
xsync.cpp

@ -660,3 +660,6 @@ xs_error_code_t Xsync::RecordSigGenerator_getTimecodeCtrlFlag(uint32_t &autoStar
}
xs_error_code_t Xsync::RecordSigGenerator_getRecordState(uint32_t &state) { return _reg_read(reg::record_sig_gen_record_state, state); }
xs_error_code_t Xsync::RecordSigGenerator_readTimecodeSnapshot(XsyncTimecode_t &timecode) { //
return readtimecode(reg::record_sig_gen_timecode_snapshot0, reg::record_sig_gen_timecode_snapshot1, timecode);
}

2
xsync.hpp

@ -444,7 +444,7 @@ class Xsync {
* @return xs_error_code_t
*/
xs_error_code_t RecordSigGenerator_getRecordState(uint32_t &state);
xs_error_code_t RecordSigGenerator_readTimecodeSnapshot(XsyncTimecode_t &timecode);
private:
xs_error_code_t doaction(uint32_t action, uint32_t actionval, uint32_t *ackreturn, int32_t overtime_ms = 100);
xs_error_code_t storageConfig();

Loading…
Cancel
Save