将"mvs_usb_takephoto"包名简化成"mvs_u_takephoto"

Makefile

@@ -29,15 +29,15 @@ SETGO_ENV = \
 DATE := $(shell date +%Y%m%d_%H%M%S)
 
 # 编译的目标
-all : mvs_usb_takephoto.out air720u_4g.out rtu_linux_modules.out
+all : mvs_u_takephoto.out air720u_4g.out rtu_linux_modules.out
 
 # 通用基础库
 libswapi.a :
 	$(MAKE) -C swapi target=$(target) $@
 
 # 海康机器人
-libmvs_usb_takephoto.a :
-	$(MAKE) -C mvs_usb_takephoto target=$(target) $@
+libmvs_u_takephoto.a :
+	$(MAKE) -C mvs_u_takephoto target=$(target) $@
 
 # "Air720U"
 libair720u.a :
@@ -48,16 +48,16 @@ libair530z.a :
 	$(MAKE) -C air530z target=$(target) $@
 
 # 海康相机拍照测试
-LIB1 := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_usb_takephoto -lmvs_usb_takephoto
+LIB1 := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_u_takephoto -lmvs_u_takephoto
 ifeq ($(target),armv7hf)
-  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_usb_takephoto/lib/armv7hf/. -lMvCameraControl
+  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/armv7hf/. -lMvCameraControl
 else
-  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_usb_takephoto/lib/x86_64/64 -lMvCameraControl
+  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/x86_64/64 -lMvCameraControl
 endif
-mvs_usb_takephoto.out : libswapi.a libmvs_usb_takephoto.a ./tests/mvs_usb_takephoto/main.go
+mvs_u_takephoto.out : libswapi.a libmvs_u_takephoto.a ./tests/mvs_u_takephoto/main.go
 	mkdir -p ./build/takephoto_test
 	$(GO) mod tidy
-	$(SETGO_ENV) CGO_LDFLAGS="$(LIB1)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./tests/mvs_usb_takephoto/main.go
+	$(SETGO_ENV) CGO_LDFLAGS="$(LIB1)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./tests/mvs_u_takephoto/main.go
 	@cp $@ ./build/takephoto_test/$(basename $@)_$(DATE)$(suffix $@)
 	rm -rf $@
 
@@ -71,13 +71,13 @@ air720u_4g.out : libswapi.a libair720u.a ./tests/air720u/main.go
 	rm -rf $@
 
 # 主测试程序
-LIB3 := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_usb_takephoto -lmvs_usb_takephoto -L./air720u -lair720u -L./air530z -lair530z
+LIB3 := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_u_takephoto -lmvs_u_takephoto -L./air720u -lair720u -L./air530z -lair530z
 ifeq ($(target),armv7hf)
-  LIB3 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_usb_takephoto/lib/armv7hf/. -lMvCameraControl
+  LIB3 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/armv7hf/. -lMvCameraControl
 else
-  LIB3 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_usb_takephoto/lib/x86_64/64 -lMvCameraControl
+  LIB3 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/x86_64/64 -lMvCameraControl
 endif
-rtu_linux_modules.out : libswapi.a libmvs_usb_takephoto.a libair720u.a libair530z.a ./main.go
+rtu_linux_modules.out : libswapi.a libmvs_u_takephoto.a libair720u.a libair530z.a ./main.go
 	mkdir -p ./build
 	$(GO) mod tidy
 	$(SETGO_ENV) CGO_LDFLAGS="$(LIB3)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
@@ -86,7 +86,7 @@ rtu_linux_modules.out : libswapi.a libmvs_usb_takephoto.a libair720u.a libair530
 # 编译的清理
 clean :
 	make -C ./swapi clean
-	make -C ./mvs_usb_takephoto clean
+	make -C ./mvs_u_takephoto clean
 	make -C ./air720u clean
 	make -C ./air530z clean
 	rm -rf ./*.a ./*.out ./build

main.go

@@ -7,7 +7,7 @@ import (
 	gps "hnyfkj.com.cn/rtu/linux/air530z"
 	modem "hnyfkj.com.cn/rtu/linux/air720u"
 	baseapp "hnyfkj.com.cn/rtu/linux/baseapp"
-	camera1 "hnyfkj.com.cn/rtu/linux/mvs_usb_takephoto" // 海康USB相机
+	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto" // 海康U口相机
 	netmgrd "hnyfkj.com.cn/rtu/linux/netmgrd"
 )
 

mvs_usb_takephoto/Makefile

@@ -32,12 +32,12 @@ else
 endif
 
 # 编译和清理
-build : libmvs_usb_takephoto.a takephoto_test.out hkcam_reset.out
+build : libmvs_u_takephoto.a takephoto_test.out hkcam_reset.out
 
 %.o : %.c
 	$(CC) $(DEFINS) $(CFLAGS) -c $< $(INCS) -o $@
 
-libmvs_usb_takephoto.a : $(OBJS)
+libmvs_u_takephoto.a : $(OBJS)
 	$(AR) -cr $@ $(OBJS)
 
 hkcam_reset.out : $(OBJS)

mvs_usb_takephoto/bridge.go

@@ -1,7 +1,7 @@
 // Author: NiuJiuRu
 // Email: niujiuru@qq.com
 
-package mvs_usb_takephoto
+package mvs_u_takephoto
 
 /*
 #include "takephoto.h"

mvs_usb_takephoto/takephoto.go

@@ -1,4 +1,4 @@
-package mvs_usb_takephoto
+package mvs_u_takephoto
 
 import (
 	"time"

readme.txt

@@ -25,11 +25,11 @@ SHELL脚本封装库, 后台守护软件运行等功能, 可以平替硬件看
 08、./netmgrd
 实现联网检测、自动切换有线与移动网络及时间同步等基础网管功能
 
-09、./mvs_usb_takephoto
-海康机器人工业相机-USB, 通过海康提供的SDK, 封装实现拍照功能
+09、./mvs_u_takephoto
+海康机器人工业相机-U口, 通过海康提供的SDK, 封装实现拍照功能
 
-10、./mvs_net_takephoto (Todo)
-海康机器人工业相机-网络, 通过海康提供的SDK, 封装实现拍照功能
+10、./mvs_g_takephoto (Todo: 待实现)
+海康机器人工业相机-G口, 通过海康提供的SDK, 封装实现拍照功能
 
 二、编译说明
 

tests/mvs_usb_takephoto/main.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
-	camera "hnyfkj.com.cn/rtu/linux/mvs_usb_takephoto"
+	camera "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto"
 )
 
 func main() {