diff --git a/libxsync b/libxsync
index f2cd0a7..66f7b45 160000
--- a/libxsync
+++ b/libxsync
@@ -1 +1 @@
-Subproject commit f2cd0a7edfa77b2d4927acaeff2f60613858102f
+Subproject commit 66f7b456ad321d5c0d02472444e2a5a18001abc6
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 12770c1..82f4b74 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -214,10 +214,6 @@ void MainWindow::construct_reg_table() { //
push_reg(ui->gridLayoutWidget, regoff++, "internal_timecode_data1", reg::internal_timecode_data1, 0, kreg_val_type_decimal);
push_reg(ui->gridLayoutWidget, regoff++, "external_timecode_module", reg::external_timecode_module, 0, kreg_val_type_hex);
- push_reg(ui->gridLayoutWidget, regoff++, "external_timecode_sig_selt", reg::external_timecode_sig_selt, 0, kreg_val_type_decimal);
- push_reg(ui->gridLayoutWidget, regoff++, "external_timecode_format", reg::external_timecode_format, 0, kreg_val_type_decimal);
- push_reg(ui->gridLayoutWidget, regoff++, "external_timecode_code0", reg::external_timecode_code0, 0, kreg_val_type_decimal);
- push_reg(ui->gridLayoutWidget, regoff++, "external_timecode_code1", reg::external_timecode_code1, 0, kreg_val_type_decimal);
push_reg(ui->gridLayoutWidget, regoff++, "sys_timecode_module", reg::sys_timecode_module, 0, kreg_val_type_hex);
push_reg(ui->gridLayoutWidget, regoff++, "sys_timecode_select", reg::sys_timecode_select, 0, kreg_val_type_decimal);
@@ -357,6 +353,7 @@ void MainWindow::UI_TimecodePageConstruct() {
ui->ExternalTimecode_Source->clear();
ui->ExternalTimecode_Source->addItem(QString::fromStdString(InputInterface2Str(INPUT_IF_TIMECODE_BNC)));
ui->ExternalTimecode_Source->addItem(QString::fromStdString(InputInterface2Str(INPUT_IF_TIMECODE_HEADPHONE)));
+ ui->ExternalTimecode_Source->addItem(QString::fromStdString(InputInterface2Str(INPUT_IF_OFF)));
ui->SysTimecode_Source->clear();
ui->SysTimecode_Source->addItem(QString::fromStdString("0"));
@@ -580,30 +577,43 @@ void MainWindow::mainWindowsRun() { //
void MainWindow::on_TimecodePage_Read_clicked() {
TimecodeFormat_t InternalTimecode_Format;
XsyncTimecode_t InternalTimecode_Code;
+ float InternalTimecode_Freq;
TimecodeFormat_t ExternalTimecode_Format;
InputInterface_t ExternalTimecode_Source;
XsyncTimecode_t ExternalTimecode_Code;
+ float ExternalTimecode_Freq;
uint32_t SysTimecode_Source;
TimecodeFormat_t SysTimecode_Format;
XsyncTimecode_t SysTimecode_Code;
+ float SysTimecode_Freq;
DO_XSYNC_FUNC(XsyncIns()->InternalTimecode_getFormat(InternalTimecode_Format));
DO_XSYNC_FUNC(XsyncIns()->InternalTimecode_getCode(InternalTimecode_Code));
- DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_getFormat(ExternalTimecode_Format));
- DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_getSource(ExternalTimecode_Source));
+ DO_XSYNC_FUNC(XsyncIns()->InternalTimecode_readFreq(InternalTimecode_Freq));
+
+ DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_readFormat(ExternalTimecode_Format));
+ DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_readSrc(ExternalTimecode_Source));
DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_readCode(ExternalTimecode_Code));
+ DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_readFreq(ExternalTimecode_Freq));
+
DO_XSYNC_FUNC(XsyncIns()->SysTimecode_getSource(SysTimecode_Source));
DO_XSYNC_FUNC(XsyncIns()->SysTimecode_readFormat(SysTimecode_Format));
DO_XSYNC_FUNC(XsyncIns()->SysTimecode_readCode(SysTimecode_Code));
+ DO_XSYNC_FUNC(XsyncIns()->SysTimecode_readFreq(SysTimecode_Freq));
ui->InternalTimecode_Format->setCurrentText(QString::fromStdString(TimecodeFormatToStr(InternalTimecode_Format)));
ui->InternalTimecode_Code->setText(QString(XsyncTimecodeToStr(InternalTimecode_Code).c_str()));
+ ui->InternalTimecode_Freq->setText(QString::number(InternalTimecode_Freq, 'f', 2));
+
ui->ExternalTimecode_Format->setCurrentText(QString::fromStdString(TimecodeFormatToStr(ExternalTimecode_Format)));
ui->ExternalTimecode_Source->setCurrentText(QString::fromStdString(InputInterface2Str(ExternalTimecode_Source)));
ui->ExternalTimecode_Code->setText(QString(XsyncTimecodeToStr(ExternalTimecode_Code).c_str()));
+ ui->ExternalTimecode_Freq->setText(QString::number(ExternalTimecode_Freq, 'f', 2));
+
ui->SysTimecode_Source->setCurrentText(QString::number(SysTimecode_Source));
ui->SysTimecode_Format->setText(QString::fromStdString(TimecodeFormatToStr(SysTimecode_Format)));
ui->SysTimecode_Code->setText(QString(XsyncTimecodeToStr(SysTimecode_Code).c_str()));
+ ui->SysTimecode_Freq->setText(QString::number(SysTimecode_Freq, 'f', 2));
}
void MainWindow::on_TimecodePage_Update_clicked() {
TimecodeFormat_t InternalTimecode_Format = Str2TimecodeFormat(ui->InternalTimecode_Format->currentText().toStdString());
@@ -614,8 +624,8 @@ void MainWindow::on_TimecodePage_Update_clicked() {
DO_XSYNC_FUNC(XsyncIns()->InternalTimecode_setFormat(InternalTimecode_Format));
DO_XSYNC_FUNC(XsyncIns()->InternalTimecode_setCode(InternalTimecode_Code));
- DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_setFormat(ExternalTimecode_Format));
- DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_setSource(ExternalTimecode_Source));
+ // DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_setFormat(ExternalTimecode_Format));
+ // DO_XSYNC_FUNC(XsyncIns()->ExternalTimecode_setSource(ExternalTimecode_Source));
DO_XSYNC_FUNC(XsyncIns()->SysTimecode_setSource(SysTimecode_Source));
}
diff --git a/mainwindow.ui b/mainwindow.ui
index 68b63aa..728f798 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -204,7 +204,7 @@
- 6
+ 1
@@ -1140,9 +1140,9 @@
30
- 40
+ 10
251
- 111
+ 181
@@ -1152,7 +1152,7 @@
20
- 20
+ 50
81
31
@@ -1165,7 +1165,7 @@
20
- 60
+ 90
81
31
@@ -1178,7 +1178,7 @@
100
- 20
+ 50
141
31
@@ -1188,7 +1188,7 @@
100
- 60
+ 90
141
31
@@ -1206,6 +1206,41 @@
false
+
+
+
+ 20
+ 130
+ 51
+ 31
+
+
+
+ 频率
+
+
+
+
+
+ 100
+ 130
+ 141
+ 31
+
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ true
+
+
@@ -1213,7 +1248,7 @@
120
260
301
- 151
+ 211
@@ -1312,14 +1347,49 @@
true
+
+
+
+ 30
+ 140
+ 51
+ 31
+
+
+
+ 频率
+
+
+
+
+
+ 130
+ 140
+ 141
+ 31
+
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ true
+
+
320
- 40
+ 10
251
- 151
+ 181
@@ -1406,6 +1476,41 @@
时码源
+
+
+
+ 20
+ 140
+ 51
+ 31
+
+
+
+ 频率
+
+
+
+
+
+ 100
+ 140
+ 141
+ 31
+
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ true
+
+
@@ -1424,9 +1529,9 @@
140
- 150
+ 190
20
- 91
+ 51
@@ -1472,8 +1577,8 @@
160
- 170
- 16
+ 200
+ 20
21