Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev

新增歪斜和歪斜容忍度
2024-02-23 15:28:03 +08:00 · 2024-02-23 15:27:51 +08:00
3 changed files with 28 additions and 8 deletions
--- a/hgdriver/hgdev/common_setting.h
+++ b/hgdriver/hgdev/common_setting.h
@ -717,8 +717,9 @@ namespace setting_hardware
 			unsigned int isCorrect : 1;			//设置0 为原图，1为校正后的图
 			unsigned int dc : 7;				//设置PWM占空比	
 			unsigned int screw_detect_enable : 1;
+			unsigned int screw_detect_level : 3;
 			unsigned int width_detect_enable : 1;
-			unsigned int reversed2 : 6;
+			unsigned int reversed2 : 3;
 		}params_7010;
 	}HGSCANCONF_7010;
 }
--- a/hgdriver/hgdev/hg_scanner_239.cpp
+++ b/hgdriver/hgdev/hg_scanner_239.cpp
@ -1018,7 +1018,6 @@ int hg_scanner_239::on_skew_check_level_changed(int& check)
 			check = dev_conf_.params_3399.screw_detect_level = old;
 			check += 1;
 		}
-	
 	}


--- a/hgdriver/hgdev/hg_scanner_306.cpp
+++ b/hgdriver/hgdev/hg_scanner_306.cpp
Author	SHA1	Message	Date
13038267101	1c4b6a2653	Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev	2024-02-23 15:28:03 +08:00
13038267101	32dbf56e22	新增歪斜和歪斜容忍度	2024-02-23 15:27:51 +08:00