diff --git a/libxsync b/libxsync index 211732f..14ad103 160000 --- a/libxsync +++ b/libxsync @@ -1 +1 @@ -Subproject commit 211732f79e8ab42abb806fd77cd47c3272902c6b +Subproject commit 14ad103276e925c0f9808fc66dc2089f8bc3ac70 diff --git a/mainwindow.cpp b/mainwindow.cpp index 00b371b..3d84cfb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -328,8 +328,8 @@ void MainWindow::construct_reg_table() { // push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_exposure_time", reg::record_sig_gen_exposure_time, 0, kreg_val_type_decimal); push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_exposure_offset_time", reg::record_sig_gen_exposure_offset_time, 0, kreg_val_type_decimal); push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_manual_ctrl", reg::record_sig_gen_manual_ctrl, 0, kreg_val_type_decimal); - push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_start_timecode_snapshot0", reg::record_sig_gen_start_timecode_snapshot0, 0, kreg_val_type_decimal); - push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_start_timecode_snapshot1", reg::record_sig_gen_start_timecode_snapshot1, 0, kreg_val_type_decimal); + push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_timecode_snapshot0", reg::record_sig_gen_timecode_snapshot0, 0, kreg_val_type_decimal); + push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_timecode_snapshot1", reg::record_sig_gen_timecode_snapshot1, 0, kreg_val_type_decimal); push_reg(ui->gridLayoutWidget, regoff++, "record_sig_gen_record_state", reg::record_sig_gen_record_state, 0, kreg_val_type_decimal); push_reg(ui->gridLayoutWidget, regoff++, "camera_sync_module", reg::camera_sync_module, 0, kreg_val_type_hex); @@ -838,6 +838,7 @@ void MainWindow::on_RecordSigGen_Read_clicked() { uint32_t exposureTime; uint32_t exposureOffsetTime; uint32_t state; + XsyncTimecode_t timecode_snapshot; DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_getContrlMode(mode)); DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_getAutoStartTimecode(autoStartTimecode)); @@ -848,6 +849,7 @@ void MainWindow::on_RecordSigGen_Read_clicked() { DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_getRecordExposureTime(exposureTime)); DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_getRecordExposureOffsetTime(exposureOffsetTime)); DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_getRecordState(state)); + DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_readTimecodeSnapshot(timecode_snapshot)); ui->RecordSigGenerator_ContrlMode->setCurrentText(QString::fromStdString(ControlMode2Str(mode))); ui->RecordSigGenerator_AutoStartTimecode->setText(QString(XsyncTimecodeToStr(autoStartTimecode).c_str())); @@ -859,6 +861,7 @@ void MainWindow::on_RecordSigGen_Read_clicked() { ui->RecordSigGenerator_RecordExposureTime->setText(QString::number(exposureTime)); ui->RecordSigGenerator_RecordExposureOffsetTime->setText(QString::number(exposureOffsetTime)); ui->RecordSigGenerator_RecordState->setText(QString::number(state)); + ui->RecordSigGenerator_TimecodeSnapshot->setText(QString(XsyncTimecodeToStr(timecode_snapshot).c_str())); } void MainWindow::on_RecordSigGen_Write_clicked() { ControlMode_t mode = Str2ControlMode(ui->RecordSigGenerator_ContrlMode->currentText().toStdString()); @@ -871,6 +874,8 @@ void MainWindow::on_RecordSigGen_Write_clicked() { uint32_t exposureTime = ui->RecordSigGenerator_RecordExposureTime->text().toUInt(); uint32_t exposureOffsetTime = ui->RecordSigGenerator_RecordExposureOffsetTime->text().toUInt(); + // RecordSigGenerator_readTimecodeSnapshot + DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_setContrlMode(mode)); DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_setAutoStartTimecode(autoStartTimecode)); DO_XSYNC_FUNC(Xsync::Ins().RecordSigGenerator_setAutoStopTimecode(autoStopTimecode)); diff --git a/mainwindow.ui b/mainwindow.ui index 24c4f72..b0b3b08 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2323,6 +2323,41 @@ 录制状态 + + + + 30 + 110 + 121 + 31 + + + + 启停事件时间戳快照 + + + + + + 160 + 110 + 141 + 31 + + + + + 75 + true + + + + + + + true + +