Merge branch 'hzl' into 'master'

Hzl 修改

See merge request chenweican/k-sdk!28

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_manager.c

@@ -230,9 +230,9 @@ void kk_network_check(void)
 int kk_permit_join(jrpc_context * ctx,EmberNodeId node,unsigned char ep,void* data)
 {
 	EmberStatus status;
-	uint8_t isEnable = *(uint8_t*)data;
+	int isEnable = *(int*)data;
 
-	kk_network_check();
+	//kk_network_check();
 
 	if(isEnable == 0){
 		status = nwkPermitJoinCMD(FALSE);

process_check.sh

@@ -20,4 +20,13 @@ else
 	/home/kk/kk_midware >/dev/null 2>&1 &
 	/home/kk/kcloud >/dev/null 2>&1 &
 fi
+sleep 30
+PIDS=`ps|grep Z3GatewayHost |grep -v grep | awk '{print $1}'`
+if [ "$PIDS" != "" ]; then
+	echo "Z3GatewayHost is runing!"
+else
+	echo "Z3GatewayHost is not running ,now restart Z3GatewayHost"
+	pgrep Z3GatewayHost | xargs kill -s 9
+	/home/kk/Z3GatewayHost -f x -p /dev/ttyS0 >/dev/null 2>&1 &
+fi
 done

tools/build-rules/_rules-top.mk

-.PHONY: doc detect config reconfig toolchain sub-mods final-out env cmake one help package squashfs
+.PHONY: doc detect config reconfig toolchain sub-mods final-out env cmake one help package squashfs firmware
 
 all: detect config toolchain sub-mods final-out
 	$(TOP_Q) \
@@ -227,7 +227,6 @@ squashfs: package
 	rm -rf kkdir kkdir.squashfs
 	mkdir kkdir
 
-	cp zlog.conf $(TOP_DIR)/$(releaseDir)
 	cp -rf $(TOP_DIR)/$(releaseDir) $(TOP_DIR)/kkdir/
 	cp -rf $(TOP_DIR)/app.sh $(TOP_DIR)/kkdir/
 	TOP_DIR='$(TOP_DIR)' $(TOP_DIR)/tools/mk2fs/mk2fs.sh
@@ -235,6 +234,19 @@ squashfs: package
 	rm -rf kkdir kkdir.squashfs
 	echo $(PWD)
 
+firmware:
+	@echo "build firmware"
+	
+ifneq (ap86-key-factory.bin, $(wildcard ap86-key-factory.bin))
+	@echo "================请把包括产测的固件ap86-key-factory.bin放在当前目录下================="
+	exit 1
+endif
+	cp -rf $(TOP_DIR)/ap86-key-factory.bin $(TOP_DIR)/tools/mk2fs/
+	cd $(TOP_DIR)/tools/mk2fs/ && ./mkfirmware-ap86-key.sh
+	mv $(TOP_DIR)/tools/mk2fs/ap86-key-new-zone-factory-burn-firmware.bin $(TOP_DIR)/
+	rm $(TOP_DIR)/tools/mk2fs/ap86-key-factory.bin
+	@echo "build firmware success"
+
 ifeq ($(shell uname),Darwin)
 KCONFIG_MCONF := tools/prebuilt/macos/kconfig-frontends-mac/kconfig-mconf
 else

tools/mk2fs/mkfirmware-ap86-key.sh

+#!/bin/sh
+
+output="ap86-key-new-zone-factory-burn-firmware.bin"
+tr "\000" "\377" < /dev/zero | dd of=$output ibs=1k count=16384  2>/dev/null
+dd if=ap86-uboot-v1.0.bin of=$output  conv=notrunc seek=0 bs=1k 2>/dev/null
+dd if=uboot-env-ap86-key.bin of=$output  conv=notrunc seek=256 bs=1k 2>/dev/null
+dd if=ap86-key-factory.bin of=$output  conv=notrunc seek=320 bs=1k 2>/dev/null
+dd if=9531-art-wifi-ok.bin of=$output  conv=notrunc seek=16320 bs=1k 2>/dev/null

tools/mk2fs/使用说明.txt

+此文件夹包括art、uboot、uboot-env、带产测的ota固件共四种bin文件
+
+使用方法：替换最新版本的ap86-key-factory.bin文件，然后执行mkfirmware-ap86-key.sh脚本
+
+生成文件：生成的<ap86-key-new-zone-factory-burn-firmware.bin>文件是工厂烧录固件
+