Merge branch 'hzl' into 'master'

系统新分区，增加编译squashfs文件系统

See merge request chenweican/k-sdk!26

app.sh

+#!/bin/sh
+nanomsg_File="/home/kk/lib/libnanomsg.so.5"
+ev_File="/home/kk/lib/libev.so.4"
+sqlite_File="/home/kk/lib/libsqlite3.so.0"
+
+run_Dir="/"
+dev_cfg_Dir="${run_Dir}/ZB/dev_config_table"
+
+cd /sbin/
+insmod /sbin/ssd1306-revision.ko
+/sbin/oled >/dev/null 2>&1 &
+sleep 1
+
+if [ ! -d "$dev_cfg_Dir" ]; then
+	mkdir /ZB
+	cp -rf /home/kk/dev_config_table /ZB
+	cp -rf /home/kk/dev_map_table.json /ZB
+fi
+sleep 1
+
+export LD_LIBRARY_PATH=/home/kk/lib
+cd /home/kk/lib
+if [ ! -f "$nanomsg_File" ]; then
+	ln -s libnanomsg.so /lib/libnanomsg.so.5
+fi
+if [ ! -f "$ev_File" ]; then
+	ln -s libev.so /lib/libev.so.4
+fi
+
+if [ ! -f "$sqlite_File" ]; then
+	ln -s libsqlite3.so /lib/libsqlite3.so.0
+fi
+
+
+CCU_ID=`cat /etc/dropbear/accessory/hj/hj_ccuid`
+/sbin/logread -f -r 120.55.149.201 514 -p /var/run/logread.cloud_log.pid -u -h $CCU_ID >/dev/null 2>&1 &
+/sbin/logread -f -e "ccu_err_info" -F /etc/dropbear/accessory/hj/err.log -p /var/run/logread.err_log.pid -S 512 >/dev/null 2>&1 &
+sleep 1
+
+export LD_LIBRARY_PATH=/home/kk/lib
+cd ${run_Dir}
+
+/home/kk/kk_midware >/dev/null 2>&1 &
+/home/kk/kcloud >/dev/null 2>&1 &
+/home/kk/Z3GatewayHost -f x -p /dev/ttyS0 >/dev/null 2>&1 &
+sleep 5
+
+/home/kk/process_check.sh >/dev/null 2>&1 &
+
+cd /sbin
+/sbin/logd-check.sh >/dev/null 2>&1 &
+sleep 1
+
+ntpd -n -q -d -p stdtime.gov.hk &
+exit 0
\ No newline at end of file

midware/tsl/tsl_handle/kk_tsl_load.c

@@ -44,7 +44,7 @@ char* kk_load_json(const char *productCode,int type)
 	
 	
 	INFO_PRINT("\n[%s][%d]tslPath:%s!!!\n",__FUNCTION__,__LINE__,tslPath);
-	if(!(fp =  fopen(tslPath,"a+")))
+	if(!(fp =  fopen(tslPath,"r")))
 	{
 		ERROR_PRINT("can't open the file tslPath:%s\n",tslPath);
 		free(tslPath);

platform/zigbee/app/builder/Z3GatewayHost/Makefile

@@ -383,7 +383,7 @@ ifeq ($(CONFIG_VENDOR),ubuntu)
 	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -lcurl_ubuntu -ldl -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 else
-	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -lcurl -o  $(TARGET_FILE)
+	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lsqlite3 -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lcurl -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 endif	
 endif

platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c

@@ -331,7 +331,7 @@ int search_ccu(char devcode[33], char ip[16], int* port){
         return -1;
     }
     
-    if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST | SO_REUSEADDR, &iOptval, sizeof(int)) < 0)
+    if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &iOptval, sizeof(int)) < 0)
     {
         printf("[%s] setsockopt failed\n",__FUNCTION__);
         close(sock);
@@ -339,6 +339,15 @@ int search_ccu(char devcode[33], char ip[16], int* port){
         return -1;
     }
 
+     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &iOptval, sizeof(int)) < 0)
+    {
+        printf("[%s] setsockopt failed\n",__FUNCTION__);
+        close(sock);
+        close(sk_recv);
+        return -1;
+    }
+    
+
     if (setsockopt(sk_recv, SOL_SOCKET, SO_REUSEADDR, &iOptval, sizeof(int)) < 0)
     {
         printf("[%s] setsockopt failed\n",__FUNCTION__);

platform/zigbee/protocol/zigbee/app/framework/util/af-main-host.c

@@ -48,6 +48,8 @@
 #include "yjq_ezsp.h"
 #include "./rpc_api/inc/rpc_interface_parse.h"
 #include <pthread.h>
+#include <fcntl.h> 
+
 
 
 pthread_mutex_t g_mutex_lock;
@@ -481,8 +483,58 @@ void emAfResetAndInitNCP(void)
 // *******************************************************************
 // The main() loop and the application's contribution.
 
+static void gpio_output_set(int val, int gpio_num)
+{
+    char str[120] = {0};
+    int re = 0;
+
+    memset(str, 0, sizeof(str));
+    snprintf(str, sizeof(str), "/sys/class/gpio/gpio%d", gpio_num);
+
+    if ((access(str, F_OK)) == -1)
+    {
+        snprintf(str, sizeof(str), "echo %d > /sys/class/gpio/export", gpio_num);
+        re = system(str);
+
+        if (re != 0)
+        {
+            return;
+        }
+    }
+
+    snprintf(str, sizeof(str), "echo out > /sys/class/gpio/gpio%d/direction", gpio_num);
+    re = system(str);
+
+    if (re != 0)
+    {
+        return;
+    }
+
+    snprintf(str, sizeof(str), "echo %d > /sys/class/gpio/gpio%d/value", val == false ? 0 : 1, gpio_num);
+    re = system(str);
+
+    if (re != 0)
+    {
+        return;
+    }
+    
+}
+
+void chip_reset()
+{
+    printf("try reset chip\n");
+    
+    gpio_output_set(false, 11);
+    sleep(1);
+    
+    gpio_output_set(true, 11);
+    sleep(1); 
+}
+
+
 void emberAfMainInit(void)
 {
+    chip_reset();
 }
 
 int emberAfMain(MAIN_FUNCTION_PARAMETERS)

run.sh

-#! /bin/sh
-#export LD_LIBRARY_PATH=/home/kk/lib
-#cd /home/kk/lib
-#ln libnanomsg.so libnanomsg.so.5
-#ln libev.so libev.so.4
-/home/kk/kk_midware >/dev/null 2>&1 &
-/home/kk/kcloud >/dev/null 2>&1 &
-#/home/kk/Z3GatewayHost >/dev/null 2>&1 &
-

tools/build-rules/_rules-top.mk

-.PHONY: doc detect config reconfig toolchain sub-mods final-out env cmake one help package
+.PHONY: doc detect config reconfig toolchain sub-mods final-out env cmake one help package squashfs
 
 all: detect config toolchain sub-mods final-out
 	$(TOP_Q) \
@@ -202,23 +202,37 @@ package:
 	rm -rf $(releaseDir)
 	mkdir $(releaseDir)
 	mkdir $(releaseDir)/lib
-	cp zlog.conf $(TOP_DIR)/$(releaseDir)
 	cp -rf $(TOP_DIR)/tsl $(TOP_DIR)/$(releaseDir)
 	cp -rf $(TOP_DIR)/output/release/lib/*.so $(TOP_DIR)/$(releaseDir)/lib
 	cp -rf $(TOP_DIR)/output/release/bin/* $(TOP_DIR)/$(releaseDir)/
-	cp -rf $(TOP_DIR)/run.sh $(TOP_DIR)/$(releaseDir)/
+
 	cp -rf $(TOP_DIR)/process_check.sh $(TOP_DIR)/$(releaseDir)/
-	cp -rf $(TOP_DIR)/rc.local $(TOP_DIR)/$(releaseDir)/	
+	cp -rf $(TOP_DIR)/platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table $(TOP_DIR)/$(releaseDir)/
+	cp -rf $(TOP_DIR)/platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json $(TOP_DIR)/$(releaseDir)/
 ifeq ($(CONFIG_VENDOR),ubuntu)
 	cp -rf $(TOP_DIR)/common/nanomsg/libnanomsg_ubuntu.so $(TOP_DIR)/$(releaseDir)/lib/libnanomsg.so.5
 	cp -rf $(TOP_DIR)/common/ev/libev_ubuntu.so $(TOP_DIR)/$(releaseDir)/lib 
 else
 	cp -rf $(TOP_DIR)/common/nanomsg/libnanomsg.so $(TOP_DIR)/$(releaseDir)/lib
 	cp -rf $(TOP_DIR)/common/ev/libev.so $(TOP_DIR)/$(releaseDir)/lib
+	cp -rf $(TOP_DIR)/common/sqlite/libsqlite3.so $(TOP_DIR)/$(releaseDir)/lib
 endif
 	cp -rf $(TOP_DIR)/platform/zigbee/app/builder/Z3GatewayHost/build/exe/Z3GatewayHost $(TOP_DIR)/$(releaseDir)/
 	fromdos $(releaseDir)/*.sh
-	fromdos $(releaseDir)/rc.local
+	echo $(PWD)
+
+squashfs: package
+	@echo "build squashfs"
+
+	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
+	
+	rm -rf kkdir kkdir.squashfs
 	echo $(PWD)
 
 ifeq ($(shell uname),Darwin)

tools/mk2fs/mk2fs.sh

+#!/bin/sh
+
+ctime=`date +%s`
+output=lede-ar71xx-generic-ap147-010-squashfs-sysupgrade.bin
+echo ${OUTPUT_DIR}
+echo "${TOP_DIR}"
+${TOP_DIR}/tools/mk2fs/mksquashfs4 ./kkdir/ ./kkdir.squashfs -nopad -noappend -root-owned -comp xz -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2  -b 256k -processors 1 -fixed-time ${ctime}
+
+#mksquashfs ./konke/ ./konke.squashfs -nopad -noappend -root-owned -comp xz -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2  -b 256k -processors 1 -fixed-time ${ctime}
+
+dd if=./kkdir.squashfs of=./$output bs=128k conv=sync
+
+chmod 700 ./$output