diff --git a/device/scanner.rc b/device/scanner.rc index 232295c..fffa2d6 100644 --- a/device/scanner.rc +++ b/device/scanner.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,14,10000,22216 - PRODUCTVERSION 4,14,10000,22216 + FILEVERSION 4,15,10000,22217 + PRODUCTVERSION 4,15,10000,22217 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾" VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò" - VALUE "FileVersion", "4.14.10000.22216" + VALUE "FileVersion", "4.15.10000.22217" VALUE "InternalName", "scanner.dll" VALUE "LegalCopyright", "Copyright (C) 10000" VALUE "OriginalFilename", "scanner.dll" VALUE "ProductName", "HUAGOScan" - VALUE "ProductVersion", "4.14.10000.22216" + VALUE "ProductVersion", "4.15.10000.22217" END END BLOCK "VarFileInfo" diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj index 196a22a..9eb218f 100644 --- a/device/scanner.vcxproj +++ b/device/scanner.vcxproj @@ -268,6 +268,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" + @@ -343,6 +344,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" + diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters index 42eab1b..c1710e4 100644 --- a/device/scanner.vcxproj.filters +++ b/device/scanner.vcxproj.filters @@ -25,6 +25,9 @@ {06629bf8-5d3e-4855-916b-260169824839} + + {3d22771d-a2cc-4972-ab37-f1979d973a4f} + @@ -198,6 +201,9 @@ dev + + IO + @@ -422,6 +428,9 @@ dev + + IO + diff --git a/device/scanner_io/scanner_io.cpp b/device/scanner_io/scanner_io.cpp new file mode 100644 index 0000000..08b6a7c --- /dev/null +++ b/device/scanner_io/scanner_io.cpp @@ -0,0 +1,2 @@ +#include "scanner_io.h" + diff --git a/device/scanner_io/scanner_io.h b/device/scanner_io/scanner_io.h new file mode 100644 index 0000000..cfdb32d --- /dev/null +++ b/device/scanner_io/scanner_io.h @@ -0,0 +1,29 @@ +#pragma once + +// +// Base IO class +// +// Date: 2022-08-05 +// + +enum scanner_cmd +{ + +}; +enum scanner_event +{ + SCANNER_EVENT_NONE = 0, + SCANNER_EVENT_DEVICE_ARRIVED, + SCANNER_EVENT_DEVICE_LEFT, + SCANNER_EVENT_ +}; + +struct io_handler +{ + void (*on_io_event)(int ev_type, void* data, int len); +}; + +class scanenr_io +{ + +}; diff --git a/sane/sane.rc b/sane/sane.rc index ef39e1a..38fb119 100644 --- a/sane/sane.rc +++ b/sane/sane.rc @@ -248,8 +248,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,14,10000,22216 - PRODUCTVERSION 4,14,10000,22216 + FILEVERSION 4,15,10000,22217 + PRODUCTVERSION 4,15,10000,22217 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -266,12 +266,12 @@ BEGIN BEGIN VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾" VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò" - VALUE "FileVersion", "4.14.10000.22216" + VALUE "FileVersion", "4.15.10000.22217" VALUE "InternalName", "sane.dll" VALUE "LegalCopyright", "Copyright (C) 10000" VALUE "OriginalFilename", "sane.dll" VALUE "ProductName", "HUAGOScan" - VALUE "ProductVersion", "4.14.10000.22216" + VALUE "ProductVersion", "4.15.10000.22217" END END BLOCK "VarFileInfo"