13038267101
|
28ab768022
|
升级在主线程当中做，会导致主线程阻塞，
|
2023-06-02 11:58:25 +08:00 |
gb
|
6f39a35c65
|
增加未知状态错误信息
|
2023-06-02 11:36:32 +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
|
d3e8b91233
|
响应获取默认值命令；button & group属性不支持获取值操作
|
2023-05-30 09:45:33 +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 |
|
gb
|
1430cbb8be
|
fix TRY_MATCH macro
|
2023-05-23 11:19:37 +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 |
|
gb
|
d61d408ff5
|
修复获取操作带参数的问题
|
2023-05-17 09:42:46 +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
|
3f8cd1f718
|
添加序列号……固定属性ID
|
2023-05-16 11:44:48 +08:00 |
|
gb
|
6de4f0fc68
|
将属性设置函数的最后一个长度参数,修改为指针,以在传入的数据不准确的情况下,返回实际的数据长度
|
2023-05-16 11:06:07 +08:00 |
|
gb
|
cf2673f2b1
|
添加关于信息中单个子条目的属性操作；支持部分固有属性不配置在JSON中也能正常操作（测试需要注意对所有属性操作进行验证）
|
2023-05-13 16:26:43 +08:00 |
|
13038267101
|
3dd6e38cf7
|
日志删除设置10M大小
|
2023-05-10 10:14:24 +08:00 |
|
13038267101
|
fdcee9c1c3
|
恢复 stop 时候的线程睡眠
|
2023-05-09 17:39:47 +08:00 |