niujiuru пре 3 недеља
родитељ
комит
6025d574d2

+ 2 - 2
main.go

@@ -141,10 +141,10 @@ func (p *program) Stop(s service.Service) error {
 		_ = p.http_server.Shutdown(ctx)
 	}
 
-	mcu_ctrl_board.ModuleExit()
-
 	mqtt_reporter.ModuleExit()
 
+	mcu_ctrl_board.ModuleExit()
+
 	baseapp.Logger.Infof("[%s] 程序退出", p.name)
 	baseapp.ExitLogger()
 	return nil

+ 4 - 3
mcu_ctrl_board/mcu_ctrl_board.go

@@ -23,7 +23,7 @@ type MCUCtrlBoard struct {
 	RequestPhotoCh chan struct{} // 请求相机开始拍照
 	upgradeMu      sync.Mutex    // 固件升级的互斥锁
 	uartUseMu      sync.Mutex    // 串口访问的互斥锁
-	extInfo        InitInfo      // 控制板初始化信息
+	extInfo        InitInfo      // 模块的初始化信息
 }
 
 type InitInfo struct {
@@ -39,7 +39,7 @@ func ModuleInit(info InitInfo) bool {
 			extInfo: info,
 		}
 
-		Board.StartUartWriter() ///// 启动串口数据转发
+		Board.StartUartWriter() ///// 串口数据转发协程
 	})
 
 	var err error
@@ -52,7 +52,8 @@ func ModuleInit(info InitInfo) bool {
 		time.Sleep(time.Second)
 	}
 	if err != nil {
-		baseapp.Logger.Errorf("[%s] 打开与MCU控制板通信的串口失败: %v!!", MODULE_NAME, err)
+		baseapp.Logger.Errorf("[%s] 打开与MCU控制板通信的串口失败: %v!!",
+			MODULE_NAME, err)
 		return false
 	}
 

+ 4 - 1
mcu_ctrl_board/proc_json.go

@@ -9,9 +9,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 	"strings"
 	"time"
 
+	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 )
@@ -141,7 +143,8 @@ func processJson(jsonStr string) *C.char {
 	switch req.Cmd {
 	case "data", "warn":
 		if strings.Contains(jsonStr, "system will update") { ////// MCU控制板YMODEM升级
-			err = StartMCUUpgrade()
+			filePath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
+			err = StartMCUUpgrade(filePath)
 			break
 		}
 

+ 1 - 1
mcu_ctrl_board/upgrade_hmi.go

@@ -24,7 +24,7 @@ func StartHMIUpgrade(filePath string) error {
 
 	go func() {
 		defer func() {
-			os.Remove(filePath) // 升级完成后删除升级文件
+			os.Remove(filePath) // 升级完成后删除文件
 			Board.upgradeMu.Unlock()
 		}()
 

+ 6 - 6
mcu_ctrl_board/upgrade_mcu.go

@@ -3,21 +3,21 @@ package mcu_ctrl_board
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/ymodem"
 )
 
-func StartMCUUpgrade() error {
+func StartMCUUpgrade(filePath string) error {
 	if !Board.upgradeMu.TryLock() {
 		return fmt.Errorf("upgrade busy")
 	}
-	defer Board.upgradeMu.Unlock()
 
-	filePath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
-	defer os.Remove(filePath) //升级完成后删除升级文件
+	defer func() {
+		os.Remove(filePath) /////// 升级完成后删除
+		Board.upgradeMu.Unlock()
+	}()
 
 	info, err := os.Stat(filePath)
 	if err != nil {
@@ -44,7 +44,7 @@ func StartMCUUpgrade() error {
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
 
-	size := ymodem.Send_file(filePath) // 2-使用ymodem发送升级文件
+	size := ymodem.Send_file(filePath) /// 2-使用ymodem发送升级文件
 	if size <= 0 || size != int(fileSize) {
 		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", size, fileSize)
 	} else {

+ 5 - 1
mqtt_reporter/photo.go

@@ -135,6 +135,10 @@ func (r *MQTTReporter) pruneHistoryPhotos(dir string, maxCount int) error {
 	var jpgFiles []fileInfo
 
 	for _, f := range files { // 遍历目录, 找出所有jpg文件
+		if r.ctx.Err() != nil {
+			return nil
+		}
+
 		if f.IsDir() || filepath.Ext(f.Name()) != ".jpg" {
 			continue
 		}
@@ -158,7 +162,7 @@ func (r *MQTTReporter) pruneHistoryPhotos(dir string, maxCount int) error {
 
 	sort.Slice(jpgFiles, func(i, j int) bool {
 		if jpgFiles[i].modTime.Equal(jpgFiles[j].modTime) {
-			return jpgFiles[i].name < jpgFiles[j].name // 如果时间相同, 则按文件名排序
+			return jpgFiles[i].name < jpgFiles[j].name //////////// 如果时间相同就按文件名排序
 		}
 		return jpgFiles[i].modTime.Before(jpgFiles[j].modTime) // 默认按照文件的修改时间排序
 	})

+ 1 - 1
mqtt_reporter/reporter.go

@@ -110,7 +110,7 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
 	}
 
 	qos := DefaultQoS
-	if server.Qos == MqttQos0 || server.Qos == MqttQos1 || server.Qos == MqttQos2 {
+	if server.Qos <= MqttQos2 {
 		qos = server.Qos
 	}