Переглянути джерело

搭建真实测报灯测试环境,调试代码BUG,与MCU控制板和大数据平台基础通信调试通过

niujiuru 2 тижнів тому
батько
коміт
0e696d34c0

+ 1 - 1
main.go

@@ -151,7 +151,7 @@ func (p *program) Stop(s service.Service) error {
 }
 }
 
 
 func main() {
 func main() {
-	baseapp.SetOptDirs(true, false, false, true)
+	baseapp.SetOptDirs(true, false, true, true)
 	baseapp.InitPath()
 	baseapp.InitPath()
 
 
 	svcFlag := flag.String("service", "", "Control the yfkj-user-app service.")
 	svcFlag := flag.String("service", "", "Control the yfkj-user-app service.")

+ 1 - 1
mcu_ctrl_board/bridge.go

@@ -37,7 +37,7 @@ func mcuCtrlBoard_Write(data []byte) (int, error) {
 		p = (*C.uchar)(unsafe.Pointer(&data[0]))
 		p = (*C.uchar)(unsafe.Pointer(&data[0]))
 	}
 	}
 	ret := int(C.MCU_SendRaw(p, C.int(len(data))))
 	ret := int(C.MCU_SendRaw(p, C.int(len(data))))
-	if ret != 0 {
+	if ret != len(data) {
 		return ret, fmt.Errorf("an error occurred while calling the C.MCU_SendRaw() function(%d)", ret)
 		return ret, fmt.Errorf("an error occurred while calling the C.MCU_SendRaw() function(%d)", ret)
 	}
 	}
 	return ret, nil
 	return ret, nil

+ 6 - 8
mcu_ctrl_board/proc_json.go

@@ -35,7 +35,7 @@ type ExtData struct {
 	Datetime string `json:"datetime"`  // 当前的日期时间
 	Datetime string `json:"datetime"`  // 当前的日期时间
 	Csq      string `json:"csq"`       // 4G网络信号强度
 	Csq      string `json:"csq"`       // 4G网络信号强度
 	Imei     string `json:"imei"`      // 设备IMEI///////////////////////
 	Imei     string `json:"imei"`      // 设备IMEI///////////////////////
-	PhotoSta string `json:"photo_sta"` // 相机状态:0-未检测到,1-已检测到/
+	PhotoSta string `json:"photo_sta"` // 相机状态:0-已检测到,1-未检测到/
 	LinkSta  string `json:"link_sta"`  // 连网方式:0-蜂窝网络,1-有线网络/
 	LinkSta  string `json:"link_sta"`  // 连网方式:0-蜂窝网络,1-有线网络/
 	CpuTmp   string `json:"cpu_tmp"`   // CPU当前温度,单位:℃ //////////
 	CpuTmp   string `json:"cpu_tmp"`   // CPU当前温度,单位:℃ //////////
 }
 }
@@ -81,8 +81,10 @@ func getSyncData() SyncData {
 	}
 	}
 
 
 	photoSta := "0"
 	photoSta := "0"
-	if hk, dh, err := local_rpc.GetCameraCount(ctx); err == nil && hk+dh > 0 {
-		photoSta = "1"
+	if !GlobalWorkState.Has(BitmapCapturing) { // 如果当前没有在拍照, 则检测相机状态
+		if hk, dh, err := local_rpc.GetCameraCount(ctx); err != nil || hk+dh <= 0 {
+			photoSta = "1"
+		}
 	}
 	}
 
 
 	cpuTmp := "0.0"
 	cpuTmp := "0.0"
@@ -131,11 +133,7 @@ func processJson(jsonStr string) *C.char {
 			return errorToCChar(err)
 			return errorToCChar(err)
 		}
 		}
 
 
-		if err := Board.WriteDataToUart(data); err != nil {
-			return errorToCChar(err)
-		}
-
-		return nil
+		return C.CString(string(data))
 	}
 	}
 
 
 	var err error
 	var err error

+ 48 - 0
mcu_ctrl_board/workstate.go

@@ -0,0 +1,48 @@
+package mcu_ctrl_board
+
+import "sync"
+
+// 定义_RTU_数据板的工作状态
+type WorkState uint32
+
+const (
+	Idle            WorkState = 0      // 空闲(默认)
+	BitmapCapturing WorkState = 1 << 0 // 当前相机图像-拍照中
+)
+
+// RTU数据板的工作状态管理器
+type WorkStateMgr struct {
+	mu    sync.RWMutex
+	state WorkState
+}
+
+var GlobalWorkState = &WorkStateMgr{state: Idle}
+
+// 工作状态管理-添加一个状态
+func (mgr *WorkStateMgr) Add(s WorkState) {
+	mgr.mu.Lock()
+	defer mgr.mu.Unlock()
+	mgr.state |= s
+}
+
+// 工作状态管理-清除一个状态
+func (mgr *WorkStateMgr) Remove(s WorkState) {
+	mgr.mu.Lock()
+	defer mgr.mu.Unlock()
+	mgr.state &^= s
+}
+
+// 工作状态管理-获取当前状态
+// 判断某个状态是否存在
+func (mgr *WorkStateMgr) Get() WorkState {
+	mgr.mu.RLock()
+	defer mgr.mu.RUnlock()
+	return mgr.state
+}
+
+// 工作状态管理-状态是否存在
+func (mgr *WorkStateMgr) Has(s WorkState) bool {
+	mgr.mu.RLock()
+	defer mgr.mu.RUnlock()
+	return mgr.state&s != 0
+}

+ 4 - 4
mqtt_reporter/config.go

@@ -69,9 +69,9 @@ const defaultConfig = `{
       "password": "f335bf402c655ee5fd2b5300905124e",
       "password": "f335bf402c655ee5fd2b5300905124e",
 			"qos": 1,
 			"qos": 1,
       "topics": {
       "topics": {
-        "pub": "/yfkj/cbd/pub/${id}/",
-        "sub": "/yfkj/cbd/sub/${id}/",
-        "offline": "/yfkj/cbd/offline/${id}/"
+        "pub": "/yfkj/cbd/pub/${id}",
+        "sub": "/yfkj/cbd/sub/${id}",
+        "offline": "/yfkj/cbd/offline/${id}"
       }
       }
     }
     }
   ],
   ],
@@ -80,7 +80,7 @@ const defaultConfig = `{
       "enable": true,
       "enable": true,
 			"name": "YFKJ-CBD-IMG-FTP-SERVER",
 			"name": "YFKJ-CBD-IMG-FTP-SERVER",
 			"imagBackfill": true,
 			"imagBackfill": true,
-      "putUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/${id}/"
+      "putUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/${id}"
     }
     }
   ],
   ],
   "upgrServers": [
   "upgrServers": [

+ 5 - 1
mqtt_reporter/photo.go

@@ -10,6 +10,7 @@ import (
 
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
 	mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
 	mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
 	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
@@ -43,6 +44,9 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
 	s := time.Now()
 	s := time.Now()
 	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, s.Format("20060102-150405")))
 	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, s.Format("20060102-150405")))
 
 
+	mcu_ctrl_board.GlobalWorkState.Add(mcu_ctrl_board.BitmapCapturing)
+	defer mcu_ctrl_board.GlobalWorkState.Remove(mcu_ctrl_board.BitmapCapturing)
+
 	_, err := local_rpc.TakePhoto(r.ctx, imgFile)
 	_, err := local_rpc.TakePhoto(r.ctx, imgFile)
 	if err != nil {
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
 		baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
@@ -55,7 +59,7 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
 	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 		"takephotodone.wav")) // 播报拍照完成语音
 		"takephotodone.wav")) // 播报拍照完成语音
 
 
-	r.uploadPhotoToImagServers(imgFile, false)
+	go r.uploadPhotoToImagServers(imgFile, false)
 
 
 	return true
 	return true
 }
 }