Преглед изворни кода

去掉不必要的升级锁,使用工作状态代替更合适,升级过程中,屏蔽大数据平台下发的一切指令,直到升级完成

niujiuru пре 1 недеља
родитељ
комит
6cbae27589

+ 0 - 1
mcu_ctrl_board/mcu_ctrl_board.go

@@ -21,7 +21,6 @@ type MCUCtrlBoard struct {
 	DataToMqttCh   chan []byte   // 数据转发给服务器
 	DataToMqttCh   chan []byte   // 数据转发给服务器
 	DataToUartCh   chan []byte   // 数据转发给控制板
 	DataToUartCh   chan []byte   // 数据转发给控制板
 	RequestPhotoCh chan struct{} // 请求相机开始拍照
 	RequestPhotoCh chan struct{} // 请求相机开始拍照
-	upgradeMu      sync.Mutex    // 固件升级的互斥锁
 	uartUseMu      sync.Mutex    // 串口访问的互斥锁
 	uartUseMu      sync.Mutex    // 串口访问的互斥锁
 	extInfo        InitInfo      // 模块的初始化信息
 	extInfo        InitInfo      // 模块的初始化信息
 }
 }

+ 6 - 2
mcu_ctrl_board/upgrade_hmi.go

@@ -20,16 +20,17 @@ const (
 
 
 // 开始HMI屏幕固件升级(异步协程执行)
 // 开始HMI屏幕固件升级(异步协程执行)
 func StartHMIUpgrade(filePath string, completeCallback func(any, error), callbackArg any) error {
 func StartHMIUpgrade(filePath string, completeCallback func(any, error), callbackArg any) error {
-	if !Board.upgradeMu.TryLock() {
+	if GlobalWorkState.Has(SystemUpgrading) {
 		return fmt.Errorf("upgrade busy")
 		return fmt.Errorf("upgrade busy")
 	}
 	}
 
 
 	go func() {
 	go func() {
 		defer func() {
 		defer func() {
 			os.Remove(filePath) // 升级完成后删除文件
 			os.Remove(filePath) // 升级完成后删除文件
-			Board.upgradeMu.Unlock()
+			GlobalWorkState.Remove(SystemUpgrading)
 		}()
 		}()
 
 
+		GlobalWorkState.Add(SystemUpgrading)
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", /// 播报升级开始语音
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", /// 播报升级开始语音
 			"startupdate.wav"))
 			"startupdate.wav"))
 
 
@@ -38,6 +39,9 @@ func StartHMIUpgrade(filePath string, completeCallback func(any, error), callbac
 		baseapp.Logger.Warnf("#############   HMI FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("#############   HMI FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("##########################################################")
 
 
+		Board.uartUseMu.Lock()
+		defer Board.uartUseMu.Unlock()
+
 		err := startHMIUpgrade(filePath)
 		err := startHMIUpgrade(filePath)
 		if err == nil {
 		if err == nil {
 			err = sendFilePackets(filePath)
 			err = sendFilePackets(filePath)

+ 3 - 2
mcu_ctrl_board/upgrade_mcu.go

@@ -46,7 +46,7 @@ func sendMCUUpgradeResult(err error) {
 }
 }
 
 
 func StartMCUUpgrade(filePath string) error {
 func StartMCUUpgrade(filePath string) error {
-	if !Board.upgradeMu.TryLock() {
+	if GlobalWorkState.Has(SystemUpgrading) {
 		return fmt.Errorf("upgrade busy")
 		return fmt.Errorf("upgrade busy")
 	}
 	}
 
 
@@ -55,9 +55,10 @@ func StartMCUUpgrade(filePath string) error {
 		defer func() {
 		defer func() {
 			os.Remove(filePath) // 升级完成后删除文件
 			os.Remove(filePath) // 升级完成后删除文件
 			sendMCUUpgradeResult(upgradeErr)
 			sendMCUUpgradeResult(upgradeErr)
-			Board.upgradeMu.Unlock()
+			GlobalWorkState.Remove(SystemUpgrading)
 		}()
 		}()
 
 
+		GlobalWorkState.Add(SystemUpgrading)
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			"startupdate.wav")) //// 播报升级开始语音
 			"startupdate.wav")) //// 播报升级开始语音
 
 

+ 1 - 0
mcu_ctrl_board/workstate.go

@@ -8,6 +8,7 @@ type WorkState uint32
 const (
 const (
 	Idle            WorkState = 0      // 空闲(默认)
 	Idle            WorkState = 0      // 空闲(默认)
 	BitmapCapturing WorkState = 1 << 0 // 图像采集(拍照)中
 	BitmapCapturing WorkState = 1 << 0 // 图像采集(拍照)中
+	SystemUpgrading WorkState = 1 << 1 // 系统(固件)升级中
 )
 )
 
 
 // RTU数据板的工作状态管理器
 // RTU数据板的工作状态管理器

+ 13 - 3
mqtt_reporter/yfkj_handler.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
+	"strings"
 
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -15,6 +16,12 @@ import (
 )
 )
 
 
 func yfkj_handleMessage(client *Client, msg mqtt.Message) {
 func yfkj_handleMessage(client *Client, msg mqtt.Message) {
+	if mcu_ctrl_board.GlobalWorkState.Has(mcu_ctrl_board.SystemUpgrading) {
+		data, _ := json.Marshal(map[string]string{"result": "系统升级中, 忽略当前消息指令, 请稍后重试"})
+		yfkj_sendResponse(client, string(data))
+		return
+	}
+
 	if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
 	if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
 		if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
 		if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
 			baseapp.Logger.Warnf("[%s] 清除MQTT服务器 %s 主题 %s 的Retained消息失败: %v!",
 			baseapp.Logger.Warnf("[%s] 清除MQTT服务器 %s 主题 %s 的Retained消息失败: %v!",
@@ -166,6 +173,9 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 		data, _ := json.Marshal(map[string]string{"result": "rtu start upgrading..."})
 		data, _ := json.Marshal(map[string]string{"result": "rtu start upgrading..."})
 		yfkj_sendResponse(client, string(data))
 		yfkj_sendResponse(client, string(data))
 
 
+		mcu_ctrl_board.GlobalWorkState.Add(mcu_ctrl_board.SystemUpgrading)
+		defer mcu_ctrl_board.GlobalWorkState.Remove(mcu_ctrl_board.SystemUpgrading)
+
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			"startupdate.wav")) ////// 播报开始升级语音
 			"startupdate.wav")) ////// 播报开始升级语音
 
 
@@ -252,11 +262,11 @@ func yfkj_onHMIUpgradeComplete(arg any, err error) {
 }
 }
 
 
 func yfkj_notifyUpgradeResult(client *Client, name string, err error) {
 func yfkj_notifyUpgradeResult(client *Client, name string, err error) {
-	result := name + " upgrade success"
+	event := strings.ToUpper(name) + "固件升级成功"
 	if err != nil {
 	if err != nil {
-		result = name + " upgrade failed: " + err.Error()
+		event = strings.ToUpper(name) + "固件升级失败:" + err.Error()
 	}
 	}
 
 
-	data, _ := json.Marshal(map[string]string{"result": result})
+	data, _ := json.Marshal(map[string]string{"event": event})
 	yfkj_sendResponse(client, string(data))
 	yfkj_sendResponse(client, string(data))
 }
 }