diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1bd4438..9d4acdd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -605,8 +605,11 @@ void MainWindow::constructUI() {
* 外部触发页面初始化 *
*******************************************************************************/
+
ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
+ ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
+
ui->TriInX_Mode_Val_1->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_1->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_1->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
@@ -614,6 +617,8 @@ void MainWindow::constructUI() {
ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
+ ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
+
ui->TriInX_Mode_Val_2->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_2->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_2->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
@@ -621,6 +626,8 @@ void MainWindow::constructUI() {
ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
+ ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
+
ui->TriInX_Mode_Val_3->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_3->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_3->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
@@ -628,6 +635,8 @@ void MainWindow::constructUI() {
ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
+ ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
+
ui->TriInX_Mode_Val_4->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_4->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_4->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
diff --git a/mainwindow.ui b/mainwindow.ui
index dfc1b3d..4a94508 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -17,7 +17,7 @@
- 相机光源和时序控制器
+ 相机光源和时序控制器V15
/*
@@ -1226,7 +1226,7 @@ QGroupBox:title {
- 0
+ 4
true
@@ -5277,6 +5277,8 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;"> 2.提交配置后,自动启动内部触发</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;"> </span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;">FPGA-FIRMWARE-VERSION</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:14px; font-weight:600; color:#ff0000;"> V10:</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:14px; font-weight:600; color:#ff0000;"> 1.修复当寄存器变化频率的时候,SPI读取数据错误的BUG</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;"> V9:</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;"> 1.修复倍频器2+倍频信号错误的BUG</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;"> V7:</span></p>
diff --git a/src/camera_light_src_timing_controller/clst_controler.cpp b/src/camera_light_src_timing_controller/clst_controler.cpp
index 19993db..ef7833e 100644
--- a/src/camera_light_src_timing_controller/clst_controler.cpp
+++ b/src/camera_light_src_timing_controller/clst_controler.cpp
@@ -424,6 +424,10 @@ zaf_error_code_t CLSTControler::readSigPeriodUs(uint32_t reg, float &us) {
uint32_t freq_cnt = 0;
DO_CMD(reg_read(reg, freq_cnt, 30));
us = freq_cnt * 10 / 1000.0;
+ if (us > 1100000) {
+ us = 0;
+ }
+
return kaf_ec_success;
}
diff --git a/src/camera_light_src_timing_controller/clst_controler_sig_type.cpp b/src/camera_light_src_timing_controller/clst_controler_sig_type.cpp
index 7b2b738..c65fadf 100644
--- a/src/camera_light_src_timing_controller/clst_controler_sig_type.cpp
+++ b/src/camera_light_src_timing_controller/clst_controler_sig_type.cpp
@@ -6,6 +6,7 @@ using namespace clst;
map ExtTriggerSrcType::emap = {
{"光耦输入", OPTOCOUPLER_INPUT}, //
{"差分输入", DIFF_INPUT}, //
+ {"内部时钟", INTERNAL_CLK}, //
};
map TriggerEdge::emap = {
diff --git a/src/camera_light_src_timing_controller/clst_controler_sig_type.hpp b/src/camera_light_src_timing_controller/clst_controler_sig_type.hpp
index 333c2ed..490f30b 100644
--- a/src/camera_light_src_timing_controller/clst_controler_sig_type.hpp
+++ b/src/camera_light_src_timing_controller/clst_controler_sig_type.hpp
@@ -23,6 +23,7 @@ class ExtTriggerSrcType {
typedef enum {
OPTOCOUPLER_INPUT = 0, // 光耦输入
DIFF_INPUT = 1, // 差分输入
+ INTERNAL_CLK = 2, // 内部触发源
} EnumType_t;
private:
diff --git a/src/version.h b/src/version.h
index 248e814..3c0ec64 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
#pragma once
-#define VERSION 14
+#define VERSION 15
#define MAUFACTURER "iflytop"
\ No newline at end of file