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

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

This commit is contained in:
13038267101 2024-02-23 15:28:03 +08:00
parent 32dbf56e22 9decddb0d7
commit 1c4b6a2653
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hgdriver/hgdev/hg_ipc.cpp
View File

@ -120,9 +120,29 @@ bool platform_event::wait(unsigned timeout)
sem_wait(&sem_); sem_wait(&sem_);
else else
{ {
struct timespec to; struct timespec to = { 0 };
to.tv_sec = timeout / 1000; //to.tv_sec = timeout / 1000;
to.tv_nsec = (long)((timeout % 1000) * 1000 * 1000); //to.tv_nsec = (long)((timeout % 1000) * 1000 * 1000);
#if !(defined(WIN32) || defined(_WIN64))
if (clock_gettime(CLOCK_REALTIME, &to) == -1)
{
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "clock_gettime failed: %d - %s\n", errno, strerror(errno));
to.tv_sec = time(nullptr);
}
#endif
/*/
to.tv_nsec += (uint64_t)timeout * 1000 * 1000;
to.tv_sec += to.tv_nsec / (uint64_t)1 * 1000 * 1000 * 1000;
to.tv_nsec %= (uint64_t)1 * 1000 * 1000 * 1000;
/*/
to.tv_sec += timeout / 1000;
to.tv_nsec += (uint64_t)(timeout % 1000) * 1000 * 1000;
if(to.tv_nsec >= (uint64_t)1 * 1000 * 1000 * 1000)
{
to.tv_sec++;
to.tv_nsec -= (uint64_t)1 * 1000 * 1000 * 1000;
}
////////*//////////////////
waited = sem_timedwait(&sem_, &to) == 0; waited = sem_timedwait(&sem_, &to) == 0;
} }
VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "platform_event(%s - %s) --> %s.\n", hg_log::format_ptr(this).c_str(), dbg_info_.c_str(), waited ? "waited" : "wait timeout"); VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "platform_event(%s - %s) --> %s.\n", hg_log::format_ptr(this).c_str(), dbg_info_.c_str(), waited ? "waited" : "wait timeout");

10
hgdriver/hgdev/hg_scanner.cpp
View File

@ -1647,6 +1647,10 @@ std::string get_help_file_path()
{ {
language = "english"; language = "english";
} }
else if (code_page == 950)
{
language = "chinese-trad";
}
std::string filename; std::string filename;
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
@ -1660,6 +1664,8 @@ std::string get_help_file_path()
filename = "MicrotekScan_scanSettings_Help_manual.pdf"; filename = "MicrotekScan_scanSettings_Help_manual.pdf";
if (language == "english") if (language == "english")
filename = "MicrotekScan_scanSettings_Help_manual_EN.pdf"; filename = "MicrotekScan_scanSettings_Help_manual_EN.pdf";
else if (language == "chinese-trad")
filename = "MicrotekScan_scanSettings_Help_manual_TRADCN.pdf";
#elif defined(OEM_ZIGUANG) #elif defined(OEM_ZIGUANG)
filename = "UniScan_scanSettings_Help_manual.pdf"; filename = "UniScan_scanSettings_Help_manual.pdf";
#elif defined(OEM_NEUTRAL) #elif defined(OEM_NEUTRAL)
@ -1695,6 +1701,8 @@ std::string get_help_file_path()
filename = "../../entries/help/MicrotekScan_scanSettings_Help_manual.pdf"; filename = "../../entries/help/MicrotekScan_scanSettings_Help_manual.pdf";
if (language == "english") if (language == "english")
filename = "../../entries/help/MicrotekScan_scanSettings_Help_manual_EN.pdf"; filename = "../../entries/help/MicrotekScan_scanSettings_Help_manual_EN.pdf";
else if (language == "chinese-trad")
filename = "../../entries/help/MicrotekScan_scanSettings_Help_manual_TRADCN.pdf";
#elif defined(OEM_ZIGUANG) #elif defined(OEM_ZIGUANG)
filename = "../../entries/help/UniScan_scanSettings_Help_manual.pdf"; filename = "../../entries/help/UniScan_scanSettings_Help_manual.pdf";
#elif defined(OEM_NEUTRAL) #elif defined(OEM_NEUTRAL)
@ -1719,6 +1727,8 @@ std::string get_help_file_path()
filename = "../doc/MicrotekScan_scanSettings_Help_manual.pdf"; filename = "../doc/MicrotekScan_scanSettings_Help_manual.pdf";
if (language == "english") if (language == "english")
filename = "../doc/MicrotekScan_scanSettings_Help_manual_EN.pdf"; filename = "../doc/MicrotekScan_scanSettings_Help_manual_EN.pdf";
else if (language == "chinese-trad")
filename = "../doc/MicrotekScan_scanSettings_Help_manual_TRADCN.pdf";
#elif defined(OEM_ZIGUANG) #elif defined(OEM_ZIGUANG)
filename = "../doc/UniScan_scanSettings_Help_manual.pdf"; filename = "../doc/UniScan_scanSettings_Help_manual.pdf";
#elif defined(OEM_NEUTRAL) #elif defined(OEM_NEUTRAL)

15
hgdriver/hgdev/hg_scanner_239.cpp
View File

File diff suppressed because one or more lines are too long

4
hgdriver/hgdev/hg_scanner_300.cpp
View File

File diff suppressed because one or more lines are too long