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

fix setting ui bug and change included path

This commit is contained in:
gb 2023-05-02 14:42:06 +08:00
parent 262b4f0d5c
commit 3d125bc978
11 changed files with 143 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
device/gxx-linux/main.cpp Normal file
View File

@ -0,0 +1,48 @@
#include <sched.h>
#include <stdlib.h>
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
#include <thread>
void test()
{
auto _start = std::chrono::steady_clock::now();
int arr[1000000];
for (size_t i = 0; i < 1000000; i++)
{
for (size_t j = 0; j < 1000; j++)
{
arr[i] = i;
}
}
auto times = std::chrono::duration<double, std::milli>(std::chrono::steady_clock::now() - _start).count();
printf("times = %.2f \n", times);
}
int main(int argc, char *argv[])
{
struct sched_param param;
int maxpri;
maxpri = sched_get_priority_max(SCHED_FIFO); //»ñÈ¡×î´óÖµ
if (maxpri == -1)
{
printf("sched_get_priority_max() failed \n");
exit(1);
}
printf("%d \n", maxpri);
param.sched_priority = maxpri;
std::thread threadaa(test);
// if (sched_setscheduler(getpid(), SCHED_FIFO, &param) == -1) //设置优先级
// {
// printf("sched_setscheduler() failed \n");
// exit(1);
// }
// if(pthread_setschedparam(threadaa.native_handle(),SCHED_FIFO,&param))
// {
// printf("sched_setscheduler() failed \n");
// exit(1);
// }
threadaa.join();
return 0;
}

BIN
pc/code_twain/sln/usb_tools/Debug/usb_tools.exe
View File

Binary file not shown.

4
pc/code_twain/sln/usb_tools/DlgScanner.cpp
View File

@ -10,8 +10,8 @@
#include <file/file_util.h> #include <file/file_util.h>
#define TIMER_ID_REFRESH_BULK 1001 #define TIMER_ID_REFRESH_BULK 1001
#include <log_util.h> #include <common/log_util.h>
#include <json/gb_json.h> #include <common/json/gb_json.h>
HMODULE g_my_inst; HMODULE g_my_inst;

1
pc/code_twain/sln/usb_tools/scanner/opt_ui/DlgSetting.cpp
View File

@ -236,6 +236,7 @@ void dlg_setting::on_init_dialog(void)
MoveWindow(hwnd(), r.left, r.top, r.right - r.left, r.bottom - r.top, TRUE); MoveWindow(hwnd(), r.left, r.top, r.right - r.left, r.bottom - r.top, TRUE);
size.cy -= diff; size.cy -= diff;
size.cx = RECT_W(r);
for (int i = 0; page = get_page(i); ++i) for (int i = 0; page = get_page(i); ++i)
{ {
MoveWindow(page->hwnd(), 0, y, size.cx, size.cy - y, TRUE); MoveWindow(page->hwnd(), 0, y, size.cx, size.cy - y, TRUE);

4
pc/code_twain/sln/usb_tools/scanner/scanner_handler.cpp
View File

@ -2,8 +2,8 @@
#include "./usb/async_usb_host.h" #include "./usb/async_usb_host.h"
#include <log_util.h> #include <common/log_util.h>
#include <json/gb_json.h> #include <common/json/gb_json.h>

8
pc/code_twain/sln/usb_tools/scanner/scanner_handler.h
View File

@ -4,10 +4,10 @@
// //
#pragma once #pragma once
#include "referer.h" #include "common/referer.h"
#include "data.h" #include "io/data.h"
#include "packet.h" #include "common/packet.h"
#include "ipc_util.h" #include "common/ipc_util.h"
#include <functional> #include <functional>
#include <vector> #include <vector>

2
pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.cpp
View File

@ -2,7 +2,7 @@
#include <log_util.h> #include <common/log_util.h>

10
pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.h
View File

@ -4,16 +4,16 @@
// //
#pragma once #pragma once
#include "referer.h" #include "common/referer.h"
#include "data.h" #include "io/data.h"
#include "packet.h" #include "common/packet.h"
#include "ipc_util.h" #include "common/ipc_util.h"
#include <functional> #include <functional>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#include <encrypt.h> #include <common/encrypt.h>
typedef struct _usb_ep typedef struct _usb_ep

72
pc/code_twain/sln/usb_tools/usb_tools.vcxproj
View File

@ -76,7 +76,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\common\;$(IncludePath)</IncludePath> <IncludePath>$(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\async_model\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -86,7 +86,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>$(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\common\;$(IncludePath)</IncludePath> <IncludePath>$(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\async_model\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -196,14 +196,15 @@
</ResourceCompile> </ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\data.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\encrypt.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\encrypt.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\ipc_util.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\ipc_util.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\cJSON.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\json\cJSON.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\gb_json.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\json\gb_json.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\log_util.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\log_util.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\packet.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\referer.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\referer.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\sane_cfg.h" /> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\sane_cfg.h" />
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\io\data.h" />
<ClInclude Include="..\..\device\win_usb\usbview\enum.h" /> <ClInclude Include="..\..\device\win_usb\usbview\enum.h" />
<ClInclude Include="..\..\device\win_usb\usbview\usbdesc.h" /> <ClInclude Include="..\..\device\win_usb\usbview\usbdesc.h" />
<ClInclude Include="..\..\device\win_usb\usbview\uvcdesc.h" /> <ClInclude Include="..\..\device\win_usb\usbview\uvcdesc.h" />
@ -224,48 +225,37 @@
<ClInclude Include="usb_toolsDlg.h" /> <ClInclude Include="usb_toolsDlg.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\data.cpp"> <ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\encrypt.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\encrypt.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\ipc_util.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\json\cJSON.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\json\gb_json.cpp"> <ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\ipc_util.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\log_util.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\referer.cpp"> <ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\cJSON.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\sane_cfg.cpp"> <ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\gb_json.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\log_util.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\referer.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\sane_cfg.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\io\data.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\device\win_usb\usbview\devnode.c"> <ClCompile Include="..\..\device\win_usb\usbview\devnode.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

91
pc/code_twain/sln/usb_tools/usb_tools.vcxproj.filters
View File

@ -57,30 +57,9 @@
<ClInclude Include="..\..\device\win_usb\usbview\uvcdesc.h"> <ClInclude Include="..\..\device\win_usb\usbview\uvcdesc.h">
<Filter>Imports\usbview</Filter> <Filter>Imports\usbview</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\referer.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\data.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\ipc_util.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\log_util.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="DlgScanner.h"> <ClInclude Include="DlgScanner.h">
<Filter>头文件</Filter> <Filter>头文件</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\encrypt.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\sane_cfg.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\json\cJSON.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="scanner\scanner_handler.h"> <ClInclude Include="scanner\scanner_handler.h">
<Filter>scanner</Filter> <Filter>scanner</Filter>
</ClInclude> </ClInclude>
@ -102,7 +81,31 @@
<ClInclude Include="scanner\opt_ui\mem_dc.h"> <ClInclude Include="scanner\opt_ui\mem_dc.h">
<Filter>opt-ui</Filter> <Filter>opt-ui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\common\json\gb_json.h"> <ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\encrypt.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\ipc_util.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\log_util.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\packet.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\referer.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\sane_cfg.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\cJSON.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\gb_json.h">
<Filter>Imports</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\device\gxx-linux\usb\src\async_model\io\data.h">
<Filter>Imports</Filter> <Filter>Imports</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -125,30 +128,9 @@
<ClCompile Include="..\..\device\win_usb\usbview\enum.c"> <ClCompile Include="..\..\device\win_usb\usbview\enum.c">
<Filter>Imports\usbview</Filter> <Filter>Imports\usbview</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\referer.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\data.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\ipc_util.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\log_util.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="DlgScanner.cpp"> <ClCompile Include="DlgScanner.cpp">
<Filter>源文件</Filter> <Filter>源文件</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\encrypt.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\sane_cfg.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\json\cJSON.c">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="scanner\scanner_handler.cpp"> <ClCompile Include="scanner\scanner_handler.cpp">
<Filter>scanner</Filter> <Filter>scanner</Filter>
</ClCompile> </ClCompile>
@ -170,7 +152,28 @@
<ClCompile Include="scanner\opt_ui\mem_dc.cpp"> <ClCompile Include="scanner\opt_ui\mem_dc.cpp">
<Filter>opt-ui</Filter> <Filter>opt-ui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\common\json\gb_json.cpp"> <ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\encrypt.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\ipc_util.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\log_util.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\referer.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\sane_cfg.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\cJSON.c">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\common\json\gb_json.cpp">
<Filter>Imports</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\device\gxx-linux\usb\src\async_model\io\data.cpp">
<Filter>Imports</Filter> <Filter>Imports</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

4
pc/code_twain/sln/usb_tools/usb_toolsDlg.cpp
View File

@ -21,8 +21,8 @@
#pragma warning(disable: 4996) #pragma warning(disable: 4996)
#include <referer.h> #include <common/referer.h>
#include <log_util.h> #include <common/log_util.h>
namespace usb namespace usb
{ {