V22

.gitignore

@@ -70,4 +70,7 @@ Thumbs.db
 # --------
 
 
-build
+build
+IFlytopLTC/IFlytopLTC.exe
+appenv/app.exe
+dist/app.exe

README.md

@@ -3,8 +3,36 @@
 V14:
     修正光源亮度每次提交都会递减的BUG
 
+V17:
+    旧版本硬件稳定版本
 V18:
     添加信号延迟配置功能
 V19,20:
     修复信号延迟配置功能的BUG
+
+V22:
+    基于V17,调整光源亮度计算公式 为duty = 59- 0.58773 * duty;
+
+
+```
+
+```
+编译说明
+    
+1. 使用QTCreater可以打开工程后直接编译
+2. 命令行编译指令如下
+    ./init.bat
+    ./build.bat
+    
+
+
+```
+
+
+```
+特殊版本说明:
+    V17: 旧版本硬件稳定版本
+    V21: 添加信号延迟配置功能,该功能仅作为一个临时的调试功能,在后续版本中被删除
+
+
 ```

build.bat

@@ -0,0 +1,6 @@
+cd build
+make -j8
+cd ..
+copy build\CameraLightingController.exe appenv\app.exe
+@REM #打包指令
+.\makesfx.exe -ic -mf -ft -we -di -un -oo .\appenv\ .\dist\app.exe .\logo.ico .\appenv\app.exe

init.bat

@@ -0,0 +1 @@
+"C:\Program Files\CMake\bin\cmake.exe"   -B "build"   "-GMinGW Makefiles"   "-DCMAKE_BUILD_TYPE:STRING=Release"   "-DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=C:/Qt/Qt5.12.12/Tools/QtCreator/share/qtcreator/package-manager/auto-setup.cmake"   "-DQT_QMAKE_EXECUTABLE:STRING=C:/Qt/Qt5.12.12/5.12.12/mingw73_64/bin/qmake.exe"   "-DCMAKE_PREFIX_PATH:STRING=C:/Qt/Qt5.12.12/5.12.12/mingw73_64"   "-DCMAKE_C_COMPILER:STRING=C:/Qt/Qt5.12.12/Tools/mingw730_64/bin/gcc.exe"   "-DCMAKE_CXX_COMPILER:STRING=C:/Qt/Qt5.12.12/Tools/mingw730_64/bin/g++.exe" 

mainwindow.cpp

@@ -166,7 +166,6 @@ zaf_error_code_t MainWindow::updatePage() {
 
 #define UPDATE(index)                                                              \
   src    = InternalSig(ui->LightSrcX_TriSrc_##index->currentText().toStdString()); \
-  delay  = ui->LightSrcX_TriggerModePluseDelay_##index->text().toUInt();           \
   width  = ui->LightSrcX_TriggerModePluseWidth_##index->text().toUInt();           \
   offset = ui->LightSrcX_TriggerModeFirstPluseOffset_##index->text().toUInt();     \
   duty   = ui->LightSrcX_LightIntensityDuty_##index->text().toFloat();             \
@@ -174,7 +173,6 @@ zaf_error_code_t MainWindow::updatePage() {
   DO(m_clstc->LightSrcX_setTriSrc(index, src));                                    \
   DO(m_clstc->LightSrcX_setTriggerModePluseWidth(index, width));                   \
   DO(m_clstc->LightSrcX_setTriggerModeFirstPluseOffset(index, offset));            \
-  DO(m_clstc->LightSrcX_setTriggerModePluseDelay(index, delay));                  \
   DO(m_clstc->LightSrcX_setLightIntensityDuty(index, duty));                       \
   DO(m_clstc->LightSrcX_setLightDriverFreq(index, freq));
 
@@ -402,7 +400,6 @@ zaf_error_code_t MainWindow::refreshPage() {
   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_TriggerModePluseDelay_##index->setText(QString::number(delay));         \
   ui->LightSrcX_LightIntensityDuty_##index->setText(QString::number(duty, 'f', 3));     \
   ui->LightSrcX_LightDriverFreq_##index->setText(QString::number(freq, 'f', 2));
 

src/camera_light_src_timing_controller/clst_controler.cpp

@@ -593,18 +593,21 @@ zaf_error_code_t CLSTControler::LightSrcX_setTriggerModePluseWidth(int32_t index
   return reg_write(kreg_light_ctrol_module1_trigger_mode_pluse_width + (index - 1) * 32, width * 10);  // 0.1us
 }
 
-zaf_error_code_t CLSTControler::LightSrcX_setTriggerModePluseDelay(int32_t index, uint32_t delay) {  //
-  if (index < 1 || index > 4) return kaf_ec_param_error;
-  return reg_write(kreg_light_ctrol_module1_trigger_mode_pluse_delay + (index - 1) * 32, delay);  // 0.1us
-}
-
 zaf_error_code_t CLSTControler::LightSrcX_setTriggerModeFirstPluseOffset(int32_t index, uint32_t offset) {  //
   if (index < 1 || index > 4) return kaf_ec_param_error;
   return reg_write(kreg_light_ctrol_module1_trigger_mode_first_pluse_offset + (index - 1) * 32, offset * 10);  // 0.1us
 }
 zaf_error_code_t CLSTControler::LightSrcX_setLightIntensityDuty(int32_t index, float duty) {  //
   if (index < 1 || index > 4) return kaf_ec_param_error;
-    duty=duty*0.4;
+
+  //
+  // !!!!  占空比预修正  !!!!
+  //
+  //  duty = duty * 0.4; //旧设备
+  //  duty = (0.767 - duty / 100.0 * 0.25 * 4.13 * 0.74) * 100 / 5 / 0.26; 新设备 ==> duty = 59- 0.58773 * duty
+
+  // 
+  duty = 59- 0.58773 * duty;
 
   uint32_t freqcnt = 0;
   DO_CMD(reg_read(kreg_light_ctrol_module1_light_driver_freq_cnt + (index - 1) * 32, freqcnt));
@@ -669,7 +672,7 @@ zaf_error_code_t CLSTControler::LightSrcX_getLightIntensityDuty(int32_t index, f
   DO_CMD(reg_read(kreg_light_ctrol_module1_light_intensity_cnt + (index - 1) * 32, cnt));
 
   duty = (cnt * 100.0 / freqcnt);
-  duty=duty/0.4;
+  duty = duty / 0.4;
 
   return kaf_ec_success;
 }

src/camera_light_src_timing_controller/clst_controler.hpp

@@ -143,7 +143,6 @@ class CLSTControler {
    *                                  光源控制                                   *
    *******************************************************************************/
   zaf_error_code_t LightSrcX_setTriSrc(int32_t index, InternalSig src);
-  zaf_error_code_t LightSrcX_setTriggerModePluseDelay(int32_t index, uint32_t delay);
   zaf_error_code_t LightSrcX_setTriggerModePluseWidth(int32_t index, uint32_t width);
   zaf_error_code_t LightSrcX_setTriggerModeFirstPluseOffset(int32_t index, uint32_t offset);
   zaf_error_code_t LightSrcX_setLightIntensityDuty(int32_t index, float duty);

src/version.h

@@ -1,4 +1,4 @@
 #pragma once
 
-#define VERSION 21
+#define VERSION 22
 #define MAUFACTURER "iflytop"