diff --git a/device/hgscanner.vcxproj b/device/hgscanner.vcxproj
index c264d44..1d68b79 100644
--- a/device/hgscanner.vcxproj
+++ b/device/hgscanner.vcxproj
@@ -72,14 +72,14 @@
true
- $(SolutionDir)..\..\device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\device\sdk\;$(SolutionDir)..\..\device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\device\hgdriver\hgdev\;$(SolutionDir)..\..\device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
false
- $(SolutionDir)..\..\device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\device\sdk\;$(SolutionDir)..\..\device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\device\hgdriver\hgdev\;$(SolutionDir)..\..\device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
@@ -88,14 +88,14 @@
true
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\device\sdk\;$(SolutionDir)..\..\device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\device\hgdriver\hgdev\;$(SolutionDir)..\..\device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
false
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\device\sdk\;$(SolutionDir)..\..\device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\device\hgdriver\hgdev\;$(SolutionDir)..\..\device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
@@ -204,110 +204,110 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/device/hgscanner.vcxproj.filters b/device/hgscanner.vcxproj.filters
index 6ea6739..5b564a2 100644
--- a/device/hgscanner.vcxproj.filters
+++ b/device/hgscanner.vcxproj.filters
@@ -27,133 +27,133 @@
-
+
源文件
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
@@ -165,13 +165,13 @@
usb\usbview
-
+
dev
-
+
dev
-
+
源文件
@@ -185,154 +185,154 @@
头文件
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
image
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
-
+
dev
@@ -347,13 +347,13 @@
usb\usbview
-
+
dev
-
+
dev
-
+
头文件
diff --git a/huagaotwain/huagaotwain.cpp b/huagaotwain/huagaotwain.cpp
index 876d9ae..33ba867 100644
--- a/huagaotwain/huagaotwain.cpp
+++ b/huagaotwain/huagaotwain.cpp
@@ -2,7 +2,7 @@
#include "huagaotwain.h"
#include "huagao/hgscanner_error.h"
#include "./twain/twain_2.4.h"
-#include "../../device/sdk/hginclude/hg_log.h"
+#include "../../code_device/sdk/hginclude/hg_log.h"
#define STR(s) #s
#define PASTE_STR(a, b) STR(a##b)
diff --git a/protocol/hgsane.vcxproj b/protocol/hgsane.vcxproj
index b315be4..b6505c4 100644
--- a/protocol/hgsane.vcxproj
+++ b/protocol/hgsane.vcxproj
@@ -73,14 +73,14 @@
true
- $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\device\include\;$(IncludePath)
+ $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
false
- $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\device\include\;$(IncludePath)
+ $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
@@ -89,14 +89,14 @@
true
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\device\include\;$(IncludePath)
+ $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
false
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\device\include\;$(IncludePath)
+ $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
@@ -192,21 +192,21 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/protocol/hgsane.vcxproj.filters b/protocol/hgsane.vcxproj.filters
index dbda086..2c00c07 100644
--- a/protocol/hgsane.vcxproj.filters
+++ b/protocol/hgsane.vcxproj.filters
@@ -15,36 +15,36 @@
-
+
源文件
-
+
源文件
-
+
源文件
-
+
源文件
-
+
源文件
-
+
源文件
-
+
头文件
-
+
头文件
-
+
头文件
-
+
头文件
@@ -62,13 +62,13 @@
头文件
-
+
头文件
头文件
-
+
头文件