Просмотр исходного кода

优化修改代码, 适配rtu_linux_modules的迭代

niujiuru 10 месяцев назад
Родитель
Сommit
c4d891cf8b
4 измененных файлов с 11 добавлено и 11 удалено
  1. 7 7
      Makefile
  2. 1 1
      main.go
  3. 2 2
      package/armv7hf.sh
  4. 1 1
      reporter/takephoto.go

+ 7 - 7
Makefile

@@ -39,8 +39,8 @@ libswapi.a :
 	$(MAKE) -C $(RTU_LINUX_MODULES_PATH)/swapi target=$(target) $@
 
 # 海康机器人
-libmvs_u_takephoto.a :
-	$(MAKE) -C $(RTU_LINUX_MODULES_PATH)/mvs_u_takephoto target=$(target) $@
+libhk_takephoto.a :
+	$(MAKE) -C $(RTU_LINUX_MODULES_PATH)/hk_takephoto target=$(target) $@
 
 # "Air720U"
 libair720u.a :
@@ -58,17 +58,17 @@ libec200u.a :
 libmcu_ctrl_board.a :
 	$(MAKE) -C mcu_ctrl_board target=$(target) $@
 
-LIBS := -Wl,-Bstatic -L$(RTU_LINUX_MODULES_PATH)/swapi -lswapi -L$(RTU_LINUX_MODULES_PATH)/mvs_u_takephoto -lmvs_u_takephoto
+LIBS := -Wl,-Bstatic -L$(RTU_LINUX_MODULES_PATH)/swapi -lswapi -L$(RTU_LINUX_MODULES_PATH)/hk_takephoto -lhk_takephoto
 LIBS += -L$(RTU_LINUX_MODULES_PATH)/air720u -lair720u -L$(RTU_LINUX_MODULES_PATH)/air530z -lair530z -L$(RTU_LINUX_MODULES_PATH)/ec200u -lec200u
 LIBS += -L./mcu_ctrl_board -lmcu_ctrl_board
 ifeq ($(target),armv7hf)
-  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(RTU_LINUX_MODULES_PATH)/mvs_u_takephoto/lib/armv7hf/. -lMvCameraControl
+  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(RTU_LINUX_MODULES_PATH)/hk_takephoto/lib/armv7hf/. -lMvCameraControl
 else
-  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(RTU_LINUX_MODULES_PATH)/mvs_u_takephoto/lib/x86_64/64 -lMvCameraControl
+  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(RTU_LINUX_MODULES_PATH)/hk_takephoto/lib/x86_64/64 -lMvCameraControl
 endif
 
 # 可执行程序
-rtu_sy_1a.out : libswapi.a libmvs_u_takephoto.a libair720u.a libair530z.a libec200u.a libmcu_ctrl_board.a ./main.go
+rtu_sy_1a.out : libswapi.a libhk_takephoto.a libair720u.a libair530z.a libec200u.a libmcu_ctrl_board.a ./main.go
 	mkdir -p ./build
 	$(GO) mod tidy
 	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
@@ -77,7 +77,7 @@ rtu_sy_1a.out : libswapi.a libmvs_u_takephoto.a libair720u.a libair530z.a libec2
 # 编译的清理
 clean :
 	make -C $(RTU_LINUX_MODULES_PATH)/swapi clean
-	make -C $(RTU_LINUX_MODULES_PATH)/mvs_u_takephoto clean
+	make -C $(RTU_LINUX_MODULES_PATH)/hk_takephoto clean
 	make -C $(RTU_LINUX_MODULES_PATH)/air720u clean
 	make -C $(RTU_LINUX_MODULES_PATH)/air530z clean
 	make -C $(RTU_LINUX_MODULES_PATH)/ec200u  clean

+ 1 - 1
main.go

@@ -7,7 +7,7 @@ import (
 
 	gps "hnyfkj.com.cn/rtu/linux/air530z"
 	baseapp "hnyfkj.com.cn/rtu/linux/baseapp"
-	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto" // 海康U口相机
+	camera1 "hnyfkj.com.cn/rtu/linux/hk_takephoto"
 	netmgrd "hnyfkj.com.cn/rtu/linux/netmgrd"
 	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
 	"hnyfkj.com.cn/rtu/sy_1a/reporter"

+ 2 - 2
package/armv7hf.sh

@@ -27,12 +27,12 @@ chmod a+x "${pkg_dir}/script/"*
 
 echo "3, Creating lib directory and copying library files..."
 mkdir -p "${pkg_dir}/lib"
-use_cam="mvs_u_takephoto"  # 使用海康U口相机
+use_cam="hk_takephoto"  # 使用海康U口相机
 cam_dir="${RTU_LINUX_MODULES_PATH}/${use_cam}"
 cp -rf "${cam_dir}/lib/armv7hf/"* "${pkg_dir}/lib/"
 
 echo "4, Building hkcam_reset..."
-if [ "$use_cam" = "mvs_u_takephoto" ]; then
+if [ "$use_cam" = "hk_takephoto" ]; then
   make -C "${cam_dir}" clean
   make -C "${cam_dir}" target=armv7hf hkcam_reset.out
   cp -rf "${cam_dir}/hkcam_reset.out" "${pkg_dir}/"

+ 1 - 1
reporter/takephoto.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
-	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto"
+	camera1 "hnyfkj.com.cn/rtu/linux/hk_takephoto"
 	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
 	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
 )