From 7716f55b0eee3f099871a2189bc3c7090adca4be Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 6 Mar 2024 16:44:44 +0800 Subject: [PATCH] update --- libxsync | 2 +- mainwindow.cpp | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libxsync b/libxsync index 6fd0928..dda08a8 160000 --- a/libxsync +++ b/libxsync @@ -1 +1 @@ -Subproject commit 6fd092888d16c5455df1ff426788ffc8f52acd8e +Subproject commit dda08a83fc26d8d1ed2696be97795f0e1e54ca04 diff --git a/mainwindow.cpp b/mainwindow.cpp index f5dd7b2..1c44873 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -617,23 +617,21 @@ void MainWindow::on_TTLOutputMoudle_ID_currentIndexChanged(int index) {} void MainWindow::on_TTLPage_Read_clicked() { { - uint32_t freq1 = 0; - uint32_t freq2 = 0; - uint32_t freq3 = 0; - uint32_t freq4 = 0; - bool En; + float freq1 = 0; + float freq2 = 0; + float freq3 = 0; + float freq4 = 0; + bool En; DO_XSYNC_FUNC(XsyncIns()->TTLInputModule1_detectFreq(freq1)); DO_XSYNC_FUNC(XsyncIns()->TTLInputModule2_detectFreq(freq2)); DO_XSYNC_FUNC(XsyncIns()->TTLInputModule3_detectFreq(freq3)); DO_XSYNC_FUNC(XsyncIns()->TTLInputModule4_detectFreq(freq4)); - ZLOGI(TAG, "freq1:%d freq2:%d freq3:%d freq4:%d", freq1, freq2, freq3, freq4); - - ui->TTLinModule_ttl_freq_1->setText(QString::number(freq1)); - ui->TTLinModule_ttl_freq_2->setText(QString::number(freq2)); - ui->TTLinModule_ttl_freq_3->setText(QString::number(freq3)); - ui->TTLinModule_ttl_freq_4->setText(QString::number(freq4)); + ui->TTLinModule_ttl_freq_1->setText(QString::number(freq1, 'f', 2)); + ui->TTLinModule_ttl_freq_2->setText(QString::number(freq2, 'f', 2)); + ui->TTLinModule_ttl_freq_3->setText(QString::number(freq3, 'f', 2)); + ui->TTLinModule_ttl_freq_4->setText(QString::number(freq4, 'f', 2)); } SignalType_t source;