From c8fed3dc2a291f18f27a840971e61bca648c9de7 Mon Sep 17 00:00:00 2001 From: modehua Date: Thu, 12 Jan 2023 13:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=92=8C=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 54 +++++++---- hgdriver/hgdev/CMakeLists.txt | 4 +- sdk/hginclude/huagaoxxx_warraper_ex.h | 128 +++++++++++++------------- 3 files changed, 100 insertions(+), 86 deletions(-) diff --git a/build.sh b/build.sh index 064a51e..f31ef42 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,10 @@ minverstr="s/ver_2/" verstr3="s/ver_3/" ver3=10 +cp hgsane/CMakeLists.txt hgsane/CMakeLists.txtbkp +cp hgdriver/hgdev/CMakeLists.txt hgdriver/hgdev/CMakeLists.txtbkp +cp hgdriver/wrapper/CMakeLists.txt hgdriver/wrapper/CMakeLists.txtbkp + #sudo apt install libudev-dev minverstr=${minverstr}${minver}"/g" echo "minor version replacing pattern: "${minverstr} @@ -25,22 +29,28 @@ echo $mainverstr if [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ]; then ver3=16 - sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgsane/CMakeLists.txt - sed -i "s/hgsane/hwsane/g" hgsane/CMakeLists.txt - sed -i "s/hgdriver/hwdriver/g" hgsane/CMakeLists.txt - sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt - sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt - sed -i "s/hgdriver/hwdriver/g" hgdriver/wrapper/CMakeLists.txt - sed -i "s/1%m%d1/1%m%d6/g" hgdriver/wrapper/CMakeLists.txt + + sed -i "s/DOEM_HUAGAO/DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/DOEM_HUAGAO/DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/1%m%d1/1%m%d6/g" hgdriver/wrapper/CMakeLists.txt elif [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ]; then ver3=14 - sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt - sed -i "s/hgsane/lscsane/g" hgsane/CMakeLists.txt - sed -i "s/hgdriver/lscdriver/g" hgsane/CMakeLists.txt - sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt - sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt - sed -i "s/hgdriver/lscdriver/g" hgdriver/wrapper/CMakeLists.txt - sed -i "s/1%m%d1/1%m%d7/g" hgdriver/wrapper/CMakeLists.txt + + sed -i "s/DOEM_HUAGAO/DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/DOEM_HUAGAO/DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/1%m%d1/1%m%d7/g" hgdriver/wrapper/CMakeLists.txt +elif [ "$oem" == "cts" ] || [ "$oem" == "ctsweb" ]; then + ver3=18 + + sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/1%m%d1/1%m%d8/g" hgdriver/wrapper/CMakeLists.txt +fi + +if [ "$oem" != "" ]; then + sed -i "s/hgsane/$oem"sane"/g" hgsane/CMakeLists.txt + sed -i "s/hgdriver/$oem"driver"/g" hgdriver/wrapper/CMakeLists.txt hgsane/CMakeLists.txt + echo $oem $oem fi ver3=$[$ver3 * 10] @@ -68,11 +78,11 @@ fi verstr3=${verstr3}"${ver3}/g" echo "3rd version replacing pattern: "${verstr3} -sed -ibkp ${mainverstr} hgdriver/wrapper/CMakeLists.txt + +sed -i ${mainverstr} hgdriver/wrapper/CMakeLists.txt sed -i ${minverstr} hgdriver/wrapper/CMakeLists.txt sed -i ${verstr3} hgdriver/wrapper/CMakeLists.txt - if [ "$sys" == "UnionTech" ];then sed -i "s/kylin/uos/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/KYLIN/UOS/g" hgdriver/hgdev/CMakeLists.txt @@ -114,10 +124,14 @@ fi 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 + mv ../code_device/hgdriver/hgdev/CMakeLists.txtbkp ../code_device/hgdriver/hgdev/CMakeLists.txt + pwd +fi + +if [ -f ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ]; then + mv ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ../code_device/hgdriver/wrapper/CMakeLists.txt + pwd fi diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index 0578f0c..c9ac3e1 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -22,7 +22,7 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64") elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") add_definitions(-Dxaarch64="aarch64") target_link_libraries(${PROJECT_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libtegra_hal.a + #${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libtegra_hal.a #message("静态库预留03") #message("静态库预留04") ) @@ -55,4 +55,4 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../../../sdk/include ) -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) +set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/hg/) diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h index 8534210..c83681b 100644 --- a/sdk/hginclude/huagaoxxx_warraper_ex.h +++ b/sdk/hginclude/huagaoxxx_warraper_ex.h @@ -88,70 +88,70 @@ /// /// 错误代码 #define MAX_NAME_LEN 256 -#ifdef OEM_HANWANG -#define hg_scanner_initialize hw_scanner_initialize -#define hg_scanner_uninitialize hw_scanner_uninitialize -#define hg_scanner_get_version hw_scanner_get_version -#define hg_scanner_enum hw_scanner_enum -#define hg_scanner_open hw_scanner_open -#define hg_scanner_close hw_scanner_close -#define hg_scanner_get_parameter hw_scanner_get_parameter -#define hg_scanner_set_parameter hw_scanner_set_parameter -#define hg_scanner_start hw_scanner_start -#define hg_scanner_stop hw_scanner_stop -#define hg_scanner_get_img_info hw_scanner_get_img_info -#define hg_scanner_read_img_data hw_scanner_read_img_data -#define hg_scanner_get_status hw_scanner_get_status -#define hg_scanner_reset hw_scanner_reset -#define hg_scanner_control hw_scanner_control -#define hg_scanner_set_sane_info hw_scanner_set_sane_info -#define hg_scanner_err_name hw_scanner_err_name -#define hg_scanner_err_description hw_scanner_err_description -#define hg_scanner_log hw_scanner_log -#define hg_scanner_log_is_enable hw_scanner_log_is_enable -#elif defined(OEM_LISICHENG) -#define hg_scanner_initialize lsc_scanner_initialize -#define hg_scanner_uninitialize lsc_scanner_uninitialize -#define hg_scanner_get_version lsc_scanner_get_version -#define hg_scanner_enum lsc_scanner_enum -#define hg_scanner_open lsc_scanner_open -#define hg_scanner_close lsc_scanner_close -#define hg_scanner_get_parameter lsc_scanner_get_parameter -#define hg_scanner_set_parameter lsc_scanner_set_parameter -#define hg_scanner_start lsc_scanner_start -#define hg_scanner_stop lsc_scanner_stop -#define hg_scanner_get_img_info lsc_scanner_get_img_info -#define hg_scanner_read_img_data lsc_scanner_read_img_data -#define hg_scanner_get_status lsc_scanner_get_status -#define hg_scanner_reset lsc_scanner_reset -#define hg_scanner_control lsc_scanner_control -#define hg_scanner_set_sane_info lsc_scanner_set_sane_info -#define hg_scanner_err_name lsc_scanner_err_name -#define hg_scanner_err_description lsc_scanner_err_description -#define hg_scanner_log lsc_scanner_log -#define hg_scanner_log_is_enable lsc_scanner_log_is_enable -#elif defined(OEM_CANGTIAN) -#define hg_scanner_initialize cts_scanner_initialize -#define hg_scanner_uninitialize cts_scanner_uninitialize -#define hg_scanner_get_version cts_scanner_get_version -#define hg_scanner_enum cts_scanner_enum -#define hg_scanner_open cts_scanner_open -#define hg_scanner_close cts_scanner_close -#define hg_scanner_get_parameter cts_scanner_get_parameter -#define hg_scanner_set_parameter cts_scanner_set_parameter -#define hg_scanner_start cts_scanner_start -#define hg_scanner_stop cts_scanner_stop -#define hg_scanner_get_img_info cts_scanner_get_img_info -#define hg_scanner_read_img_data cts_scanner_read_img_data -#define hg_scanner_get_status cts_scanner_get_status -#define hg_scanner_reset cts_scanner_reset -#define hg_scanner_control cts_scanner_control -#define hg_scanner_set_sane_info cts_scanner_set_sane_info -#define hg_scanner_err_name cts_scanner_err_name -#define hg_scanner_err_description cts_scanner_err_description -#define hg_scanner_log cts_scanner_log -#define hg_scanner_log_is_enable cts_scanner_log_is_enable -#endif +// #ifdef OEM_HANWANG + // #define hg_scanner_initialize hw_scanner_initialize + // #define hg_scanner_uninitialize hw_scanner_uninitialize + // #define hg_scanner_get_version hw_scanner_get_version + // #define hg_scanner_enum hw_scanner_enum + // #define hg_scanner_open hw_scanner_open + // #define hg_scanner_close hw_scanner_close + // #define hg_scanner_get_parameter hw_scanner_get_parameter + // #define hg_scanner_set_parameter hw_scanner_set_parameter + // #define hg_scanner_start hw_scanner_start + // #define hg_scanner_stop hw_scanner_stop + // #define hg_scanner_get_img_info hw_scanner_get_img_info + // #define hg_scanner_read_img_data hw_scanner_read_img_data + // #define hg_scanner_get_status hw_scanner_get_status + // #define hg_scanner_reset hw_scanner_reset + // #define hg_scanner_control hw_scanner_control + // #define hg_scanner_set_sane_info hw_scanner_set_sane_info + // #define hg_scanner_err_name hw_scanner_err_name + // #define hg_scanner_err_description hw_scanner_err_description + // #define hg_scanner_log hw_scanner_log + // #define hg_scanner_log_is_enable hw_scanner_log_is_enable +// #elif defined(OEM_LISICHENG) + // #define hg_scanner_initialize lsc_scanner_initialize + // #define hg_scanner_uninitialize lsc_scanner_uninitialize + // #define hg_scanner_get_version lsc_scanner_get_version + // #define hg_scanner_enum lsc_scanner_enum + // #define hg_scanner_open lsc_scanner_open + // #define hg_scanner_close lsc_scanner_close + // #define hg_scanner_get_parameter lsc_scanner_get_parameter + // #define hg_scanner_set_parameter lsc_scanner_set_parameter + // #define hg_scanner_start lsc_scanner_start + // #define hg_scanner_stop lsc_scanner_stop + // #define hg_scanner_get_img_info lsc_scanner_get_img_info + // #define hg_scanner_read_img_data lsc_scanner_read_img_data + // #define hg_scanner_get_status lsc_scanner_get_status + // #define hg_scanner_reset lsc_scanner_reset + // #define hg_scanner_control lsc_scanner_control + // #define hg_scanner_set_sane_info lsc_scanner_set_sane_info + // #define hg_scanner_err_name lsc_scanner_err_name + // #define hg_scanner_err_description lsc_scanner_err_description + // #define hg_scanner_log lsc_scanner_log + // #define hg_scanner_log_is_enable lsc_scanner_log_is_enable +// #elif defined(OEM_CANGTIAN) + // #define hg_scanner_initialize cts_scanner_initialize + // #define hg_scanner_uninitialize cts_scanner_uninitialize + // #define hg_scanner_get_version cts_scanner_get_version + // #define hg_scanner_enum cts_scanner_enum + // #define hg_scanner_open cts_scanner_open + // #define hg_scanner_close cts_scanner_close + // #define hg_scanner_get_parameter cts_scanner_get_parameter + // #define hg_scanner_set_parameter cts_scanner_set_parameter + // #define hg_scanner_start cts_scanner_start + // #define hg_scanner_stop cts_scanner_stop + // #define hg_scanner_get_img_info cts_scanner_get_img_info + // #define hg_scanner_read_img_data cts_scanner_read_img_data + // #define hg_scanner_get_status cts_scanner_get_status + // #define hg_scanner_reset cts_scanner_reset + // #define hg_scanner_control cts_scanner_control + // #define hg_scanner_set_sane_info cts_scanner_set_sane_info + // #define hg_scanner_err_name cts_scanner_err_name + // #define hg_scanner_err_description cts_scanner_err_description + // #define hg_scanner_log cts_scanner_log + // #define hg_scanner_log_is_enable cts_scanner_log_is_enable +// #endif #define _TO_STR(str) #str #define MAKE_STR(str) _TO_STR(str)