ztools
/
pluse_genertor_tools_v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

v9

master
zhaohe 1 year ago
parent
9030af6c4b
commit
78b64ce2e5
3 changed files with 30 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      mainwindow.cpp
  2. 15
      src/camera_light_src_timing_controller/reginfo.cpp
  3. 2
      src/version.h

42
mainwindow.cpp
View File

@ -332,17 +332,14 @@ zaf_error_code_t MainWindow::refreshPage() {
float Freq;
uint32_t PluseCnt;
uint32_t SeqCtrlPluseCntMax;
float TriOutSignalFreq;
DO(m_clstc->InterClk_getFreq(Freq));
DO(m_clstc->InterClk_getPluseCnt(PluseCnt));
DO(m_clstc->InterClk_getSeqCtrlPluseCntMax(SeqCtrlPluseCntMax));
DO(m_clstc->InterClk_readTriOutSignalFreq(TriOutSignalFreq));
ui->InterClk_Freq_Text->setText(QString::number(Freq, 'f', 2));
ui->InterClk_PluseCnt_Text->setText(QString::number(PluseCnt));
ui->InterClk_SeqCtrlPluseCntMax_Text->setText(QString::number(SeqCtrlPluseCntMax));
ui->InterClk_TriOutSignalFreq_Text->setText(QString::number(TriOutSignalFreq, 'f', 2));
}
/*******************************************************************************
* 刷新外部触发源页面 *
@ -355,8 +352,6 @@ zaf_error_code_t MainWindow::refreshPage() {
uint32_t bias;
uint32_t division;
uint32_t multiplication;
float infreq;
float outfreq;
uint32_t cnt;
// TriInX_setSequentialControlPluseCntMax
#define UPDATE(index) \
@ -367,15 +362,11 @@ zaf_error_code_t MainWindow::refreshPage() {
DO(m_clstc->TriInX_getTriggerModeTriggerEdge(index, edge)); \
DO(m_clstc->TriInX_getTriggerModeFreqDivision(index, division)); \
DO(m_clstc->TriInX_getTriggerModeFreqMultiplication(index, multiplication)); \
DO(m_clstc->TriInX_readInSignalFreq(index, infreq)); \
DO(m_clstc->TriInX_readOutSignalFreq(index, outfreq)); \
DO(m_clstc->TriInX_getSequentialControlPluseCntMax(index, cnt)); \
ui->TriInX_SrcSelect_Val_##index->setCurrentText(QString::fromStdString(src.toString())); \
ui->TriInX_FileterCoefficient_Val_##index->setText(QString::number(coefficient)); \
ui->TriInX_FreqDetectBias_Val_##index->setText(QString::number(bias)); \
ui->TriInX_Mode_Val_##index->setCurrentText(QString::fromStdString(mode.toString())); \
ui->TriInX_OutSignalFreq_Val_##index->setText(QString::number(outfreq, 'f', 2)); \
ui->TriInX_InSignalFreq_Val_##index->setText(QString::number(infreq, 'f', 2)); \
ui->TriInX_TriggerModeFreqDivision_Val_##index->setText(QString::number(division)); \
ui->TriInX_TriggerModeFreqMultiplication_Val_##index->setText(QString::number(multiplication)); \
ui->TriInX_TriggerModeTriggerEdge_Val_##index->setCurrentText(QString::fromStdString(edge.toString())); \
@ -396,9 +387,6 @@ zaf_error_code_t MainWindow::refreshPage() {
uint32_t offset;
float duty;
float freq;
uint32_t state;
float infreq;
float outfreq;
#define UPDATE(index) \
DO(m_clstc->LightSrcX_getTriSrc(index, src)); \
@ -406,17 +394,11 @@ zaf_error_code_t MainWindow::refreshPage() {
DO(m_clstc->LightSrcX_getTriggerModeFirstPluseOffset(index, offset)); \
DO(m_clstc->LightSrcX_getLightIntensityDuty(index, duty)); \
DO(m_clstc->LightSrcX_getLightDriverFreq(index, freq)); \
DO(m_clstc->LightSrcX_readLightSrcErrorState(index, state)); \
DO(m_clstc->LightSrcX_readInSigFreqDetect(index, infreq)); \
DO(m_clstc->LightSrcX_readOutSigFreqDetect(index, outfreq)); \
ui->LightSrcX_TriSrc_##index->setCurrentText(QString::fromStdString(src.toString())); \
ui->LightSrcX_TriggerModePluseWidth_##index->setText(QString::number(width)); \
ui->LightSrcX_TriggerModeFirstPluseOffset_##index->setText(QString::number(offset)); \
ui->LightSrcX_LightIntensityDuty_##index->setText(QString::number(duty, 'f', 2)); \
ui->LightSrcX_LightDriverFreq_##index->setText(QString::number(freq, 'f', 2)); \
ui->LightSrcX_LightSrcErrorState_##index->setText(QString::number(state)); \
ui->LightSrcX_InSigFreqDetect_##index->setText(QString::number(infreq, 'f', 2)); \
ui->LightSrcX_OutSigFreqDetect_##index->setText(QString::number(outfreq, 'f', 2));
ui->LightSrcX_LightDriverFreq_##index->setText(QString::number(freq, 'f', 2));
UPDATE(1);
UPDATE(2);
@ -552,7 +534,7 @@ void MainWindow::constructUI() {
dumpLog("提交成功");
displayInfo(true, "提交成功");
// QMessageBox::about(NULL, "消息", "提交成功");
QMessageBox::about(NULL, "消息", "提交成功");
});
/*******************************************************************************
@ -791,6 +773,16 @@ void MainWindow::enterProfessionalModel() {
ui->ShutterX_InSigSelect_3->show();
ui->ShutterX_InSigSelect_4->show();
ui->LightSrcX_LightSrcErrorState_Lable_1->show();
ui->LightSrcX_LightSrcErrorState_Lable_2->show();
ui->LightSrcX_LightSrcErrorState_Lable_3->show();
ui->LightSrcX_LightSrcErrorState_Lable_4->show();
ui->LightSrcX_LightSrcErrorState_1->show();
ui->LightSrcX_LightSrcErrorState_2->show();
ui->LightSrcX_LightSrcErrorState_3->show();
ui->LightSrcX_LightSrcErrorState_4->show();
ui->LOGBOX->show();
ui->RegOpeation->show();
}
@ -843,6 +835,16 @@ void MainWindow::exitProfessionalModel() {
ui->ShutterX_InSigSelect_3->hide();
ui->ShutterX_InSigSelect_4->hide();
ui->LightSrcX_LightSrcErrorState_Lable_1->hide();
ui->LightSrcX_LightSrcErrorState_Lable_2->hide();
ui->LightSrcX_LightSrcErrorState_Lable_3->hide();
ui->LightSrcX_LightSrcErrorState_Lable_4->hide();
ui->LightSrcX_LightSrcErrorState_1->hide();
ui->LightSrcX_LightSrcErrorState_2->hide();
ui->LightSrcX_LightSrcErrorState_3->hide();
ui->LightSrcX_LightSrcErrorState_4->hide();
ui->LOGBOX->hide();
ui->RegOpeation->hide();
}

15
src/camera_light_src_timing_controller/reginfo.cpp
View File

@ -377,7 +377,12 @@ static map<uint32_t, Reginfo> reginfo_map = {
static bool reginfo_initialized = false;
void RegInfoInitialize() {
reginfo_map[kreg_internal_clk_freq_cnt].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module1_light_src_error_state].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module2_light_src_error_state].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module3_light_src_error_state].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module4_light_src_error_state].flag |= kreg_flag_volatile;
reginfo_map[kreg_internal_clk_tri_out_signal_freq].flag |= kreg_flag_volatile;
reginfo_map[kreg_trigger_in1_in_signal_freq].flag |= kreg_flag_volatile;
reginfo_map[kreg_trigger_in2_in_signal_freq].flag |= kreg_flag_volatile;
@ -389,11 +394,6 @@ void RegInfoInitialize() {
reginfo_map[kreg_trigger_in3_out_signal_freq].flag |= kreg_flag_volatile;
reginfo_map[kreg_trigger_in4_out_signal_freq].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module1_light_driver_freq_cnt].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module2_light_driver_freq_cnt].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module3_light_driver_freq_cnt].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module4_light_driver_freq_cnt].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module1_in_sig_freq_detect].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module2_in_sig_freq_detect].flag |= kreg_flag_volatile;
reginfo_map[kreg_light_ctrol_module3_in_sig_freq_detect].flag |= kreg_flag_volatile;
@ -414,12 +414,11 @@ Reginfo* GetRegInfo(uint32_t add) {
}
return nullptr;
}
void RegInfo_Reset(){
void RegInfo_Reset() {
for (auto& it : reginfo_map) {
it.second.dirty = true;
}
}
} // namespace clst
} // namespace iflytop

2
src/version.h
View File

@ -1,4 +1,4 @@
#pragma once
#define VERSION 8
#define VERSION 9
#define MAUFACTURER "iflytop"
Write Preview
Loading…
Cancel
Save