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

拍照时,新增GPIO22供电的补光灯开关控制

niujiuru 3 месяцев назад
Родитель
Сommit
7f61da9005
2 измененных файлов с 6 добавлено и 1 удалено
  1. 1 1
      Makefile
  2. 5 0
      reporter/takephoto.go

+ 1 - 1
Makefile

@@ -7,7 +7,7 @@ DEFINS = -D_GNU_SOURCE
 
 
 GO := go
 GO := go
 GO_BUILD := $(GO) build
 GO_BUILD := $(GO) build
-GO_FLAGS := -ldflags "-s -w -X hnyfkj.com.cn/rtu/linux/baseapp.Version=2.0.0.4 -X hnyfkj.com.cn/rtu/linux/baseapp.BuildTime=$(shell date +%Y-%m-%dT%H:%M:%S)"
+GO_FLAGS := -ldflags "-s -w -X hnyfkj.com.cn/rtu/linux/baseapp.Version=1.0.0.1 -X hnyfkj.com.cn/rtu/linux/baseapp.BuildTime=$(shell date +%Y-%m-%dT%H:%M:%S)"
 
 
 target ?= x86_64
 target ?= x86_64
 ifeq ($(target),armv7hf)
 ifeq ($(target),armv7hf)

+ 5 - 0
reporter/takephoto.go

@@ -8,6 +8,7 @@ import (
 	"time"
 	"time"
 
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	camera0 "hnyfkj.com.cn/rtu/linux/camera"
 	camera1 "hnyfkj.com.cn/rtu/linux/hk_takephoto"
 	camera1 "hnyfkj.com.cn/rtu/linux/hk_takephoto"
 	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
 	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
 	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
 	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
@@ -38,6 +39,10 @@ func (r *MQTTReporter) takePhotoAndUpToFtp() (string, error) {
 
 
 	r.pruneOldPhotos(baseapp.IMG_DIR, photoMaxNums) // 清理旧照片(避免磁盘空间不足)
 	r.pruneOldPhotos(baseapp.IMG_DIR, photoMaxNums) // 清理旧照片(避免磁盘空间不足)
 
 
+	// 1.1, 江苏宁录补光灯
+	camera0.Gpio22PowerControl(true)
+	defer camera0.Gpio22PowerControl(false)
+
 	now := time.Now()
 	now := time.Now()
 	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s.jpg", now.Format("2006-01-02_15-04-05.000")))
 	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s.jpg", now.Format("2006-01-02_15-04-05.000")))
 	_, err := camera1.TakePhoto(camera1.IMG_TYPE_JPG, imgFile, PhotoTimeout)
 	_, err := camera1.TakePhoto(camera1.IMG_TYPE_JPG, imgFile, PhotoTimeout)