lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
977 Commits 6 Branches 5 Tags 271 MiB
Commit Graph

780 Commits

Author SHA1 Message Date
gb fe530a6c8a 修正乱码 2023-06-19 17:13:20 +08:00
gb 382a1154d0 delete repeat definitions 2023-06-19 16:06:41 +08:00
13038267101 640c0c0617 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-17 16:53:53 +08:00
13038267101 a89937630f 微调 2023-06-17 16:53:40 +08:00
gb acf836648d 添加图像格式转换及释放驱动内存操作 2023-06-17 16:52:39 +08:00
13038267101 3ea35183ad Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-17 16:01:57 +08:00
13038267101 d6b891456f 调整DPS 设备usb图不是jpg的格式问题。调整dsp 设备异常不会返回stop的处理 2023-06-17 16:01:35 +08:00
gb f04fa05a4e 纸张尺寸和DPI选项动态调整（500DPI以上和最大尺寸不相容） 2023-06-17 14:59:57 +08:00
gb c7a6388913 添加电机板固件版本协议 2023-06-17 13:29:18 +08:00
13038267101 ce5368af5a Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-16 18:01:40 +08:00
13038267101 c44a7bad03 新增获取设备电机固件版本 2023-06-16 18:01:28 +08:00
yangjiaxuan e7b06c0c2a 调整平场校正返回值 2023-06-16 17:29:55 +08:00
13038267101 6e9a585f6e 更新偏色校正算法，402安卓支持偏色校正 2023-06-16 09:52:24 +08:00
gb f808870f42 恢复语言设置功能 2023-06-16 09:24:26 +08:00
yangjiaxuan b928ad56dd 调整设备日志导出 2023-06-15 18:27:31 +08:00
yangjiaxuan 45b0c92bb0 439设备日志导出调整返回状态 2023-06-15 18:16:43 +08:00
yangjiaxuan f04ede8931 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-15 17:54:50 +08:00
yangjiaxuan 195ea6a069 调整校正锁 2023-06-15 17:54:37 +08:00
13038267101 dc5be3ddfe 微调日志 2023-06-15 16:27:20 +08:00
13038267101 e7a2497f8c 微调 2023-06-15 15:02:57 +08:00
13038267101 a4427f21ad 开放色调曲线，并且色调曲线是PC做的处理 2023-06-15 14:53:53 +08:00
13038267101 149855404b 微调中晶网址 2023-06-15 12:01:05 +08:00
13038267101 c4c81a1465 调整中英文网址 2023-06-15 11:56:19 +08:00
13038267101 a5660a3c8b Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-15 11:13:45 +08:00
13038267101 05afea0a77 调整英文网址 2023-06-15 11:13:34 +08:00
gb 30bdd96e62 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-15 10:10:26 +08:00
gb e9d0c40d0d 增加语言属性 2023-06-15 10:10:17 +08:00
13038267101 bef5b4f2e7 屏蔽调试信息 2023-06-15 09:43:33 +08:00
13038267101 694fc5855f 调整色偏校正 2023-06-15 08:59:31 +08:00
13038267101 1faab9ddf9 调整中晶关于信息，调整色偏校正问题 2023-06-14 18:04:29 +08:00
13038267101 9c4a5bdd67 G439调整伽马值 2023-06-14 15:06:02 +08:00
13038267101 226c0901f2 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-14 10:32:21 +08:00
13038267101 52cb243310 帮助文档调整 2023-06-14 10:32:14 +08:00
yangjiaxuan 9dc57c2f8e Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-14 10:14:32 +08:00
yangjiaxuan 8b5bf38a3e 调整获取畸变 2023-06-14 10:14:14 +08:00
13038267101 99854983ba 微调 2023-06-14 09:45:14 +08:00
13038267101 80da6b8c1c 添加402 图像处理逻辑 2023-06-14 09:27:50 +08:00
13038267101 9b33f7fc19 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-13 18:18:56 +08:00
13038267101 625ed510b3 调整穿孔移除算法位置，调整噪点优化范围，折角范围，调整G300 解压，调整帮助文档支持英文版 2023-06-13 18:18:46 +08:00
gb dccd579342 增加获取滚轴寿命接口 2023-06-13 12:28:20 +08:00
yangjiaxuan 543a6307fb Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-13 11:09:40 +08:00
yangjiaxuan 47428e73e1 安卓滚轴清零都返回不支持 2023-06-13 11:09:28 +08:00
13038267101 fd3de04846 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-12 20:06:43 +08:00
13038267101 649beb1fb1 更新除摩尔纹算法，调整json文件， 2023-06-12 20:06:28 +08:00
gb 2c52348a47 control_option返回代码中增加设备不在线的错误 2023-06-12 11:12:44 +08:00
13038267101 c079b77d16 调整自动分支强度为分支强度的父选项 2023-06-07 17:37:42 +08:00
13038267101 f7f27d554e 新增沧田 vid pid，调整239获取序列号长度可能因为睡眠获取不上来的问题， 2023-06-07 16:41:16 +08:00
gb c2d4ed7626 保存图像处理各阶段结果，文件名以序号开头 2023-06-03 17:48:37 +08:00
gb d404ae065c 纸张大小paper_size，默认返回的为单位为毫米。 2023-06-03 16:11:10 +08:00
13038267101 ad5ab2d2a1 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-02 11:58:46 +08:00
13038267101 28ab768022 升级在主线程当中做，会导致主线程阻塞， 2023-06-02 11:58:25 +08:00
gb c244731836 调整状态4返回的错误代码 2023-06-02 11:31:07 +08:00
gb 65acfab584 修复302无纸错误信息输出BUG；调整OUT_OF_RANGE对应的SANE_STATUS代码 2023-06-02 11:10:17 +08:00
13038267101 1981657a36 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-06-02 10:38:37 +08:00
13038267101 9bd7a2acff 线程不在加设备准备状态提醒，start 时返回错误码 2023-06-02 10:38:27 +08:00
gb 89912ba290 获取序列号前判断设备是否在线 2023-05-31 11:37:24 +08:00
13038267101 00f56eab54 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-30 17:05:14 +08:00
13038267101 c50bbbc5d6 调整 302设备返回4的状态 2023-05-30 17:04:58 +08:00
gb 7043713131 互斥锁共享内存创建权限从0600更改为0666（root用户下创建的共享内存普通用户无法访问） 2023-05-30 15:23:37 +08:00
gb 9efd34e96e 添加自定义GAMMA属性访问接口 2023-05-29 15:51:01 +08:00
13038267101 6cea8a7632 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-25 09:10:08 +08:00
13038267101 fe6eef8a59 微调 2023-05-25 09:09:52 +08:00
gb b545b39865 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-24 17:16:30 +08:00
gb 95ac953da3 调整pop_first_image调用位置，避免死锁 2023-05-24 17:16:23 +08:00
13038267101 00ecac52b3 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-24 17:02:17 +08:00
13038267101 dc07e2ef42 初始化 239 2023-05-24 17:02:04 +08:00
gb 5f078d3a77 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-24 16:38:06 +08:00
gb 4c68058f75 删除control_fetch中的锁，该函数在外部用锁 2023-05-24 16:37:58 +08:00
13038267101 e5359d8af1 调整线程导致三方不能使用,discard_all_images 读取数据调整 2023-05-24 15:58:34 +08:00
13038267101 8ead291274 调整线程导致三方不能使用 2023-05-24 15:56:03 +08:00
gb 9f312279d0 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-24 15:07:28 +08:00
gb 35b28e8dff 调整USB加锁粒度 2023-05-24 15:07:18 +08:00
13038267101 94343b4207 微调 2023-05-24 15:07:13 +08:00
13038267101 dd04befa07 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-24 14:46:49 +08:00
13038267101 661f9bccd6 设备所线程，和打开准备线程（升级等），调整239 按照业务进行锁的操作 2023-05-24 14:46:34 +08:00
gb ac99838ce3 补充业务锁 2023-05-24 10:32:36 +08:00
gb df805cc81c 按业务命令对USB操作加锁 2023-05-24 10:11:56 +08:00
13038267101 94fe51b495 设备日志返回值 2023-05-20 18:07:32 +08:00
13038267101 9bc22b1f13 调整 239 start 清除int端点时可能导致死锁的问题 2023-05-20 11:13:33 +08:00
13038267101 b897d55b56 休眠时间和分纸强度，在打开app的时候会主动获取一次设备下面的状态 2023-05-19 16:19:12 +08:00
13038267101 9854225786 先把日志文件置空，在取 2023-05-18 14:39:08 +08:00
13038267101 1b80a8226c 获取设置日志时分段获取 2023-05-18 11:00:14 +08:00
13038267101 ae50dc2396 屏蔽主线程当中的回调 2023-05-18 09:46:26 +08:00
13038267101 53b018c872 微调 2023-05-17 14:54:42 +08:00
13038267101 4232d30a74 微调日志 2023-05-17 14:46:47 +08:00
13038267101 69f9249692 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-17 11:23:29 +08:00
13038267101 d1c1f9f512 在线程里面进行升级，初始化新增500ms睡眠 2023-05-17 11:23:15 +08:00
yangjiaxuan 7998c2a827 调整公司网址 2023-05-17 09:18:15 +08:00
gb d807da6eb8 Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev 2023-05-16 16:42:16 +08:00
gb 1fd53ece03 完善用户登录操作 2023-05-16 16:42:07 +08:00
yangjiaxuan a247865e08 调整驱动登录用户名和密码 2023-05-16 15:48:32 +08:00
gb 6de4f0fc68 将属性设置函数的最后一个长度参数,修改为指针,以在传入的数据不准确的情况下,返回实际的数据长度 2023-05-16 11:06:07 +08:00
gb cf2673f2b1 添加关于信息中单个子条目的属性操作；支持部分固有属性不配置在JSON中也能正常操作（测试需要注意对所有属性操作进行验证） 2023-05-13 16:26:43 +08:00
13038267101 fdcee9c1c3 恢复 stop 时候的线程睡眠 2023-05-09 17:39:47 +08:00
13038267101 31f347c901 微调 2023-05-08 10:29:27 +08:00
13038267101 1698b2c671 最大尺寸超时时间设置为130s 2023-05-08 09:54:48 +08:00
13038267101 36c01e2943 日志调整 2023-05-05 18:33:21 +08:00
13038267101 cb3eb97f7f 239 及部分scaner日志调整 2023-05-05 17:00:37 +08:00
13038267101 2d1cd23569 微调 2023-05-05 10:18:37 +08:00
13038267101 8ea7334555 G400 画质设置 2023-05-05 09:58:07 +08:00