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

恢复项目文件前，先判断是否存在；修复设备层版本接口BUG

This commit is contained in:
gb 2022-05-17 15:57:09 +08:00
parent c8eb4c4cd0
commit 44ad4265ec
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@ -40,6 +40,12 @@ fi
make
if [ -f ../code_device/hgsane/CMakeLists.txtbkp ]; then
mv ../code_device/hgsane/CMakeLists.txtbkp ../code_device/hgsane/CMakeLists.txt
fi
if [ -f ../code_device/hgdriver/hgdev/CMakeLists.txtbkp ]; then
mv ../code_device/hgdriver/hgdev/CMakeLists.txtbkp ../code_device/hgdriver/hgdev/CMakeLists.txt
fi
if [ -f ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ]; then
mv ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ../code_device/hgdriver/wrapper/CMakeLists.txt
fi

10
hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
View File

@ -12,10 +12,10 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define MAKE_VERSION(a, b, c, d) \
((((a) & 0x0ff) << 24) \
| (((b) & 0x0ff) << 16) \
| (((c) & 0x0ff) << 8) \
| (((d) & 0x0ff) << 0))
((((unsigned long long)(a) & 0x0ffff) << 48) \
| (((unsigned long long)(b) & 0x0ffff) << 32) \
| (((unsigned long long)(c) & 0x0ffff) << 16) \
| (((unsigned long long)(d) & 0x0ffff) << 0))
extern "C"
{
@ -33,7 +33,7 @@ extern "C"
hg_scanner_mgr::clear();
}
long hg_scanner_get_version(void)
unsigned long long hg_scanner_get_version(void)
{
return MAKE_VERSION(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD - 10000);
}

7
hgsane/sane_hg_mdw.cpp
View File

@ -560,14 +560,17 @@ namespace local_utility
if (version_code)
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, VERSION_BUILD); // leading-char '1' is used for avoid compiler considering '0118' as an octal number :)
long v = hg_scanner_get_version();
unsigned char* byt = (unsigned char*)&v;
unsigned long long v = hg_scanner_get_version();
unsigned short* byt = (unsigned short*)&v;
#ifdef OEM_HANWANG
HG_VLOG_MINI_4(LOG_LEVEL_DEBUG_INFO, "HanWang scanner driver version: %u.%u.%u.%u\n", byt[3], byt[2], byt[1], byt[0]);
HG_VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "hwsane driver version: %u.%u.%u\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, VERSION_BUILD);
#elif defined(OEM_LISICHENG)
HG_VLOG_MINI_4(LOG_LEVEL_DEBUG_INFO, "Lisicheng scanner driver version: %u.%u.%u.%u\n", byt[3], byt[2], byt[1], byt[0]);
HG_VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "lscsane driver version: %u.%u.%u\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, VERSION_BUILD);
#else
HG_VLOG_MINI_4(LOG_LEVEL_DEBUG_INFO, "Huagao scanner driver version: %u.%u.%u.%u\n", byt[3], byt[2], byt[1], byt[0]);
HG_VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "hgsane driver version: %u.%u.%u\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, VERSION_BUILD);
#endif
}
void stop_work(void)

2
sdk/hginclude/huagaoxxx_warraper_ex.h
View File

@ -225,7 +225,7 @@ extern "C"{
// ┌───┬───┬───┬───┐
// │ hh │ hl │ lh │ ll │
// └───┴───┴───┴───┘
long hg_scanner_get_version(void);
unsigned long long hg_scanner_get_version(void);
// Function: 枚举所有本驱动支持的已经连接的设备
//