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

1, 基础模块NTP时间同步做了优化, 需要重新编译; 2, 优化MCU升级流程; 3, 编译打包, 发布新的固件版本

niujiuru 7 месяцев назад
Родитель
Сommit
e3ec91bf1a
5 измененных файлов с 11 добавлено и 9 удалено
  1. 1 1
      Makefile
  2. 8 6
      mcu_ctrl_board/mcu_ctrl_board.go
  3. 1 1
      package/armv7hf.sh
  4. BIN
      package/rtu_bxs_seyou_2.0.0.3.tar.gz
  5. 1 1
      scripts/start

+ 1 - 1
Makefile

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

+ 8 - 6
mcu_ctrl_board/mcu_ctrl_board.go

@@ -41,11 +41,12 @@ type EnvData = EnvSensorData
 
 // MCU 控制板对象
 type MCUCtrlBoard struct {
-	EnvDataOneCh chan EnvData   // 单条环境数据
-	EnvDataGrpCh chan []EnvData // 一组环境数据
-	ReqTakePhoCh chan bool      // 请求开始拍照
-	pwrWillOffCh chan struct{}  // 通知即将掉电
-	mcuUpgradeCh chan struct{}  // 控制板的升级
+	EnvDataOneCh  chan EnvData   // 单条环境数据
+	EnvDataGrpCh  chan []EnvData // 一组环境数据
+	ReqTakePhoCh  chan bool      // 请求开始拍照
+	pwrWillOffCh  chan struct{}  // 通知即将掉电
+	mcuUpgradeCh  chan struct{}  // 控制板的升级
+	isNeedUpgrade bool           // 是否需要升级
 }
 
 // 初始化MCU控制板
@@ -64,6 +65,7 @@ func ModuleInit() bool {
 	if needUpgrade { // 异步执行升级控制板的固件
 		go startBoardUpgrade(fwPath, fwSize)
 	}
+	Board.isNeedUpgrade = needUpgrade
 
 	err := loadCfgParams()
 	if err != nil {
@@ -280,7 +282,7 @@ func MCU_IsNeedUpgrade(ver *C.char) C.int {
 	version := C.GoString(ver)
 	writeMCUVersion(version) // 存储MCU当前版本
 
-	needUpgrade, _, _ := isBoardNeedUpgrade()
+	needUpgrade := Board.isNeedUpgrade
 	if needUpgrade {
 		return 1
 	}

+ 1 - 1
package/armv7hf.sh

@@ -4,7 +4,7 @@
 set -e
 set -o pipefail
 
-ver_num="2.0.0.3"
+ver_num="2.0.0.4"
 cur_dir="$(pwd)"
 pre_dir="$(dirname "$cur_dir")"
 RTU_LINUX_MODULES_PATH="${pre_dir}/../rtu_linux_modules"

BIN
package/rtu_bxs_seyou_2.0.0.3.tar.gz


+ 1 - 1
scripts/start

@@ -18,7 +18,7 @@ HKCAM_RESET="${APPBINS_PATH}/hkcam_reset.out"
 if [ -e "$HKCAM_RESET" ]; then
   chmod a+x "$HKCAM_RESET"
   "$HKCAM_RESET"
-  sleep 5
+  sleep 15
 fi
 
 for m in ${ORDER}