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

1, 支持MCU升级; 2, 加入远程运维服务支持; 3, 整体替换最新的SHELL控制脚本; 4, 其它逻辑代码优化

niujiuru 8 месяцев назад
Родитель
Сommit
456d4efd18

+ 7 - 1
Makefile

@@ -54,12 +54,17 @@ libair530z.a :
 libec200u.a :
 	$(MAKE) -C $(RTU_LINUX_MODULES_PATH)/ec200u target=$(target)  $@
 
+## "YMODEM"
+libymodem.a :
+	$(MAKE) -C $(RTU_LINUX_MODULES_PATH)/ymodem target=$(target)  $@
+
 # 单片机MCU
 libmcu_ctrl_board.a :
 	$(MAKE) -C mcu_ctrl_board target=$(target) $@
 
 LIBS := -Wl,-Bstatic -L$(RTU_LINUX_MODULES_PATH)/swapi -lswapi -L$(RTU_LINUX_MODULES_PATH)/hk_takephoto -lhk_takephoto
 LIBS += -L$(RTU_LINUX_MODULES_PATH)/air720u -lair720u -L$(RTU_LINUX_MODULES_PATH)/air530z -lair530z -L$(RTU_LINUX_MODULES_PATH)/ec200u -lec200u
+LIBS += -L$(RTU_LINUX_MODULES_PATH)/ymodem -lymodem
 LIBS += -L./mcu_ctrl_board -lmcu_ctrl_board
 ifeq ($(target),armv7hf)
   LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(RTU_LINUX_MODULES_PATH)/hk_takephoto/lib/armv7hf/. -lMvCameraControl
@@ -68,7 +73,7 @@ else
 endif
 
 # 可执行程序
-rtu_sy_1a.out : libswapi.a libhk_takephoto.a libair720u.a libair530z.a libec200u.a libmcu_ctrl_board.a ./main.go
+rtu_sy_1a.out : libswapi.a libhk_takephoto.a libair720u.a libair530z.a libec200u.a libymodem.a libmcu_ctrl_board.a ./main.go
 	mkdir -p ./build
 	$(GO) mod tidy
 	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
@@ -81,5 +86,6 @@ clean :
 	make -C $(RTU_LINUX_MODULES_PATH)/air720u clean
 	make -C $(RTU_LINUX_MODULES_PATH)/air530z clean
 	make -C $(RTU_LINUX_MODULES_PATH)/ec200u  clean
+	make -C $(RTU_LINUX_MODULES_PATH)/ymodem  clean
 	make -C ./mcu_ctrl_board clean
 	rm -rf ./*.a ./*.out ./build

+ 1 - 1
config.ini

@@ -10,7 +10,7 @@ MaxBackupFileCnts = 1
 
 [MQTTSrv]
 ; 地址端口
-BrokerAddress = tcp://www.hnyfwlw.com:61883
+BrokerAddress = tcp://8.136.98.49:61883
 ; 用户名称
 Username = user
 ; 接入密码

BIN
docs/星火MCU控制板通讯协议251226.docx


+ 13 - 0
main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	gps "hnyfkj.com.cn/rtu/linux/air530z"
@@ -110,6 +111,7 @@ func main() {
 	// 03, 初始化网络管理模块
 	netmgrd.ModuleInit()
 	netmgrd.WaitAllOK(time.Duration(10) * time.Second) // 等待联网成功和NTP时间同步成功
+	go writeDeviceIMEI()
 
 	// 04, 初始化相机拍照模块
 	if !camera1.ModuleInit() {
@@ -153,3 +155,14 @@ func help() {
 
 	fmt.Println(h)
 }
+
+func writeDeviceIMEI() {
+	for {
+		imei := netmgrd.GetIMEI()
+		if imei == netmgrd.ErrUnknownModemTypeMsg || imei == "" {
+			continue
+		}
+		os.WriteFile("/var/device_imei.txt", []byte(strings.TrimSpace(imei)+"\n"), 0644)
+		break
+	}
+}

+ 10 - 0
mcu_ctrl_board/mcb_test.c

@@ -50,6 +50,16 @@ int RTU_NotifyPwrWillOff()
   return 0;
 }
 
+int MCU_IsNeedUpgrade(const char *ver)
+{
+  return 0;
+}
+
+int MCU_UpgradeFirmware()
+{
+  return 0;
+}
+
 // 主函数入口, 测试拍照
 int main(int argc,char *argv[])
 {

+ 30 - 4
mcu_ctrl_board/mcu_ctrl_board.c

@@ -58,6 +58,13 @@ extern int RTU_LoadMCUParamsCfg(); // 0成功, <0时失败
 // 声明Go中通知RTU进行一次掉电关机的函数(Go实现, 供C/C++调用)
 extern int RTU_NotifyPwrWillOff(); // 0成功, <0时失败
 
+// 声明Go中判断MCU固件是否需要升级的函数(Go实现, 供C/C++调用)
+// 返回: 0不需要升级, 1需要升级
+extern int MCU_IsNeedUpgrade(const char *ver/*当前的固件版本*/);
+
+// 声明Go中升级MCU固件的函数(强制覆盖写, Go实现, 供C/C++调用)
+extern int MCU_UpgradeFirmware(); // 0成功, <0时失败
+
 // 反转字节, 可用于处理大小端字节序的相互转换,"n"不必是2的倍数
 static inline void swap_bytes(char *a, size_t n)
 {
@@ -114,7 +121,7 @@ static int comio_data_recv_proc(unsigned long wParam/*传递打开的串口句
   const unsigned char *pRecvBuf = serial_get_recv_buffer(pSerial); int nRecvBytes = serial_get_recv_buffer_bytes(pSerial);
   const char *log_prefix = serial_get_log_prefix(pSerial); int ret; bool bPrintRecvBuf = true;
   unsigned char *req = NULL; int nReqBytes; u_int16_t crc1, crc2, crc3; int nReqDataLen;
-  unsigned char sendBuf[MAX_LINE_CHARS] = { 0 }; int nSendBytes;
+  unsigned char sendBuf[MAX_LINE_CHARS] = { 0 }; int nSendBytes; bool is_mcu_need_upgrade = false;
   unsigned char *rsp = NULL; int nRspBytes; char log_rsp[MAX_LINE_CHARS] = { 0 }; static bool bTakenPhoto = false; /*标记本次是否已拍照*/
 
   // 0, 判定接收有效的请求帧
@@ -267,6 +274,20 @@ ret_p1:
 
     nSendBytes = sizeof(tmpBuf6); memcpy(sendBuf, tmpBuf6, nSendBytes);
     goto ret_p2;
+  case 0x07: // MCU请求RTU, 升级固件
+    if(nReqDataLen != 5) { sw_log_error("[%s] %s received a request with invalid data length!!", MODULE_NAME, log_prefix); goto ret_p3; }
+
+    unsigned char ver1 = req[4], ver2 = req[5], ver3 = req[6], ver4 = req[7];
+    char version[MAX_LINE_CHARS]; sprintf(version, "%u.%u.%u.%u", ver1, ver2, ver3, ver4);
+
+    unsigned char tmpBuf7[7] = { 0x7D, 0x01, 0x07, 0x00, 0x00, 0x00, 0x7E }; // 默认不需要升级
+    if(MCU_IsNeedUpgrade(version) == 1) { tmpBuf7[3] = 0x01;/* 需要升级 */ is_mcu_need_upgrade = true; }
+
+    crc3 = CRC16(tmpBuf7+1, 3);
+    memcpy(&tmpBuf7[4], &crc3, 2); // 小端字节序
+  
+    nSendBytes = sizeof(tmpBuf7); memcpy(sendBuf, tmpBuf7, nSendBytes);
+    goto ret_p2;
   default:
     sw_log_warn("[%s] %s unknown a data req(type=0x%02x)!", MODULE_NAME, log_prefix, req[2]);
     goto ret_p3;
@@ -284,7 +305,11 @@ ret_p2:
   xstrfromhex(rsp, nRspBytes, log_rsp, NULL, NULL);
   ret = serial_send_data(pComIO->h, rsp, nRspBytes);
   if(ret == nRspBytes) sw_log_debug("[%s] %s sent a response(%d bytes)(hex): %s", MODULE_NAME, log_prefix, nRspBytes, log_rsp);
-  else sw_log_error("[%s] %s failed to send a response(%d bytes, ret=%d)(hex): %s!!", MODULE_NAME, log_prefix, nRspBytes, ret, log_rsp);
+  else { sw_log_error("[%s] %s failed to send a response(%d bytes, ret=%d)(hex): %s!!", MODULE_NAME, log_prefix, nRspBytes, ret, log_rsp); goto ret_p3; }
+
+  if(req[2] == 0x07 && is_mcu_need_upgrade) {
+    MCU_UpgradeFirmware(); // 强制覆盖写, 升级MCU固件(异步执行)
+  }
 
   // 3, 清空接收缓存区(重置)
 ret_p3:
@@ -292,7 +317,7 @@ ret_p3:
   if(rsp) sw_heap_free(rsp);
   if(nRecvBytes > 0 && bPrintRecvBuf)
   {
-    serial_printf_recv_buffer(pSerial, LEVEL_TRACE);
+    serial_printf_recv_buffer(pSerial, LEVEL_DEBUG);
     sw_log_warn("[%s] %s discarded %d bytes of meaningless data!", MODULE_NAME, log_prefix, nRecvBytes);
   }
   if(nRecvBytes > 0) serial_clear_recv_buffer(pSerial);
@@ -337,7 +362,8 @@ int MCBComExit()
   if(s_myCom.h) serial_close(s_myCom.h, WAITTHRD_SAFEEXIT_TIMEOUT);
   if(s_myCom.state_rwlock) sw_rwlock_destroy(s_myCom.state_rwlock);
   if(s_myCom.edata_rwlock) sw_rwlock_destroy(s_myCom.edata_rwlock);
-  memset(&s_myCom, 0, sizeof(s_myCom));
+  s_myCom.h = NULL; s_myCom.state_rwlock = NULL; s_myCom.edata_rwlock = NULL;
+  memset(&s_myCom.data, 0, sizeof(s_myCom.data));
   return 0;
 }
 

+ 102 - 16
mcu_ctrl_board/mcu_ctrl_board.go

@@ -7,12 +7,16 @@ import "C"
 import (
 	"encoding/binary"
 	"fmt"
+	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 	"unsafe"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/ymodem"
 )
 
 const (
@@ -40,24 +44,30 @@ type MCUCtrlBoard struct {
 	EnvDataOneCh chan EnvData   // 单条环境数据
 	EnvDataGrpCh chan []EnvData // 一组环境数据
 	ReqTakePhoCh chan bool      // 请求开始拍照
-	PwrWillOffCh chan struct{}  // 通知即将掉电
+	pwrWillOffCh chan struct{}  // 通知即将掉电
+	mcuUpgradeCh chan struct{}  // 控制板的升级
 }
 
 // 初始化MCU控制板
 func ModuleInit() bool {
-	once.Do(func() { // 只允许创建单一实例
+	once.Do(func() { /////// 只允许创建单一实例
 		Board = &MCUCtrlBoard{
 			EnvDataOneCh: make(chan EnvData, 1),
 			EnvDataGrpCh: make(chan []EnvData, 1),
 			ReqTakePhoCh: make(chan bool, 1),
-			PwrWillOffCh: make(chan struct{}),
+			pwrWillOffCh: make(chan struct{}, 1),
+			mcuUpgradeCh: make(chan struct{}, 1),
 		}
 	})
 
+	needUpgrade, fwPath, fwSize := isBoardNeedUpgrade()
+	if needUpgrade { // 异步执行升级控制板的固件
+		go startBoardUpgrade(fwPath, fwSize)
+	}
+
 	err := loadCfgParams()
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 加载MCU运行参数配置项失败: %v!!", MODULE_NAME, err)
-		return false
 	}
 
 	var ret int
@@ -88,10 +98,47 @@ func ModuleExit() {
 
 // 通知MCU准备掉电
 func NotifyPwrWillOff() <-chan struct{} {
-	if Board == nil || Board.PwrWillOffCh == nil {
+	if Board == nil || Board.pwrWillOffCh == nil {
 		return nil
 	}
-	return Board.PwrWillOffCh
+	return Board.pwrWillOffCh
+}
+
+// 是否升级MCU固件
+func isBoardNeedUpgrade() (bool, string, int64) {
+	name := filepath.Join(baseapp.EXEC_DIR, "mcu_firmware.bin") // 升级文件
+	info, err := os.Stat(name)                                  // 文件信息
+	if err == nil && info.Size() > 0 {
+		return true, name, info.Size()
+	}
+	return false, "", -1
+}
+
+// 执行升级MCU固件
+func startBoardUpgrade(fwPath string, fwSize int64) {
+	<-Board.mcuUpgradeCh
+
+	baseapp.Logger.Warnf("====[ MCU UPGRADE PREPARE ]==== [%s] stop MCU communication", MODULE_NAME)
+	ModuleExit()                       // 先退出MCU控制板的通信
+	time.Sleep(100 * time.Millisecond) /// 延时等待串口安全关闭
+
+	baseapp.Logger.Warnf("")
+	baseapp.Logger.Warnf("############################################################")
+	baseapp.Logger.Warnf("##############   MCU FIRMWARE UPGRADE START   ##############")
+	baseapp.Logger.Warnf("############################################################")
+	baseapp.Logger.Warnf("[%s] fw=%s size=%d", MODULE_NAME, fwPath, fwSize)
+
+	bytes := ymodem.Send_file(fwPath)
+
+	if bytes > 0 && bytes == int(fwSize) {
+		baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]==== [%s] %d bytes written", MODULE_NAME, bytes)
+	} else {
+		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!! [%s] written=%d expect=%d", MODULE_NAME, bytes, fwSize)
+	}
+	os.Remove(fwPath) // 升级完成后删除固件文件(避免引起反复升级)
+
+	baseapp.Logger.Warnf("====[ MCU UPGRADE DONE ]==== [%s] restart MCU communication", MODULE_NAME)
+	ModuleInit()
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -148,9 +195,12 @@ func RTU_SendGrpEnvData(pGrpData *C.EnvSensorData, cnt C.int) C.int {
 	select {
 	case Board.EnvDataGrpCh <- dataGrp:
 	default:
-		olds := <-Board.EnvDataGrpCh // 弹出旧数据
-		for index, old := range olds {
-			baseapp.Logger.Warnf("GropEnvData 通道满, 丢弃一组老数据: [%02d]: %s!", index+1, old.LogString())
+		select {
+		case olds := <-Board.EnvDataGrpCh: // 尝试弹出旧数据, 也有可能刚好被消费者消费掉
+			for index, old := range olds {
+				baseapp.Logger.Warnf("GropEnvData 通道满, 丢弃一组老数据: [%02d]: %s!", index+1, old.LogString())
+			}
+		default:
 		}
 		Board.EnvDataGrpCh <- dataGrp
 	}
@@ -171,8 +221,11 @@ func RTU_SendOneEnvData(pOneData *C.EnvSensorData) C.int {
 	select {
 	case Board.EnvDataOneCh <- dataOne:
 	default:
-		old := <-Board.EnvDataOneCh // 弹出旧数据
-		baseapp.Logger.Warnf("OneEnvData 通道满, 丢弃一条老数据: %s!", old.LogString())
+		select {
+		case old := <-Board.EnvDataOneCh: // 尝试弹出旧数据, 也有可能刚好被消费者消费掉
+			baseapp.Logger.Warnf("OneEnvData 通道满, 丢弃一条老数据: %s!", old.LogString())
+		default:
+		}
 		Board.EnvDataOneCh <- dataOne
 	}
 
@@ -187,9 +240,7 @@ func RTU_RequestTakePhoto() C.int {
 
 	select {
 	case Board.ReqTakePhoCh <- true:
-	default:
-		<-Board.ReqTakePhoCh // 弹出旧数据
-		Board.ReqTakePhoCh <- true
+	default: // 之前的拍照请求还没被处理, 忽略掉新的拍照请求
 	}
 
 	return 0
@@ -212,9 +263,44 @@ func RTU_LoadMCUParamsCfg() C.int {
 
 //export RTU_NotifyPwrWillOff
 func RTU_NotifyPwrWillOff() C.int {
-	if Board == nil || Board.PwrWillOffCh == nil {
+	if Board == nil || Board.pwrWillOffCh == nil {
+		return -1
+	}
+
+	select {
+	case Board.pwrWillOffCh <- struct{}{}:
+	default: // 之前的掉电通知还没被处理, 忽略掉新的掉电通知
+	}
+
+	return 0
+}
+
+//export MCU_IsNeedUpgrade
+func MCU_IsNeedUpgrade(ver *C.char) C.int {
+	version := C.GoString(ver)
+	if version != "" { // 存储MCU当前的版本号
+		os.WriteFile(filepath.Join(baseapp.VAR_DIR, "mcu_firmware_version.txt"),
+			[]byte(strings.TrimSpace(version)+"\n"), 0644)
+	}
+
+	needUpgrade, _, _ := isBoardNeedUpgrade()
+	if needUpgrade {
+		return 1
+	}
+
+	return 0
+}
+
+//export MCU_UpgradeFirmware
+func MCU_UpgradeFirmware() C.int {
+	if Board == nil || Board.mcuUpgradeCh == nil {
 		return -1
 	}
-	close(Board.PwrWillOffCh)
+
+	select {
+	case Board.mcuUpgradeCh <- struct{}{}:
+	default: // 之前的升级请求还没被处理, 忽略掉新的升级请求
+	}
+
 	return 0
 }

+ 2 - 2
mcu_ctrl_board/mcuparams.ini

@@ -6,8 +6,8 @@ CtrlMode = 1
 ; 光控定时时长(单位: 小时, 范围: 1-10, 仅光控模式有效)
 LightDuration = 10
 ; 时控开始时间(小时, 0-23, 一天24小时, 仅时控模式有效)
-StartHour = 8
+StartHour = 11
 ; 时控结束时间(小时, 0-23, 一天24小时, 仅时控模式有效)
-EndHour = 18
+EndHour = 12
 ; 拍照间隔(分钟,其值不得超过当前控制模式下允许的最大值)
 TakePhotoIntervalMinutes = 60

+ 2 - 2
mcu_ctrl_board/params_cfg.go

@@ -24,8 +24,8 @@ var (
 		Version:           "0.0.0.1",
 		CtrlMode:          1,
 		LightDuration:     10,
-		StartHour:         0,
-		EndHour:           23,
+		StartHour:         11,
+		EndHour:           12,
 		TakePhotoInterval: 60,
 	}
 	mu sync.Mutex

+ 9 - 2
package/armv7hf.sh

@@ -41,7 +41,14 @@ else
  echo "  Skipping hkcam_reset build (not U-port camera)!"
 fi
 
-echo "5, Building ${pkgname}..."
+echo "4, Building yfkj sshd..."
+cp -rf "${RTU_LINUX_MODULES_PATH}/sshd/server/sshd_cfg.ini" "${pkg_dir}/config/"
+make -C "${RTU_LINUX_MODULES_PATH}" clean
+make -C "${RTU_LINUX_MODULES_PATH}" target=armv7hf yfkj_sshd.out
+cp -rf "${RTU_LINUX_MODULES_PATH}/yfkj_sshd.out" "${pkg_dir}/"
+make -C "${RTU_LINUX_MODULES_PATH}" clean
+
+echo "6, Building ${pkgname}..."
 cd ${pre_dir}
 make -C "${pre_dir}" clean
 make -C "${pre_dir}" target=armv7hf
@@ -49,7 +56,7 @@ cd ${cur_dir}
 cp -rf "${pre_dir}/${pkgname}.out" "${pkg_dir}/"
 make -C "${pre_dir}" clean
 
-echo "6, Packaging into ${pkg_tar}..."
+echo "7, Packaging into ${pkg_tar}..."
 tar -czvf "${pkg_tar}" -C "${cur_dir}" "${pkg_dir##*/}"
 
 # 清理临时目录

+ 1 - 1
reporter/envdata.go

@@ -155,7 +155,7 @@ func (r *MQTTReporter) reportSensorData(data any) (int, error) {
 		return 0, errors.New("无效的数据类型, not StrEnv or []StrEnv")
 	}
 
-	if cnt == 0 { // 没有历史环境数据
+	if cnt == 0 { // 没有要上报的数据
 		return 0, nil
 	} else if err != nil { // 有错误
 		return 0, err

+ 25 - 13
reporter/reporter.go

@@ -4,6 +4,7 @@ import "C"
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -88,7 +89,7 @@ func ModuleInit() bool {
 		registerRpcMeths: &singletask.OnceTask{},
 	}
 
-	Reporter.init()                  // 1, Reporter执行初始化,开始就要调用
+	Reporter.init2()                 // 1, Reporter执行初始化,开始就要调用
 	go Reporter.keepOnline()         // 2, Reporter主处理循环,维持登录状态
 	go Reporter.loopTakePhoto()      // 3, 循环处理控制板发来的相机拍照请求
 	go Reporter.loopRecvOneEnvData() // 4, 循环处理控制板发来的单条环境数据
@@ -103,7 +104,7 @@ func ModuleExit() {
 	}
 }
 
-func (r *MQTTReporter) init() {
+func (r *MQTTReporter) init2() {
 	logoutNotif, _ := makeLogoutNotif(netmgrd.GetIMEI())
 
 	opts := mqtt.NewClientOptions().
@@ -347,7 +348,13 @@ func (r *MQTTReporter) instRPCMethods() {
 }
 
 func (r *MQTTReporter) sendLoginReq() error {
-	loginReq, err := makeLoginReq(netmgrd.GetIMEI(), netmgrd.GetSimICCID(), netmgrd.GetRSSI(), baseapp.Version, r.inheritDUI)
+	fullVer := fmt.Sprintf("RTU Version: %s", baseapp.Version)
+	if FileExists(filepath.Join(baseapp.VAR_DIR, "mcu_firmware_version.txt")) {
+		mcuVerBytes, _ := os.ReadFile(filepath.Join(baseapp.VAR_DIR, "mcu_firmware_version.txt"))
+		mcuVerStr := strings.TrimSpace(string(mcuVerBytes))
+		fullVer = fmt.Sprintf("MCU Version: %s, RTU Version: %s", mcuVerStr, baseapp.Version)
+	}
+	loginReq, err := makeLoginReq(netmgrd.GetIMEI(), netmgrd.GetSimICCID(), netmgrd.GetRSSI(), fullVer, r.inheritDUI)
 	if err != nil {
 		return err
 	}
@@ -387,7 +394,7 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 	case "setMCUParams":
 		params, err := parseMCUParams(req.Params)
 		if err != nil {
-			resp = jsonrpc2.BuildError(req, -32700, err.Error())
+			resp = buildResp(req, nil, err)
 			goto retp
 		}
 
@@ -402,26 +409,31 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 		case 0: /// 光控
 			if cfgParams.LightDuration < 1 || cfgParams.LightDuration > 10 ||
 				cfgParams.TakePhotoInterval > cfgParams.LightDuration*60 {
-				resp = jsonrpc2.BuildError(req, -32700, "光控参数错误")
+				resp = buildResp(req, nil, errors.New("光控参数错误"))
 				goto retp
 			}
 		case 1: /// 时控
 			if cfgParams.StartHour < 0 || cfgParams.StartHour > 23 || cfgParams.EndHour < 0 || cfgParams.EndHour > 23 ||
 				cfgParams.StartHour > cfgParams.EndHour || cfgParams.TakePhotoInterval > (cfgParams.EndHour-cfgParams.StartHour)*60 {
-				resp = jsonrpc2.BuildError(req, -32700, "时控参数错误")
+				resp = buildResp(req, nil, errors.New("时控参数错误"))
 				goto retp
 			}
 		default: // 无效
 			if true {
-				resp = jsonrpc2.BuildError(req, -32700, "控制模式无效")
+				resp = buildResp(req, nil, errors.New("控制模式无效"))
 				goto retp
 			}
 		}
 
+		var reportcfgParams *mcu.Config
 		err = mcu.SaveCfgParams(&cfgParams)
-		if err == nil { // 上报当前配置, 单实例运行(平台侧不处理错误应答、错误时不回滚之前的配置, 就需要重新上报)
-			r.reportMcuCfgTask.Run(func() { r.reportMcuCfg(mcu.CfgParams) }, true)
+		if err != nil { // 上报当前配置, 单实例运行(平台侧不处理错误应答、错误时不回滚之前的配置, 就需要重新上报)
+			reportcfgParams = mcu.CfgParams // 原有配置
+		} else {
+			reportcfgParams = &cfgParams ///// 新的配置
 		}
+		r.reportMcuCfgTask.Run(func() { r.reportMcuCfg(reportcfgParams) }, true)
+
 		resp = buildResp(req, "Success", err)
 	// Call-2: 获取MCU控制板运行参数, 从文件读取
 	case "getMCUParams":
@@ -453,24 +465,24 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 
 			server, user, pass, rf, md5val1, err := parseUpgradeAppReq(req.Params)
 			if err != nil {
-				resp = jsonrpc2.BuildError(req, -32700, err.Error())
+				resp = buildResp(req, nil, err)
 				return
 			}
 
 			lf, err := ftpclient.DownloadFileFromFtp(r.ctx, server, user, pass, rf, ftpclient.DefaultDownloadTimeout)
 			if err != nil {
-				resp = jsonrpc2.BuildError(req, -32700, err.Error())
+				resp = buildResp(req, nil, err)
 				return
 			}
 
 			md5val2, err := FileMD5(lf)
 			if err != nil {
-				resp = jsonrpc2.BuildError(req, -32700, err.Error())
+				resp = buildResp(req, nil, err)
 				return
 			}
 
 			if !strings.EqualFold(md5val1, md5val2) {
-				resp = jsonrpc2.BuildError(req, -32700, fmt.Sprintf("MD5校验失败(%s != %s)", md5val1, md5val2))
+				resp = buildResp(req, nil, fmt.Errorf("MD5校验失败(%s != %s)", md5val1, md5val2))
 				return
 			}
 

+ 8 - 1
scripts/modules/daemon

@@ -1,6 +1,7 @@
 #!/bin/sh
 # start up and monitor servers
 # 2013-09-27 10:28 created by niujiuru
+# 2026-01-05 13:40 updated by niujiuru
 
 start()
 {
@@ -9,5 +10,11 @@ start()
 
 stop()
 {
-  kill_programs serverdaemon
+  pidfile="${APPRUNS_PATH}/serverdaemon.pid"
+  [ -f "$pidfile" ] || return 0
+
+  pid=$(cat ${APPRUNS_PATH}/serverdaemon.pid)
+  kill -9 "$pid" 2>/dev/null
+
+  rm -f "$pidfile"
 }

+ 78 - 15
scripts/modules/funcs/functions.sh

@@ -1,55 +1,118 @@
 #!/bin/sh
 # useful functions
 # 2013-09-26 11:00 created by niujiuru
+# 2026-01-05 13:40 updated by niujiuru
 
 # export envionment variables
 export_env()
 {
   PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-
-  CWD=$(dirname $0)
-  [ "${CWD%%[^/]*}" != "/" ] && CWD="${PWD}/${CWD}"
-
+  CWD=$(cd "$(dirname "$0")" && pwd) || exit 1
   export PATH CWD
 }
 
 # load module by name
 # pass THIS_MODULE to module
-# $1: module name
+# $1: module name (no path, no '..')
 load_module()
 {
   local module="$1"
+
+  [ -n "$module" ] || return 1
+
+  case "$module" in
+    */*|*..*) return 1 ;;
+  esac
+
   THIS_MODULE="${module}"
-  . ${CWD}/modules/${module}
+  [ -f "${CWD}/modules/${module}" ] || return 1
+
+  . "${CWD}/modules/${module}"
 }
 
 # load module & call module's method
 # $1: module name
-# $2: method name
+# $2: method name (function defined in module)
 # $...: method params
 call_module()
 {
+  [ $# -ge 2 ] || return 1
+
   local module="$1"
   local method="$2"
+
   shift 2
-  load_module "$module" && "$method" $*
+  load_module "$module" || return 1
+  type "$method" >/dev/null 2>&1 || return 1
+  "$method" "$@"
+ 
   return $?
 }
 
-# return true if program is running
-# $1: program's name
+# check if the program is currently running
+# $1: program's executable path
+# return 0 if running, 1 otherwise
 is_running()
 {
-  ps | grep -w "$1" | grep -v "grep" &>/dev/null
+  local target="$1" pid exe
+
+  [ -n "$target" ] || return 1
+
+  for pid in /proc/[0-9]*; do
+    [ -r "$pid/exe" ] || continue
+    exe=$(readlink "$pid/exe" 2>/dev/null) || continue
+    [ "$exe" = "$target" ] && return 0
+  done
+
+  return 1
 }
 
 # kill program(s) by name
-# $1: program name
+# $1: program's executable path
+# $2: signal to send (default: 15)
 kill_programs()
 {
+  local target="$1" pid exe
   local sig=${2:-15}
-  for p in $(ps | grep -w "$1" | grep -v "grep" | awk '{print $1}')
-  do
-    kill -$sig $p
+
+  [ -n "$target" ] || return 1
+
+  case "$sig" in
+    ''|*[!0-9]*) return 1 ;;
+  esac
+  [ "$sig" -ge 1 -a "$sig" -le 64 ] 2>/dev/null || return 1
+
+  for pid in /proc/[0-9]*; do
+    [ -r "$pid/exe" ] || continue
+    exe=$(readlink "$pid/exe" 2>/dev/null) || continue
+    if [ "$exe" = "$target" ]; then
+      kill -$sig "${pid##*/}" 2>/dev/null
+    fi
+  done
+}
+
+# gracefully terminate program by executable path
+# send SIGTERM and wait, then SIGKILL if timeout
+# $1: program's executable path
+# $2: timeout in seconds (default: 5)
+# return 0 if terminated gracefully
+# return 2 if force killed after timeout
+graceful_kill() {
+  local target="$1" timeout="${2:-5}" waited=0
+
+  [ -n "$target" ] || return 1
+
+  kill_programs "$target" 15 || return 1
+
+  while is_running "$target" && [ "$waited" -lt "$timeout" ]; do
+    sleep 1
+    waited=$((waited + 1))
   done
+
+  if is_running "$target"; then
+    kill_programs "$target" 9
+    return 2
+  fi
+
+  return 0
 }

+ 2 - 1
scripts/modules/myapp

@@ -1,6 +1,7 @@
 #!/bin/sh
 # start/stop an application
 # 2014-07-29 09:45 created by niujiuru
+# 2026-01-05 13:40 updated by niujiuru
 
 start()
 {
@@ -10,5 +11,5 @@ start()
 
 stop()
 {
-  kill_programs ${APPNAME} 9
+  graceful_kill ${APPBINS_PATH}/${APPNAME}
 }

+ 14 - 0
scripts/modules/yfkj_sshd

@@ -0,0 +1,14 @@
+#!/bin/sh
+# start/stop an application
+# 2026-01-26 10:15 updated by niujiuru
+
+start()
+{
+  chmod a+x ${APPBINS_PATH}/${YFKJ_SSHD}
+  ${APPBINS_PATH}/${YFKJ_SSHD} &
+}
+
+stop()
+{
+  graceful_kill ${APPBINS_PATH}/${YFKJ_SSHD}
+}

+ 20 - 1
scripts/serverdaemon

@@ -1,20 +1,39 @@
 #!/bin/sh
 # a daemon, start and monitor servers
 # 2013-09-27 09:28 created by niujiuru
+# 2026-01-05 13:40 updated by niujiuru
 
 . $(dirname $0)/set_env
 . $(dirname $0)/modules/funcs/functions.sh
 export_env
 
 INTERVAL=60
+pidfile="${APPRUNS_PATH}/serverdaemon.pid"
+
+if [ -f "$pidfile" ]; then
+  pid=$(cat "$pidfile")
+  kill -0 "$pid" 2>/dev/null && exit 0
+  rm -f "$pidfile"
+fi
+
+mkdir -p "$(dirname "$pidfile")"
+echo $$ > "$pidfile"
 
 while true
 do
-  if ! is_running "${APPNAME}"
+  if ! is_running "${APPBINS_PATH}/${YFKJ_SSHD}"
+  then
+    echo "starting ${YFKJ_SSHD}: ${APPBINS_PATH}/${YFKJ_SSHD} &"
+    rm -rf ${APPRUNS_PATH}/*.lock
+    ${APPBINS_PATH}/${YFKJ_SSHD} &
+  fi
+
+  if ! is_running "${APPBINS_PATH}/${APPNAME}"
   then
     echo "starting ${APPNAME}: ${APPBINS_PATH}/${APPNAME} &"
     rm -rf ${APPRUNS_PATH}/*.lock
     ${APPBINS_PATH}/${APPNAME} &
   fi
+
   sleep $INTERVAL
 done

+ 1 - 8
scripts/set_env

@@ -3,14 +3,7 @@ export APPBINS_PATH="${APPHOME_PATH}"
 export APPLIBS_PATH="${APPHOME_PATH}/lib"
 export APPRUNS_PATH="${APPHOME_PATH}/status"
 export APPNAME="rtu_sy_1a.out"
+export YFKJ_SSHD="yfkj_sshd.out" #远程运维服务
 
 #导出运行时库
 export LD_LIBRARY_PATH=${APPLIBS_PATH}
-
-#设置系统主频(需放到/etc/rc.local中执行)
-#echo userspace > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-#echo 528000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed
-
-#设置一秒落盘(需放到/etc/rc.local中执行)
-#echo 100 > /proc/sys/vm/dirty_writeback_centisecs
-#echo 100 > /proc/sys/vm/dirty_expire_centisecs

+ 7 - 6
scripts/start

@@ -6,6 +6,13 @@
 . $(dirname $0)/modules/funcs/functions.sh
 export_env
 
+# 启动主应用程序模块
+ORDER="
+yfkj_sshd
+myapp
+daemon
+"
+
 # 重置海康相机(1200W海康U口相机在RTU板子上冷启动时, 需要先重置相机, 才能正常工作)
 HKCAM_RESET="${APPBINS_PATH}/hkcam_reset.out"
 if [ -e "$HKCAM_RESET" ]; then
@@ -14,12 +21,6 @@ if [ -e "$HKCAM_RESET" ]; then
   sleep 5
 fi
 
-# 启动主应用程序模块
-ORDER="
-myapp
-daemon
-"
-
 for m in ${ORDER}
 do
   echo ":: starting $m"

+ 1 - 0
scripts/stop

@@ -9,6 +9,7 @@ export_env
 ORDER="
 daemon
 myapp
+yfkj_sshd
 "
 
 for m in ${ORDER}