lmh188
/
newtx
mirror of http://192.168.1.51:8099/scanner/newtx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加图像处理流程；增加开关CIS灯属性

This commit is contained in:
gb 2024-01-16 17:51:34 +08:00
parent aebd8490c7
commit b33fdb7fff
25 changed files with 1097 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

327
docs/sane-opts/hardware.txt
View File

@ -1,31 +1,47 @@
{
"mode": {
"cis-mode": {
"cat": "none",
"group": "CIS",
"title": "颜色模式",
"title": "CIS颜色模式",
"desc": "选择镜头色彩工作模式",
"type": "string",
"fix-id": 34819,
"ui-pos": 10,
"auth": 0,
"bind": true,
"size": 12,
"cur": "彩色",
"default": "彩色",
"default": {
"(mode.enabled&&(mode==256级灰度||mode==黑白)) || (multiout-type.enabled&&multiout-type==灰度+黑白)": "灰度",
"default": "彩色"
},
"range": ["彩色", "灰度"]
},
"resolution": {
"cis-dpi": {
"cat": "none",
"group": "CIS",
"title": "分辨率",
"title": "CIS分辨率",
"desc": "设置镜头工作的分辨率",
"type": "int",
"fix-id": 34840,
"ui-pos": 11,
"auth": 0,
"bind": true,
"size": 4,
"cur": 200,
"default": 200,
"range": [200, 300, 600]
"default": {
"resolution>400": 600,
"default": 300
},
"range": [300, 600]
},
"cis-led": {
"cat": "none",
"group": "CIS",
"title": "CIS灯",
"desc": "CIS工作时，是否打开背景灯",
"type": "bool",
"ui-pos": 12,
"auth": 0,
"size": 4,
"cur": true,
"default": true
},
"paper": {
"cat": "base",
@ -34,7 +50,7 @@
"desc": "设置出图大小",
"type": "string",
"fix-id": 34831,
"ui-pos": 10,
"ui-pos": 30,
"auth": 0,
"size": 44,
"cur": "匹配原始尺寸",
@ -54,7 +70,7 @@
"desc": "横向放置纸张",
"type": "bool",
"fix-id": 34924,
"ui-pos": 12,
"ui-pos": 31,
"auth": 0,
"affect": 6,
"visible": 0,
@ -70,7 +86,7 @@
"desc": "以毫米为单位的纸张宽",
"type": "float",
"fix-id": 34922,
"ui-pos": 13,
"ui-pos": 32,
"auth": 0,
"unit": "mm",
"readonly": true,
@ -88,7 +104,7 @@
"desc": "以毫米为单位的纸张高",
"type": "float",
"fix-id": 34923,
"ui-pos": 14,
"ui-pos": 33,
"auth": 0,
"unit": "mm",
"readonly": true,
@ -421,11 +437,9 @@
"size": 8,
"auto": false,
"default": {
"mode==彩色 && resolution==300": 1.000000,
"mode==灰度 && resolution==300": 1.000000,
"mode==灰度 && resolution==200": 1.000000,
"mode==彩色 && resolution==600": 1.000000,
"mode==灰度 && resolution==600": 1.000000,
"cis-mode==灰度 && cis-dpi==300": 1.000000,
"cis-mode==彩色 && cis-dpi==600": 1.000000,
"cis-mode==灰度 && cis-dpi==600": 1.000000,
"default": 1.000000
},
"range": {
@ -445,11 +459,9 @@
"size": 8,
"auto": false,
"default": {
"mode==彩色 && resolution==300": 1.000000,
"mode==灰度 && resolution==300": 1.000000,
"mode==灰度 && resolution==200": 1.000000,
"mode==彩色 && resolution==600": 1.000000,
"mode==灰度 && resolution==600": 1.000000,
"cis-mode==灰度 && cis-dpi==300": 1.000000,
"cis-mode==彩色 && cis-dpi==600": 1.000000,
"cis-mode==灰度 && cis-dpi==600": 1.000000,
"default": 1.000000
},
"range": {
@ -466,15 +478,14 @@
"type": "int",
"ui-pos": 42,
"auth": 0,
"bind": true,
"size": 4,
"auto": false,
"default": {
"mode==彩色 && resolution==300": 878,
"mode==灰度 && resolution==300": 2637,
"mode==灰度 && resolution==200": 2450,
"mode==彩色 && resolution==600": 1531,
"mode==灰度 && resolution==600": 4595,
"default": 816
"cis-mode==灰度 && cis-dpi==300": 2637,
"cis-mode==彩色 && cis-dpi==600": 1531,
"cis-mode==灰度 && cis-dpi==600": 4595,
"default": 878
}
},
"expo-fr": {
@ -488,12 +499,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 313,
"mode==灰度 && resolution==300": 336,
"mode==灰度 && resolution==200": 337,
"mode==彩色 && resolution==600": 622,
"mode==灰度 && resolution==600": 673,
"default": 312
"cis-mode==灰度 && cis-dpi==300": 336,
"cis-mode==彩色 && cis-dpi==600": 622,
"cis-mode==灰度 && cis-dpi==600": 673,
"default": 313
},
"range": {
"min": 1,
@ -512,12 +521,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 306,
"mode==灰度 && resolution==300": 336,
"mode==灰度 && resolution==200": 337,
"mode==彩色 && resolution==600": 611,
"mode==灰度 && resolution==600": 673,
"default": 305
"cis-mode==灰度 && cis-dpi==300": 336,
"cis-mode==彩色 && cis-dpi==600": 611,
"cis-mode==灰度 && cis-dpi==600": 673,
"default": 306
},
"range": {
"min": 1,
@ -536,12 +543,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 297,
"mode==灰度 && resolution==300": 336,
"mode==灰度 && resolution==200": 337,
"mode==彩色 && resolution==600": 590,
"mode==灰度 && resolution==600": 673,
"default": 295
"cis-mode==灰度 && cis-dpi==300": 336,
"cis-mode==彩色 && cis-dpi==600": 590,
"cis-mode==灰度 && cis-dpi==600": 673,
"default": 297
},
"range": {
"min": 1,
@ -560,11 +565,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 360,
"mode==灰度 && resolution==300": 410,
"mode==灰度 && resolution==200": 406,
"mode==彩色 && resolution==600": 713,
"mode==灰度 && resolution==600": 811,
"cis-mode==灰度 && cis-dpi==300": 410,
"cis-mode==彩色 && cis-dpi==600": 713,
"cis-mode==灰度 && cis-dpi==600": 811,
"default": 360
},
"range": {
@ -584,12 +587,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 380,
"mode==灰度 && resolution==300": 410,
"mode==灰度 && resolution==200": 406,
"mode==彩色 && resolution==600": 758,
"mode==灰度 && resolution==600": 811,
"default": 379
"cis-mode==灰度 && cis-dpi==300": 410,
"cis-mode==彩色 && cis-dpi==600": 758,
"cis-mode==灰度 && cis-dpi==600": 811,
"default": 380
},
"range": {
"min": 1,
@ -608,12 +609,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 361,
"mode==灰度 && resolution==300": 410,
"mode==灰度 && resolution==200": 406,
"mode==彩色 && resolution==600": 722,
"mode==灰度 && resolution==600": 811,
"default": 360
"cis-mode==灰度 && cis-dpi==300": 410,
"cis-mode==彩色 && cis-dpi==600": 722,
"cis-mode==灰度 && cis-dpi==600": 811,
"default": 361
},
"range": {
"min": 1,
@ -632,11 +631,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -656,11 +653,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -680,11 +675,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -704,11 +697,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -728,11 +719,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -752,11 +741,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -776,11 +763,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -800,11 +785,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -824,11 +807,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -848,11 +829,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -872,11 +851,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -896,11 +873,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 170,
"mode==灰度 && resolution==300": 170,
"mode==灰度 && resolution==200": 170,
"mode==彩色 && resolution==600": 170,
"mode==灰度 && resolution==600": 170,
"cis-mode==灰度 && cis-dpi==300": 170,
"cis-mode==彩色 && cis-dpi==600": 170,
"cis-mode==灰度 && cis-dpi==600": 170,
"default": 170
},
"range": {
@ -920,11 +895,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 113,
"mode==灰度 && resolution==300": 116,
"mode==灰度 && resolution==200": 116,
"mode==彩色 && resolution==600": 115,
"mode==灰度 && resolution==600": 116,
"cis-mode==灰度 && cis-dpi==300": 116,
"cis-mode==彩色 && cis-dpi==600": 115,
"cis-mode==灰度 && cis-dpi==600": 116,
"default": 113
},
"range": {
@ -944,11 +917,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 118,
"mode==灰度 && resolution==300": 121,
"mode==灰度 && resolution==200": 119,
"mode==彩色 && resolution==600": 119,
"mode==灰度 && resolution==600": 121,
"cis-mode==灰度 && cis-dpi==300": 121,
"cis-mode==彩色 && cis-dpi==600": 119,
"cis-mode==灰度 && cis-dpi==600": 121,
"default": 118
},
"range": {
@ -968,11 +939,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 118,
"mode==灰度 && resolution==300": 119,
"mode==灰度 && resolution==200": 121,
"mode==彩色 && resolution==600": 118,
"mode==灰度 && resolution==600": 121,
"cis-mode==灰度 && cis-dpi==300": 119,
"cis-mode==彩色 && cis-dpi==600": 118,
"cis-mode==灰度 && cis-dpi==600": 121,
"default": 118
},
"range": {
@ -992,12 +961,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 124,
"mode==灰度 && resolution==300": 128,
"mode==灰度 && resolution==200": 128,
"mode==彩色 && resolution==600": 126,
"mode==灰度 && resolution==600": 129,
"default": 125
"cis-mode==灰度 && cis-dpi==300": 128,
"cis-mode==彩色 && cis-dpi==600": 126,
"cis-mode==灰度 && cis-dpi==600": 129,
"default": 124
},
"range": {
"min": 1,
@ -1016,11 +983,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 126,
"mode==灰度 && resolution==300": 129,
"mode==灰度 && resolution==200": 129,
"mode==彩色 && resolution==600": 127,
"mode==灰度 && resolution==600": 130,
"cis-mode==灰度 && cis-dpi==300": 129,
"cis-mode==彩色 && cis-dpi==600": 127,
"cis-mode==灰度 && cis-dpi==600": 130,
"default": 126
},
"range": {
@ -1040,11 +1005,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 125,
"mode==灰度 && resolution==300": 127,
"mode==灰度 && resolution==200": 127,
"mode==彩色 && resolution==600": 125,
"mode==灰度 && resolution==600": 127,
"cis-mode==灰度 && cis-dpi==300": 127,
"cis-mode==彩色 && cis-dpi==600": 125,
"cis-mode==灰度 && cis-dpi==600": 127,
"default": 125
},
"range": {
@ -1064,11 +1027,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 109,
"mode==灰度 && resolution==300": 110,
"mode==灰度 && resolution==200": 112,
"mode==彩色 && resolution==600": 109,
"mode==灰度 && resolution==600": 112,
"cis-mode==灰度 && cis-dpi==300": 110,
"cis-mode==彩色 && cis-dpi==600": 109,
"cis-mode==灰度 && cis-dpi==600": 112,
"default": 109
},
"range": {
@ -1088,11 +1049,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 118,
"mode==灰度 && resolution==300": 120,
"mode==灰度 && resolution==200": 122,
"mode==彩色 && resolution==600": 120,
"mode==灰度 && resolution==600": 121,
"cis-mode==灰度 && cis-dpi==300": 120,
"cis-mode==彩色 && cis-dpi==600": 120,
"cis-mode==灰度 && cis-dpi==600": 121,
"default": 118
},
"range": {
@ -1112,11 +1071,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 114,
"mode==灰度 && resolution==300": 115,
"mode==灰度 && resolution==200": 117,
"mode==彩色 && resolution==600": 114,
"mode==灰度 && resolution==600": 116,
"cis-mode==灰度 && cis-dpi==300": 115,
"cis-mode==彩色 && cis-dpi==600": 114,
"cis-mode==灰度 && cis-dpi==600": 116,
"default": 114
},
"range": {
@ -1136,11 +1093,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 117,
"mode==灰度 && resolution==300": 117,
"mode==灰度 && resolution==200": 117,
"mode==彩色 && resolution==600": 117,
"mode==灰度 && resolution==600": 120,
"cis-mode==灰度 && cis-dpi==300": 117,
"cis-mode==彩色 && cis-dpi==600": 117,
"cis-mode==灰度 && cis-dpi==600": 120,
"default": 117
},
"range": {
@ -1160,11 +1115,9 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 116,
"mode==灰度 && resolution==300": 118,
"mode==灰度 && resolution==200": 118,
"mode==彩色 && resolution==600": 117,
"mode==灰度 && resolution==600": 119,
"cis-mode==灰度 && cis-dpi==300": 118,
"cis-mode==彩色 && cis-dpi==600": 117,
"cis-mode==灰度 && cis-dpi==600": 119,
"default": 116
},
"range": {
@ -1184,12 +1137,10 @@
"bind": true,
"size": 4,
"default": {
"mode==彩色 && resolution==300": 119,
"mode==灰度 && resolution==300": 121,
"mode==灰度 && resolution==200": 121,
"mode==彩色 && resolution==600": 120,
"mode==灰度 && resolution==600": 123,
"default": 118
"cis-mode==灰度 && cis-dpi==300": 121,
"cis-mode==彩色 && cis-dpi==600": 120,
"cis-mode==灰度 && cis-dpi==600": 123,
"default": 119
},
"range": {
"min": 1,

67
docs/sane-opts/imgprc_mgr.txt Normal file
View File

@ -0,0 +1,67 @@
{
"is-multiout": {
"cat": "base",
"group": "base",
"title": "多流输出",
"desc": "同时输出多种颜色模式的图像",
"type": "bool",
"fix-id": 34817,
"ui-pos": 10,
"auth": 0,
"size": 4,
"cur": false,
"default": false
},
"multiout-type": {
"cat": "base",
"group": "base",
"title": "多流输出类型",
"desc": "选择多流输出的类型",
"type": "string",
"fix-id": 34818,
"ui-pos": 11,
"auth": 0,
"enabled": false,
"size": 66,
"cur": "彩色+灰度+黑白",
"default": "彩色+灰度+黑白",
"range": ["彩色+灰度+黑白", "彩色+灰度", "彩色+黑白", "灰度+黑白"],
"depend": "is-multiout==true"
},
"mode": {
"cat": "base",
"group": "base",
"title": "颜色模式",
"desc": "选择色彩模式",
"type": "string",
"fix-id": 34819,
"ui-pos": 15,
"auth": 0,
"size": 24,
"cur": "24位彩色",
"default": "24位彩色",
"range": ["24位彩色", "256级灰度", "黑白", "颜色自动识别"],
"depend": "is-multiout!=true"
},
"resolution": {
"cat": "base",
"group": "base",
"title": "分辨率",
"desc": "设置扫描图像的分辨率",
"type": "int",
"fix-id": 34840,
"ui-pos": 20,
"auth": 0,
"size": 4,
"cur": 200,
"default": 200,
"range": {
"min": 100,
"max": {
"default": 600,
"paper==最大扫描尺寸自动裁切 || paper==最大扫描尺寸 || paper==三联试卷": 500
},
"step": 1
}
}
}

39
hardware/cis/FpgaComm.h
View File

@ -42,13 +42,6 @@ typedef struct STATUS_FPGA
unsigned int reserved : 31;
} StatusFpga;
typedef struct Ad_Gain
{
unsigned short int gain_low8 : 8;
unsigned short int gain_hight : 1;
unsigned int reserved : 23;
} AdGain;
typedef struct CIS_AD_Gain
{
@ -62,16 +55,6 @@ typedef struct CIS_AD_Gain
unsigned short int ad1_rw : 1; //!< 读写位 1:读， 0:写;
} CisAdGain;
typedef struct CIS_LED_RF
{
unsigned short int ledEnable : 1;
unsigned short int fanMode : 2;
unsigned short int jamEnable : 1;
unsigned short int sample : 9;
unsigned short int reserved : 3;
unsigned short int ledR;
} CisLedRF;
typedef struct CIS_LED_R
{
unsigned short int ledEnable : 1;
@ -86,6 +69,23 @@ typedef struct CIS_LED_GB
unsigned short int ledB;
} CisLedGB;
typedef struct Ad_Gain
{
unsigned short int gain_low8 : 8;
unsigned short int gain_hight : 1;
unsigned int reserved : 23;
} AdGain;
typedef struct CIS_LED_RF
{
unsigned short int ledEnable : 1;
unsigned short int fanMode : 2;
unsigned short int jamEnable : 1;
unsigned short int sample : 9;
unsigned short int reserved : 3;
unsigned short int ledR;
} CisLedRF;
typedef struct CIS_LED_UV
{
unsigned short int ledASide;
@ -126,11 +126,10 @@ enum
GRAY_MODE = 0,
COLOR_MODE,
};
// 0x01 200dpi 0x02 300dpi 0x03 600dpi
enum
{
DPI_200 = 1,
DPI_300,
DPI_300 = 2,
DPI_600,
};

102
hardware/hardware.cpp
View File

File diff suppressed because one or more lines are too long

4
hardware/hardware.h
View File

@ -18,7 +18,7 @@
//
// bool: true - image, dyn_mem_ptr is image data buffer; false - dyn_mem_ptr is an uint32_t code of hardware event
//
// LPPACKIMAGE: image information, ignored when bool is false
// LPPACKIMAGE: image information, or uint32_t event data when bool is false
#define IMAGE_HANDLER_PROTO void(dyn_mem_ptr, bool, LPPACKIMAGE)
#include "./cis/FpgaComm.h"
@ -52,9 +52,11 @@ class scanner_hw : public sane_opt_provider
};
std::string mode_;
std::string family_ = "G200";
PACKIMAGE img_base_;
volatile bool auto_scan_ = false;
int scan_count_ = -1;
int cis_length_ = 3888;
bool cis_led_ = true;
int dpi_ = 300;
int baud_ = 921600;
int delay_ = 1000;

223
imgproc/imgprc_mgr.cpp Normal file
View File

@ -0,0 +1,223 @@
#include "imgprc_mgr.h"
#include <json/gb_json.h>
#include <sane_opt_json/device_opt.h>
#include <huagao/hgscanner_error.h>
#include <base/packet.h>
static std::string device_opt_json[] = {
"{\"is-multiout\":{\"cat\":\"base\",\"group\":\"base\",\"title\":\"\\u591a\\u6d41\\u8f93\\u51fa\",\"desc\":\"\\u540c\\u65f6\\u8f93\\u51fa\\u591a\\u79cd\\u989c\\u8272\\u6a21\\u5f0f\\u7684\\u56fe\\u50cf\",\"type\":\"bool\",\"fix-id\":34817,\"ui-pos\":10,\"auth\":0,\"size\":4,\"cur\":false,\"default\":false},\"multiout-type\":{\"cat\":\"base\",\"group\":\"base\",\"title\":\"\\u591a\\u6d41\\u8f93\\u51fa\\u7c7b\\u578b\",\"desc\":\"\\u9009\\u62e9\\u591a\\u6d41\\u8f93\\u51fa\\u7684\\u7c7b\\u578b\",\"type\":\"string\",\"fix-id\":34818,\"ui-pos\":11,\"auth\":0,\"enabled\":false,\"size\":66,\"cur\":\"\\u5f69\\u8272+\\u7070\\u5ea6+\\u9ed1\\u767d\",\"default\":\"\\u5f69\\u8272+\\u7070\\u5ea6+\\u9ed1\\u767d\",\"range\":[\"\\u5f69\\u8272+\\u7070\\u5ea6+\\u9ed1\\u767d\",\"\\u5f69\\u8272+\\u7070\\u5ea6\",\"\\u5f69\\u8272+\\u9ed1\\u767d\",\"\\u7070\\u5ea6+\\u9ed1\\u767d\"],\"depend\":\"is-multiout==true\"},\"mode\":{\"cat\":\"base\",\"group\":\"base\",\"title\":\"\\u989c\\u8272\\u6a21\\u5f0f\",\"desc\":\"\\u9009\\u62e9\\u8272\\u5f69\\u6a21\\u5f0f\",\"type\":\"string\",\"fix-id\":34819,\"ui-pos\":15,\"auth\":0,\"size\":24,\"cur\":\"24\\u4f4d\\u5f69\\u8272\",\"default\":\"24\\u4f4d\\u5f69\\u8272\",\"range\":[\"24\\u4f4d\\u5f69\\u8272\",\"256\\u7ea7\\u7070\\u5ea6\",\"\\u9ed1\\u767d\",\"\\u989c\\u8272\\u81ea\\u52a8\\u8bc6\\u522b\"],\"depend\":\"is-multiout!=true\"},\"resolution\":{\"cat\":\"base\",\"group\":\"base\",\"title\":\"\\u5206\\u8fa8\\u7387\",\"desc\":\"\\u8bbe\\u7f6e\\u626b\\u63cf\\u56fe\\u50cf\\u7684\\u5206\\u8fa8\\u7387\",\"type\":\"int\",\"fix-id\":34840,\"ui-pos\":20,\"auth\":0,\"size\":4,\"cur\":200,\"default\":200,\"range\":{\"min\":100,\"max\":{\"default\":600,\"paper==\\u6700\\u5927\\u626b\\u63cf\\u5c3a\\u5bf8\\u81ea\\u52a8\\u88c1\\u5207 || paper==\\u6700\\u5927\\u626b\\u63cf\\u5c3a\\u5bf8 || paper==\\u4e09\\u8054\\u8bd5\\u5377\":500},\"step\":1}}}"
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// imgproc_mgr
imgproc_mgr::imgproc_mgr(std::function<void(data_source_ptr)> sender
, device_option* devopts
)
: img_sender_(sender), opts_(devopts), prc_que_("prcimg")
{
std::string text("");
gb_json *jsn = new gb_json();
for (auto& v : device_opt_json)
text += v;
if (jsn->attach_text(&text[0]))
{
text = jsn->to_string();
}
jsn->release();
set_opt_json_text(&text[0]);
if (opts_)
opts_->add_ref();
else
opts_ = new device_option();
auto thrd = [&](void) -> void
{
thread_worker();
};
workers_.start(thrd, "imgproc_mgr::thread_worker", (void*)&imgproc_mgr::thread_worker);
}
imgproc_mgr::~imgproc_mgr()
{
clear();
opts_->release();
}
bool imgproc_mgr::sort_processor_by_pos(image_processor* l, image_processor* r)
{
return l->get_position() < r->get_position();
}
bool imgproc_mgr::sort_image_packet(image_packet_ptr l, image_packet_ptr r)
{
return l->get_paper_index() < r->get_paper_index();
}
data_source_ptr imgproc_mgr::scan_finished_packet(uint32_t scanid, uint32_t err)
{
dyn_mem_ptr reply = dyn_mem::memory(sizeof(PACK_BASE));
BASE_PACKET_REPLY(*((LPPACK_BASE)reply->ptr()), PACK_CMD_SCAN_FINISHED_ROGER, scanid, err);
reply->set_len(sizeof(PACK_BASE));
return reply;
}
image_packet_ptr imgproc_mgr::image_sent_packet(LPPACKIMAGE head, dyn_mem_ptr img, uint32_t scanid, void* info, size_t info_l)
{
image_packet_ptr pimg = new image_packet(head, img, scanid, info, info_l);
return pimg;
}
uint32_t imgproc_mgr::add_busy_worker(int inc)
{
SIMPLE_LOCK(working_cnt_lock_);
working_cnt_ += inc;
return working_cnt_;
}
void imgproc_mgr::thread_worker(void)
{
RAWIMG img;
while(prc_que_.take(img, true))
{
add_busy_worker();
process(&img);
if(img.img)
img.data->release();
add_busy_worker(-1);
}
}
void imgproc_mgr::process(RAWIMG* img)
{
if(img->img)
{
std::vector<PROCIMGINFO> in, out;
PROCIMGINFO ele;
ele.ext_info = "";
ele.info = img->info;
ele.img = cv::Mat(ele.info.height, ele.info.width, CV_8UC1, (void*)img->data->ptr(), img->data->get_rest());
img->data->release();
in.push_back(ele);
if(dump_img_)
{
for(auto& v: processors_)
{
send_image(in, false);
v->process(in, out);
in = std::move(out);
}
}
else
{
for(auto& v: processors_)
{
v->process(in, out);
in = std::move(out);
}
}
send_image(in, true);
}
else
{
data_source_ptr ptr = imgproc_mgr::scan_finished_packet(scan_id_, img->info.reserve);
ptr->set_session_id(session_id_);
img_sender_(ptr);
ptr->release();
}
}
void imgproc_mgr::send_image(std::vector<PROCIMGINFO>& imgs, bool clear_after_send)
{
for(auto& v: imgs)
{
uint32_t size = v.img.total() * v.img.channels();
dyn_mem_ptr mem(dyn_mem::memory(size));
mem->put(v.img.data, size);
if(clear_after_send)
v.img.deallocate();
image_packet_ptr ptr = imgproc_mgr::image_sent_packet(&v.info, mem, scan_id_, &v.ext_info[0], v.ext_info.length());
ptr->set_session_id(session_id_);
img_sender_(ptr);
ptr->release();
mem->release();
}
}
int imgproc_mgr::set_value(const char* name, void* val)
{
int ret = SCANNER_ERR_OK;
// ret = SCANNER_ERR_DEVICE_NOT_SUPPORT;
return ret;
}
int imgproc_mgr::load_processor(const char* path)
{
int ret = SCANNER_ERR_OK;
#define ADD_IMG_PROCESSOR(cls) \
{ \
cls *obj = new cls(); \
opts_->add(obj); \
obj->release(); \
}
std::sort(processors_.begin(), processors_.end(), &imgproc_mgr::sort_processor_by_pos);
return ret;
}
int imgproc_mgr::clear(void)
{
for (auto& v : processors_)
v->release();
processors_.clear();
return 0;
}
int imgproc_mgr::process(LPPACKIMAGE info, dyn_mem_ptr data, bool img)
{
RAWIMG ri;
int ret = SCANNER_ERR_OK;
ri.data = data;
if(img)
ri.info = *info;
else
ri.info.reserve = (uint32_t)(long)info;
ri.img = img;
prc_que_.save(ri, true);
return ret;
}
void imgproc_mgr::stop(void)
{
run_ = false;
prc_que_.trigger();
workers_.stop(nullptr);
}
bool imgproc_mgr::is_busy(void)
{
SIMPLE_LOCK(working_cnt_lock_);
return working_cnt_;
}
void imgproc_mgr::start_new_turn(uint32_t scanid, uint32_t sessionid)
{
scan_id_ = scanid;
sent_ind_ = 0;
session_id_ = sessionid;
}

72
imgproc/imgprc_mgr.h Normal file
View File

@ -0,0 +1,72 @@
#pragma once
// image processor
//
// created on 2023-11-07
//
// ver: 1.0
//
// NOTE: the interface is for all algorithms are in ONE module
#include <imgprc/img_processor.h>
#include <base/utils.h> // for refer
#include <base/data.h>
#include <vector>
typedef std::shared_ptr<std::vector<char>> dcptr;
class device_option;
class imgproc_mgr : public sane_opt_provider
{
typedef struct _raw_img
{
PACKIMAGE info;
dyn_mem_ptr data;
bool img;
}RAWIMG;
volatile bool run_ = true;
bool dump_img_ = false;
uint32_t scan_id_ = 0;
uint32_t sent_ind_ = 0;
uint32_t session_id_ = 0;
MUTEX working_cnt_lock_;
uint32_t working_cnt_ = 0;
std::vector<image_processor*> processors_;
device_option* opts_;
safe_thread workers_;
safe_fifo<RAWIMG> prc_que_;
std::function<void(data_source_ptr)> img_sender_;
static bool sort_processor_by_pos(image_processor* l, image_processor* r);
static bool sort_image_packet(image_packet_ptr l, image_packet_ptr r);
static data_source_ptr scan_finished_packet(uint32_t scanid, uint32_t err = 0);
static image_packet_ptr image_sent_packet(LPPACKIMAGE head, dyn_mem_ptr img, uint32_t scanid, void* info = nullptr, size_t info_l = 0);
uint32_t add_busy_worker(int inc = 1);
void thread_worker(void);
void process(RAWIMG* img);
void send_image(std::vector<PROCIMGINFO>& imgs, bool clear_after_send);
public:
imgproc_mgr(std::function<void(data_source_ptr)> sender, device_option* devopts);
protected:
virtual ~imgproc_mgr();
public:
virtual int set_value(const char* name, void* val) override;
// process
public:
int load_processor(const char* path); // outer-modules path
int clear(void);
int process(LPPACKIMAGE info, dyn_mem_ptr data, bool img);
// life
public:
void stop(void);
bool is_busy(void);
void start_new_turn(uint32_t scanid, uint32_t sessionid);
};

12
imgproc/xmake.lua Normal file
View File

@ -0,0 +1,12 @@
add_rules("mode.debug", "mode.release")
target("imgproc")
set_kind("static")
add_syslinks("pthread", "dl", "opencv_imgcodecs", "opencv_core")
add_includedirs("../sdk")
add_files("*.cpp", "./algs/*.c*", "../sdk/base/*.c*", "../sdk/imgprc/*.c*", "../sdk/json/*.c*", "../sdk/sane/*.c*", "../sdk/sane_opt_json/*.c*")
--add_deps("gusb", "applog")
--add_rules("utils.bin2c",{linewidth = 32,extension = {".bin"}})
--add_files("table.bin")
add_packages("sdk")

89
scanner/async_scanner.cpp
View File

@ -16,6 +16,7 @@
#include <hardware.h>
#include <sane_opt_json/user.h>
#include <base/ui.h>
#include <imgprc_mgr.h>
@ -42,7 +43,7 @@ async_scanner::async_scanner() : usb_(nullptr), cfg_mgr_(nullptr), scan_id_(0)
if(used)
*used = data->get_rest();
return handle_bulk_cmd(pack, used, required);
return handle_bulk_cmd(pack, used, required, data->get_session_id());
};
auto on_connect = [this](bool connected) -> void
{
@ -61,6 +62,11 @@ async_scanner::async_scanner() : usb_(nullptr), cfg_mgr_(nullptr), scan_id_(0)
utils::log_info(msg, LOG_LEVEL_DEBUG);
};
auto sender = [this](data_source_ptr img) -> void
{
usb_->write_bulk(img);
};
cfg_mgr_ = new device_option(true, user, on_log);
utils::to_log(LOG_LEVEL_DEBUG, "OPT - initializing ...\n");
const_opts_ = new scanner_const_opts();
@ -70,6 +76,8 @@ async_scanner::async_scanner() : usb_(nullptr), cfg_mgr_(nullptr), scan_id_(0)
cis_->set_value(SANE_FULL_NAME(DEVICE_MODEL), &cfg_mgr_->get_option_value(SANE_FULL_NAME(DEVICE_MODEL), SANE_ACTION_GET_VALUE)[0]);
cfg_mgr_->add(cis_);
cfg_mgr_->add(user_);
img_prcr_ = new imgproc_mgr(sender, cfg_mgr_);
cfg_mgr_->add(img_prcr_);
utils::to_log(LOG_LEVEL_DEBUG, "OPT - initialized %u options.\n", cfg_mgr_->count());
usb_ = new async_usb_gadget(bulk_handle, on_connect);
@ -89,6 +97,12 @@ async_scanner::~async_scanner()
{
usb_->stop();
usb_->release();
usb_ = nullptr;
}
if(img_prcr_)
{
img_prcr_->release();
img_prcr_ = nullptr;
}
if(cfg_mgr_)
{
@ -106,7 +120,7 @@ async_scanner::~async_scanner()
devui::uninit_ui();
}
dyn_mem_ptr async_scanner::handle_bulk_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_bulk_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
dyn_mem_ptr reply = nullptr;
LPPACK_BASE pk = nullptr;
@ -129,31 +143,31 @@ dyn_mem_ptr async_scanner::handle_bulk_cmd(LPPACK_BASE pack, uint32_t* used, pac
switch(pack->cmd)
{
case PACK_CMD_SYNC:
reply = handle_simple_roger(pack, used, required);
reply = handle_simple_roger(pack, used, required, session);
break;
case PACK_CMD_SETTING_GET_CUR:
reply = handle_get_opt_value(pack, used, required);
reply = handle_get_opt_value(pack, used, required, session);
break;
case PACK_CMD_SETTING_GET:
reply = handle_get_opt_all(pack, used, required);
reply = handle_get_opt_all(pack, used, required, session);
break;
case PACK_CMD_SETTING_SET:
reply = handle_set_opt(pack, used, required);
reply = handle_set_opt(pack, used, required, session);
break;
case PACK_CMD_FILE_WRITE_REQ:
reply = handle_file_receive(pack, used, required);
reply = handle_file_receive(pack, used, required, session);
break;
case PACK_CMD_FILE_READ_REQ:
reply = handle_file_send(pack, used, required);
reply = handle_file_send(pack, used, required, session);
break;
case PACK_CMD_FILE_READ_REQ_ROGER:
reply = handle_file_send_roger(pack, used, required);
reply = handle_file_send_roger(pack, used, required, session);
break;
case PACK_CMD_SCAN_START:
reply = handle_scan_start(pack, used, required);
reply = handle_scan_start(pack, used, required, session);
break;
case PACK_CMD_SCAN_STOP:
reply = handle_scan_stop(pack, used, required);
reply = handle_scan_stop(pack, used, required, session);
break;
default:
if(used)
@ -198,7 +212,7 @@ bool async_scanner::on_energy_conservation(bool normal)
return enable;
}
dyn_mem_ptr async_scanner::handle_simple_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_simple_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = dyn_mem::memory(base_head_size);
@ -210,7 +224,7 @@ dyn_mem_ptr async_scanner::handle_simple_roger(LPPACK_BASE pack, uint32_t* used,
return reply;
}
dyn_mem_ptr async_scanner::handle_get_opt_value(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_get_opt_value(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = nullptr;
@ -242,7 +256,7 @@ dyn_mem_ptr async_scanner::handle_get_opt_value(LPPACK_BASE pack, uint32_t* used
return reply;
}
dyn_mem_ptr async_scanner::handle_get_opt_all(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_get_opt_all(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = nullptr;
@ -263,7 +277,7 @@ dyn_mem_ptr async_scanner::handle_get_opt_all(LPPACK_BASE pack, uint32_t* used,
return reply;
}
dyn_mem_ptr async_scanner::handle_set_opt(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_set_opt(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = nullptr;
@ -305,7 +319,7 @@ dyn_mem_ptr async_scanner::handle_set_opt(LPPACK_BASE pack, uint32_t* used, pack
return reply;
}
dyn_mem_ptr async_scanner::handle_file_receive(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_file_receive(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = nullptr;
@ -342,7 +356,7 @@ dyn_mem_ptr async_scanner::handle_file_receive(LPPACK_BASE pack, uint32_t* used,
return reply;
}
dyn_mem_ptr async_scanner::handle_file_send(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_file_send(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = dyn_mem::memory(base_head_size);
@ -387,7 +401,7 @@ dyn_mem_ptr async_scanner::handle_file_send(LPPACK_BASE pack, uint32_t* used, pa
return reply;
}
dyn_mem_ptr async_scanner::handle_file_send_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_file_send_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = nullptr;
@ -434,7 +448,7 @@ dyn_mem_ptr async_scanner::handle_file_send_roger(LPPACK_BASE pack, uint32_t* us
return reply;
}
dyn_mem_ptr async_scanner::handle_scan_start(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_scan_start(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
if(!used)
{
@ -452,24 +466,26 @@ dyn_mem_ptr async_scanner::handle_scan_start(LPPACK_BASE pack, uint32_t* used, p
auto receiver = [this](dyn_mem_ptr data, bool img, LPPACKIMAGE lpinfo) -> void
{
if(img)
{
FILE* dst = fopen(("/tmp/scan_" + std::to_string(lpinfo->pos.paper_ind) + ".bmp").c_str(), "wb");
if(dst)
{
std::string bih(utils::bitmap_info_header(lpinfo->width, lpinfo->height, lpinfo->bpp, lpinfo->resolution_x, lpinfo->resolution_y)),
bfh(utils::bitmap_file_header((BITMAPINFOHEADER*)&bih[0]));
fwrite(bfh.c_str(), 1, bfh.length(), dst);
fwrite(bih.c_str(), 1, bih.length(), dst);
fwrite(data->ptr(), 1, ((BITMAPINFOHEADER*)&bih[0])->biSizeImage, dst);
fclose(dst);
}
data->release();
}
img_prcr_->process(lpinfo, data, img);
// if(img)
// {
// FILE* dst = fopen(("/tmp/scan_" + std::to_string(lpinfo->pos.paper_ind) + ".bmp").c_str(), "wb");
// if(dst)
// {
// std::string bih(utils::bitmap_info_header(lpinfo->width, lpinfo->height, lpinfo->bpp, lpinfo->resolution_x, lpinfo->resolution_y)),
// bfh(utils::bitmap_file_header((BITMAPINFOHEADER*)&bih[0]));
// fwrite(bfh.c_str(), 1, bfh.length(), dst);
// fwrite(bih.c_str(), 1, bih.length(), dst);
// fwrite(data->ptr(), 1, ((BITMAPINFOHEADER*)&bih[0])->biSizeImage, dst);
// fclose(dst);
// }
// data->release();
// }
};
*used = base_head_size;
reply->set_len(base_head_size);
img_prcr_->start_new_turn(scan_id_, session);
scan_err_ = cis_->open(receiver);
if(scan_err_ == 0)
scan_err_ = cis_->start_scan();
@ -482,7 +498,7 @@ dyn_mem_ptr async_scanner::handle_scan_start(LPPACK_BASE pack, uint32_t* used, p
return reply;
}
dyn_mem_ptr async_scanner::handle_scan_stop(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_scan_stop(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = dyn_mem::memory(base_head_size);
@ -496,7 +512,7 @@ dyn_mem_ptr async_scanner::handle_scan_stop(LPPACK_BASE pack, uint32_t* used, pa
return reply;
}
dyn_mem_ptr async_scanner::handle_process_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required)
dyn_mem_ptr async_scanner::handle_process_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session)
{
uint32_t base_head_size = sizeof(PACK_BASE);
dyn_mem_ptr reply = dyn_mem::memory(base_head_size);
@ -512,6 +528,9 @@ dyn_mem_ptr async_scanner::handle_process_cmd(LPPACK_BASE pack, uint32_t* used,
uint32_t async_scanner::stop(void)
{
if(img_prcr_)
img_prcr_->stop();
if(usb_)
{
usb_->stop();

24
scanner/async_scanner.h
View File

@ -18,6 +18,7 @@ class gb_json;
class scanner_const_opts;
class scanner_hw;
class user_priv;
class imgproc_mgr;
class async_scanner : public refer
{
@ -26,6 +27,7 @@ class async_scanner : public refer
scanner_const_opts *const_opts_ = nullptr;
scanner_hw *cis_ = nullptr;
user_priv *user_ = nullptr;
imgproc_mgr *img_prcr_ = nullptr;
MUTEX locker_;
volatile bool connected_ = false;
@ -38,20 +40,20 @@ class async_scanner : public refer
MUTEX fsender_;
std::vector<file_reader*> send_files_;
dyn_mem_ptr handle_bulk_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_bulk_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
void init(void);
bool on_energy_conservation(bool normal/*true - working status; false - go to sleep*/); // return true to enable get into 'normal' status
dyn_mem_ptr handle_simple_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_get_opt_value(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_get_opt_all(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_set_opt(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_file_receive(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_file_send(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_file_send_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_scan_start(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_scan_stop(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_process_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required);
dyn_mem_ptr handle_simple_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_get_opt_value(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_get_opt_all(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_set_opt(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_file_receive(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_file_send(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_file_send_roger(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_scan_start(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_scan_stop(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
dyn_mem_ptr handle_process_cmd(LPPACK_BASE pack, uint32_t* used, packet_data_base_ptr* required, uint32_t session);
public:
async_scanner();

16
scanner/scanner_const_opts.cpp
View File

@ -35,7 +35,7 @@ scanner_const_opts::scanner_const_opts(const char* dev_path) : root_(dev_path)
scanner_const_opts::~scanner_const_opts()
{}
std::string scanner_const_opts::get_device_content(const char* path)
std::string scanner_const_opts::get_device_content(const char* path, bool truncate_from_lrn)
{
FILE *src = fopen((root_ + "/" + path).c_str(), "rb");
char buf[1024] = {0};
@ -47,6 +47,16 @@ std::string scanner_const_opts::get_device_content(const char* path)
while((r = fread(buf, 1, sizeof(buf), src)) > 0)
ret += std::string(buf, r);
fclose(src);
if(truncate_from_lrn)
{
size_t pos = ret.find("\n");
if(pos != std::string::npos)
ret.erase(pos);
pos = ret.find("\r");
if(pos != std::string::npos)
ret.erase(pos);
}
}
return std::move(ret);
@ -121,7 +131,7 @@ void scanner_const_opts::init(void)
jsn->get_value(SANE_STD_OPT_NAME_DEVICE_SERIAL_NO, child);
if(child)
{
std::string val(get_device_content("strings/0x409/serialnumber"));
std::string val(get_device_content("strings/0x409/serialnumber", true));
child->set_value("cur", val.c_str());
child->set_value("default", val.c_str());
child->release();
@ -190,7 +200,7 @@ char* scanner_const_opts::get_value(const char* name, void* value, size_t* size,
}
else if(strcmp(name, SANE_STD_OPT_NAME_DEVICE_SERIAL_NO) == 0)
{
val = get_device_content("strings/0x409/serialnumber");
val = get_device_content("strings/0x409/serialnumber", true);
}
else if(strcmp(name, SANE_STD_OPT_NAME_FIRMWARE_VERSION) == 0)
{

2
scanner/scanner_const_opts.h
View File

@ -10,7 +10,7 @@ class scanner_const_opts : public sane_opt_provider
{
std::string root_;
std::string get_device_content(const char* path);
std::string get_device_content(const char* path, bool truncate_from_lrn = false);
std::string get_ip(void);
std::string get_mac(void);

4
scanner/xmake.lua
View File

@ -3,11 +3,11 @@ add_rules("mode.debug", "mode.release")
target("hgscanner")
set_kind("binary")
add_syslinks("pthread", "dl")
add_includedirs("../sdk", "../usb", "../sdk/imgprc/3rdsdk/include", "../hardware")
add_includedirs("../sdk", "../usb", "../sdk/imgprc/3rdsdk/include", "../hardware", "../imgproc")
add_files("*.cpp", "../sdk/base/*.c*", "../sdk/imgprc/*.c*", "../sdk/json/*.c*", "../sdk/sane_opt_json/*.c*")
--add_deps("gusb", "applog")
--add_rules("utils.bin2c",{linewidth = 32,extension = {".bin"}})
--add_files("table.bin")
add_packages("sdk")
add_deps("usb")
add_deps("hardware")
add_deps("hardware", "imgproc")

121
sdk/base/data.cpp
View File

@ -829,7 +829,126 @@ uint8_t* file_map::buffer(void)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// image_packet
image_packet::image_packet(LPPACKIMAGE head, dyn_mem_ptr img, uint32_t scanid, const void* info, size_t info_size)
: img_(img), offset_(0), info_over_(false)
{
LPPACK_BASE pack = nullptr;
LPPACKIMAGE pimg = nullptr;
paper_ind_ = head->pos.paper_ind;
img->add_ref();
if(info && info_size)
info_ = std::string((const char*)info, info_size);
else
info_ = "";
head_ = dyn_mem::memory(sizeof(PACK_BASE) + sizeof(PACKIMAGE));
pack = (LPPACK_BASE)head_->ptr();
pimg = (LPPACKIMAGE)pack->payload;
BASE_PACKET_REPLY(*pack, PACK_CMD_SCAN_IMG_ROGER, scanid, 0);
pack->payload_len = sizeof(PACKIMAGE);
memcpy(pimg, head, sizeof(*pimg));
pimg->data_size = img->get_rest();
pimg->info_size = info_size;
head_->set_len(sizeof(PACK_BASE) + sizeof(PACKIMAGE));
info_over_ = info_.empty();
char buf[128] = {0};
sprintf(buf, "Image-%04u", head->pos.paper_ind);
pos_str_ = buf;
if(head->pos.paper_side == PAPER_SIDE_FRONT)
pos_str_ += "F_";
else if(head->pos.paper_side == PAPER_SIDE_BACK)
pos_str_ += "B_";
else
pos_str_ += "C_";
pos_str_ += std::to_string(head->pos.split_ind);
}
image_packet::~image_packet()
{
head_->release();
img_->release();
}
bool image_packet::is_memory_block(void)
{
return false;
}
uint32_t image_packet::get_rest(void)
{
return head_->get_rest() + info_.length() + img_->get_rest() - offset_;
}
// following API valid when is_memory_block() return true
uint8_t* image_packet::ptr(void)
{
return nullptr;
}
// following API valid when is_memory_block() return false. return error code
int image_packet::fetch_data(void* buf, uint32_t* size)
{
if(head_->get_rest())
{
if(*size < head_->get_rest())
{
memcpy(buf, head_->ptr(), *size);
}
else
{
memcpy(buf, head_->ptr(), head_->get_rest());
*size = head_->get_rest();
}
head_->used(*size);
}
else if(!info_over_)
{
if(*size < info_.length() - offset_)
{
memcpy(buf, info_.c_str() + offset_, *size);
offset_ += *size;
}
else
{
memcpy(buf, info_.c_str() + offset_, info_.length() - offset_);
*size = info_.length() - offset_;
info_over_ = true;
info_ = "";
offset_ = 0;
}
}
else
{
if(*size + offset_ >= img_->get_rest())
{
memcpy(buf, img_->ptr() + offset_, img_->get_rest() - offset_);
*size = img_->get_rest() - offset_;
offset_ = img_->get_rest();
}
else
{
memcpy(buf, img_->ptr() + offset_, *size);
offset_ += *size;
}
}
return 0;
}
uint32_t image_packet::get_paper_index(void)
{
return paper_ind_;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// dyn_mem_pool
dyn_mem_pool::dyn_mem_pool(uint32_t cnt, uint32_t unit) : count_(cnt), unit_(unit)
{
pool_ = (dyn_mem_ptr*)malloc(cnt * sizeof(dyn_mem_ptr));

30
sdk/base/data.h
View File

@ -286,6 +286,35 @@ public:
virtual int fetch_data(void* buf, uint32_t* size) override;
};
class image_packet : public data_source
{
dyn_mem* img_;
dyn_mem* head_;
uint32_t offset_;
uint32_t paper_ind_ = 0;
std::string info_;
bool info_over_;
std::string pos_str_;
public:
image_packet(LPPACKIMAGE head, dyn_mem* img, uint32_t scanid, const void* info = nullptr, size_t info_size = 0);
protected:
virtual ~image_packet();
public:
virtual bool is_memory_block(void) override;
virtual uint32_t get_rest(void) override;
// following API valid when is_memory_block() return true
virtual uint8_t* ptr(void) override;
// following API valid when is_memory_block() return false. return error code
virtual int fetch_data(void* buf, uint32_t* size) override;
public:
uint32_t get_paper_index(void);
};
CLS_PTR(packet_data_base);
CLS_PTR(data_holder);
@ -294,6 +323,7 @@ CLS_PTR(data_source);
CLS_PTR(dyn_mem);
CLS_PTR(dyn_mem_shared);
CLS_PTR(file_reader);
CLS_PTR(image_packet);
class dyn_mem_pool : public refer

3
sdk/base/packet.h
View File

@ -303,7 +303,8 @@ typedef struct _pack_img
uint32_t compression : 6; // image data compression, see 'img_compression'. (image-collector set)
uint32_t reserve : 2; // unused now
uint32_t info_size; // image information size in bytes, information part is used for quality of JPEG, pallete of BMP .... (image-collector set)
uint64_t data_size; // image data size in 'data' with bytes. (image-collector set)
uint64_t prc_stage : 16; // position of image processor, 0 is raw from CIS directly
uint64_t data_size : 48; // image data size in 'data' with bytes. (image-collector set)
// char data[0]; // two parts: image info (info_size) + image data (data_size)
STRUCT_CONSTRUCTOR(_pack_img)

5
sdk/base/utils.cpp
View File

@ -2125,13 +2125,16 @@ int safe_thread::stop(const char* thread_name)
SIMPLE_LOCK(lock_);
for(int i = 0; i < threads_.size(); ++i)
{
if(threads_[i].name == thread_name)
if(!thread_name || threads_[i].name == thread_name)
{
if(threads_[i].thread.get() && threads_[i].thread->joinable())
threads_[i].thread->join();
threads_.erase(threads_.begin() + i);
ret = 0;
if(thread_name)
break;
else
i--;
}
}

48
sdk/imgprc/img_processor.cpp Normal file
View File

@ -0,0 +1,48 @@
#include "img_processor.h"
#include <json/gb_json.h>
#include <huagao/hgscanner_error.h>
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// image_processor
image_processor::image_processor(const char* alg_name) : enabled_(true), ver_(0), pos_(0)
{
set_where(alg_name);
}
image_processor::~image_processor()
{}
bool image_processor::set_opt_json_text(char* txt)
{
gb_json* jsn = new gb_json();
bool ret = jsn->attach_text(txt);
if (ret)
{
gb_json* first = jsn->first_child();
if (first)
{
first->get_value("ver", ver_);
first->get_value("position", pos_);
if (!first->get_value("enabled", enabled_))
enabled_ = true;
first->release();
}
}
jsn->release();
if (ret)
sane_opt_provider::set_opt_json_text(txt);
return ret;
}
int image_processor::process(LPPROCIIM* in, size_t cnt, bool(*result)(LPPROCIIM, void*), void* param)
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}

58
sdk/imgprc/img_processor.h Normal file
View File

@ -0,0 +1,58 @@
#pragma once
// image processor
//
// created on 2023-11-07
//
// ver: 1.0
//
// NOTE: the interface is for all algorithms are in ONE module
#include <base/packet.h>
#include <sane_opt_json/base_opt.h>
#include <opencv2/opencv.hpp>
#pragma pack(push)
#pragma pack(1)
typedef struct _proc_img_info_
{
PACKIMAGE info;
cv::Mat img;
std::string ext_info; // 图片扩展信息（图像处理过程中可以保存各算法间的共有信息；处理完后为向用户提供的扩展信息）
}PROCIMGINFO, *LPPROCIMGINFO;
typedef struct _proc_img_info_modules // 跨模块参数
{
PACKIMAGE info;
uint32_t bytes_per_line;
uint8_t* data; // size = bytes_per_line * height
}PROCIIM, *LPPROCIIM;
#pragma pack(pop)
class image_processor : public sane_opt_provider
{
protected:
bool enabled_;
int ver_;
int pos_;
public:
image_processor(const char* alg_name);
protected:
virtual ~image_processor();
bool set_opt_json_text(char* txt);
public:
bool is_enable(void) { return enabled_; }
int get_version(void) { return ver_; }
int get_position(void) { return pos_; }
virtual int process(std::vector<PROCIMGINFO>& in, std::vector<PROCIMGINFO>& out) = 0;
// 跨模块图像处理接口。回调函数返回false，则停止处理；void*参数同 'param'。
virtual int process(LPPROCIIM* in, size_t cnt, bool(*result)(LPPROCIIM, void*), void* param);
};

2
sdk/sane/sane_ex.h
View File

@ -244,6 +244,8 @@ enum opt_visible_level // "visible" field
//
// PART III: inner option on device
#define SANE_STD_OPT_NAME_CIS_MODE "cis-mode"
#define SANE_STD_OPT_NAME_CIS_DPI "cis-dpi"
#define SANE_STD_OPT_NAME_CIS_BAUD "baud"
#define SANE_STD_OPT_NAME_CIS_DELAY "act-after"
#define SANE_STD_OPT_NAME_CIS_FRAME_H "frame-h"

35
sdk/sane_opt_json/base_opt.cpp
View File

@ -31,9 +31,10 @@ std::string sane_opt_provider::sane_value_2_text(const char* type, void* value)
else
return "";
}
void sane_opt_provider::set_opt_value(gb_json* opt, void* value, const char* key)
bool sane_opt_provider::set_opt_value(gb_json* opt, void* value, const char* key)
{
std::string type("");
bool ret = true;
opt->get_value("type", type);
if (!key || *key == 0)
@ -55,6 +56,38 @@ void sane_opt_provider::set_opt_value(gb_json* opt, void* value, const char* key
{
opt->set_value(key, (char*)value);
}
else
{
ret = false;
}
return ret;
}
bool sane_opt_provider::is_opt_value_equal(gb_json* opt, void* v1, void* v2)
{
std::string type("");
bool ret = true;
opt->get_value("type", type);
if (type == JSON_SANE_TYPE_BOOL)
{
ret = *(bool*)v1 == *(bool*)v2;
}
else if (type == JSON_SANE_TYPE_INT)
{
ret = *(int*)v1 == *(int*)v2;
}
else if (type == JSON_SANE_TYPE_FIXED)
{
ret = *(double*)v1 == *(double*)v2;
}
else if (type == JSON_SANE_TYPE_STRING)
{
ret = strcmp((char*)v1, (char*)v2) == 0;
}
return ret;
}
bool sane_opt_provider::set_opt_json_text(char* txt)

7
sdk/sane_opt_json/base_opt.h
View File

@ -13,7 +13,7 @@ class gb_json;
class sane_opt_provider : public refer
{
bool is_in_another_module_;
bool is_in_another_module_ = false;
std::string opt_jsn_txt_;
std::string where_;
@ -25,7 +25,8 @@ public:
sane_opt_provider();
static std::string sane_value_2_text(const char* type, void* value); // convert to readable text. e.g. bool to "true" or "false", ...
static void set_opt_value(gb_json* opt, void* value, const char* key = "cur");
static bool set_opt_value(gb_json* opt, void* value, const char* key = "cur");
static bool is_opt_value_equal(gb_json* opt, void* v1, void* v2);
protected:
virtual ~sane_opt_provider();
@ -43,7 +44,7 @@ public:
public:
// return malloc(), real data size stored in parameter 'size'. invoker should free() the returned value
virtual char* get_value(const char* name, void* value, size_t* size, int* err = nullptr);
virtual int set_value(const char* name, void* val);
virtual int set_value(const char* name/*nullptr for all options*/, void* val/*nullptr for restore*/);
virtual void enable(const char* name, bool able);
};

139
sdk/sane_opt_json/device_opt.cpp
View File

@ -1390,49 +1390,18 @@ gb_json* device_option::copy_opt(gb_json* from, bool* changed_cur)
apply_cur = false;
if (!from->get_value("readonly", rdo))
rdo = false;
to->get_value("type", type);
if (changed_cur)
*changed_cur = apply_cur;
if (type == JSON_SANE_TYPE_BOOL)
{
to->set_value("default", *(bool*)val.c_str());
sane_opt_provider::set_opt_value(to, &val[0], "default");
if (apply_cur)
{
to->set_value("cur", *(bool*)val.c_str());
if (sane_opt_provider::set_opt_value(to, &val[0], "cur"))
update_provider_value(to->key().c_str(), &val[0], rdo);
}
}
else if (type == JSON_SANE_TYPE_INT)
{
to->set_value("default", *(int*)val.c_str());
if (apply_cur)
{
to->set_value("cur", *(int*)val.c_str());
update_provider_value(to->key().c_str(), &val[0], rdo);
}
}
else if (type == JSON_SANE_TYPE_FIXED)
{
to->set_value("default", *(double*)val.c_str());
if (apply_cur)
{
to->set_value("cur", *(double*)val.c_str());
update_provider_value(to->key().c_str(), &val[0], rdo);
}
}
else if (type == JSON_SANE_TYPE_STRING)
{
to->set_value("default", val.c_str());
if (apply_cur)
{
to->set_value("cur", val.c_str());
update_provider_value(to->key().c_str(), &val[0], rdo);
}
}
else if (changed_cur)
*changed_cur = false;
}
}
// 4: range value ...
if (range_value_.count(to->key()))
@ -1672,8 +1641,10 @@ bool device_option::to_now(bool init, bool* changed)
return now_ != nullptr;
}
void device_option::update_provider_value(const char* name, void* value, bool skip_first)
int device_option::update_provider_value(const char* name, void* value, bool skip_first)
{
int ret = SCANNER_ERR_OK;
if (src_.count(name))
{
sane_opt_provider* opt = nullptr;
@ -1690,13 +1661,65 @@ void device_option::update_provider_value(const char* name, void* value, bool sk
while (opt)
{
opt->set_value(name, value);
int err = opt->set_value(name, value);
if (err == SCANNER_ERR_RELOAD_OPT_PARAM ||
err == SCANNER_ERR_CONFIGURATION_CHANGED)
{
ret = err;
}
sane_opt_provider* next = opt->get_following(name);
opt->release();
opt = next;
}
}
return ret;
}
void device_option::remove_provider(gb_json* root, sane_opt_provider* sop)
{
if (root)
{
gb_json* child = root->first_child();
while (child)
{
bool chk_child = src_.count(child->key()) == 0;
if (!chk_child)
{
sane_opt_provider* sp = src_[child->key()],
* next = sp->get_following(child->key().c_str());
sp->add_ref();
while (sp)
{
if (sp == sop)
{
if (next)
src_[child->key()] = next;
else
src_.erase(child->key());
sp->release(); // release from map: src_
chk_child = true;
break;
}
sp->release(); // release from get_following
sp = next;
next = sp->get_following(child->key().c_str());
}
}
if (chk_child && src_.count(child->key()) == 0)
{
utils::to_log(LOG_LEVEL_DEBUG, "remove_provider: Remove option '%s' from '%s'\n", child->key().c_str(), sop->from());
root->remove(child);
child->release();
child = root->first_child();
continue;
}
child->release();
child = root->next_child();
}
}
}
std::string device_option::option_value(gb_json* jsn, bool def_val)
@ -1824,7 +1847,7 @@ void device_option::clear(void)
v.second->release();
src_.clear();
}
bool device_option::add(sane_opt_provider* sop)
bool device_option::add(sane_opt_provider* sop, bool apply_default_val)
{
bool ret = false;
@ -1833,7 +1856,10 @@ bool device_option::add(sane_opt_provider* sop)
{
ret = to_now(true, nullptr);
if (ret)
{
if(apply_default_val)
restore(nullptr);
}
else
clear();
}
@ -1844,6 +1870,13 @@ bool device_option::add(sane_opt_provider* sop)
return ret;
}
bool device_option::remove(sane_opt_provider* sop)
{
remove_provider(origin_, sop);
remove_provider(now_, sop);
return true;
}
bool device_option::refine_data(const char* name, void* value)
{
bool refined = false;
@ -1915,8 +1948,7 @@ int device_option::update_data(const char* name, void* value, bool reorder_if_ne
bool changed = false;
// pass to sane_opt_provider ...
err = SCANNER_ERR_OK;
update_provider_value(name, value);
err = update_provider_value(name, value);
child->get_value("type", type);
utils::to_log(LOG_LEVEL_DEBUG, "set option '%s' value to '%s' = %d.\n", name, sane_opt_provider::sane_value_2_text(type.c_str(), value).c_str(), err);
@ -1925,26 +1957,16 @@ int device_option::update_data(const char* name, void* value, bool reorder_if_ne
|| err == SCANNER_ERR_RELOAD_IMAGE_PARAM || err == SCANNER_ERR_RELOAD_OPT_PARAM
|| err == SCANNER_ERR_CONFIGURATION_CHANGED)
{
if (type == JSON_SANE_TYPE_BOOL)
gb_json* org = nullptr;
sane_opt_provider::set_opt_value(child, value);
origin_->get_value(name, org);
if (org)
{
child->set_value("cur", *(bool*)value);
changed = *(bool*)value != *(bool*)pre.c_str();
}
else if (type == JSON_SANE_TYPE_INT)
{
child->set_value("cur", *(int*)value);
changed = *(int*)value != *(int*)pre.c_str();
}
else if (type == JSON_SANE_TYPE_FIXED)
{
child->set_value("cur", *(double*)value);
changed = !IS_DOUBLE_EQUAL(*(double*)value, *(double*)pre.c_str());
}
else if (type == JSON_SANE_TYPE_STRING)
{
child->set_value("cur", (char*)value);
changed = pre != (char*)value;
sane_opt_provider::set_opt_value(org, value);
org->release();
}
changed = !sane_opt_provider::is_opt_value_equal(child, &pre[0], value);
// set paper-w and paper-h
if (strcmp(name, SANE_STD_OPT_NAME_PAPER) == 0 ||
@ -2123,6 +2145,9 @@ std::string device_option::get_option_value(const char* name, int type, int* siz
{
if (!name)
{
if (no_grp_ && origin_)
value = origin_->to_string();
else
value = jsn->to_string();
}
else

57
sdk/sane_opt_json/device_opt.h
View File

@ -3,6 +3,15 @@
//
// Created: 2023-09-07
//
// Design: all option-JSONs should added into device_option object
//
// and all option-logics execute in it;
//
// Exception: if some sane_opt_providers has its own manager object 'device_option'
//
// and I cannot get the origin JSON from the provider, how to resolve this ???
//
// Solution: return origin JSON if device_option is below other device_option!
#pragma once
@ -24,7 +33,7 @@ class device_option : public refer
{
gb_json* origin_;
gb_json* now_;
bool no_grp_ = false;
bool no_grp_ = false; // i am a lower option manager, need not group
std::map<std::string, sane_opt_provider*> src_;
std::vector<std::string> master_opts_; // options that value changed will affect others
std::map<std::string, simple_logic*> slaver_;
@ -184,7 +193,8 @@ class device_option : public refer
gb_json* copy_opt(gb_json* from, bool *changed_cur = nullptr);
int visibility(gb_json* jsn);
bool to_now(bool init, bool* changed);
void update_provider_value(const char* name, void* value, bool skip_first = false/*readonly value should skip first*/);
int update_provider_value(const char* name, void* value, bool skip_first = false/*readonly value should skip first*/);
void remove_provider(gb_json* root, sane_opt_provider* sop);
protected:
static std::string option_value(gb_json* jsn, bool def_val);
@ -358,7 +368,8 @@ public:
public:
void clear(void);
bool add(sane_opt_provider* sop);
bool add(sane_opt_provider* sop, bool apply_default_val = true);
bool remove(sane_opt_provider* sop);
bool refine_data(const char* name, void* value); // return true if the 'value' is out of range and refined it in the range
int update_data(const char* name, void* value, bool reorder_if_need = true); // return scanner_err. name and value would be null if invoked for language changed
int restore(sane_opt_provider* holder); //
@ -373,43 +384,3 @@ public:
std::string get_option_value(int sane_ind, int type/*OPT_VAL_xxx*/, int* size = nullptr, void* in_data = nullptr); // return whole json-text if name was null
};
//{
// "resolution": {
// "cat": "base",
// "group" : "base",
// "title" : "<22>ֱ<EFBFBD><D6B1><EFBFBD>",
// "desc" : "<22><><EFBFBD><EFBFBD>ɨ<EFBFBD><C9A8>ͼ<EFBFBD><CDBC>ķֱ<C4B7><D6B1><EFBFBD>",
// "type" : "int",
// "fix-id" : 34840,
// "size" : 4,
// "cur" : 200,
// "default" : 200,
// "range" : {
// "min": 100,
// "max" : {
// "default": 600,
// "paper==<3D><><EFBFBD>ɨ<EFBFBD><C9A8>ߴ<EFBFBD><DFB4>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD> || paper==<3D><><EFBFBD>ɨ<EFBFBD><C9A8>ߴ<EFBFBD> || paper==<3D><><EFBFBD><EFBFBD><EFBFBD>Ծ<EFBFBD>" : 500
// },
// "step" : 1
// }
// },
//
// "paper": {
// "cat": "base",
// "group" : "base",
// "title" : "ֽ<>ųߴ<C5B3>",
// "desc" : "<22><><EFBFBD>ó<EFBFBD>ͼ<EFBFBD><CDBC>С",
// "type" : "string",
// "fix-id" : 34831,
// "size" : 44,
// "cur" : "ƥ<><C6A5>ԭʼ<D4AD>ߴ<EFBFBD>",
// "default" : "ƥ<><C6A5>ԭʼ<D4AD>ߴ<EFBFBD>",
// "range" : ["A3", "8<><38>", "A4", "16<31><36>", "A5", "A6", "B4", "B5", "B6", "Letter", "Double Letter", "LEGAL", "ƥ<><C6A5>ԭʼ<D4AD>ߴ<EFBFBD>", {
// "resolution<500": "<22><><EFBFBD>ɨ<EFBFBD><C9A8>ߴ<EFBFBD><DFB4>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>"
// }, {
// "resolution<500": "<22><><EFBFBD>ɨ<EFBFBD><C9A8>ߴ<EFBFBD>"
// }, {
// "resolution<500": "<22><><EFBFBD><EFBFBD><EFBFBD>Ծ<EFBFBD>"
// }]
// }
//}

6
xmake.lua
View File

@ -60,8 +60,8 @@ add_packagedirs("sdk")
add_defines("BUILD_AS_DEVICE")
add_defines("VER_MAIN=2")
add_defines("VER_FAMILY=200")
add_defines("VER_DATE=20240113")
add_defines("VER_BUILD=4")
add_defines("VER_DATE=20240116")
add_defines("VER_BUILD=11")
target("conf")
set_kind("phony")
@ -70,7 +70,7 @@ target("conf")
add_configfiles("config.h.in", {prefixdir = "header"})
add_includedirs("$(buildir)/config/header", { public = true })
includes("usb", "hardware", "scanner", "ui")
includes("usb", "hardware", "imgproc", "scanner", "ui")