Merge branch 'hzl' into 'master'

1.增加支持8197平台

See merge request chenweican/k-sdk!162

application/kcloud/iot.mk

@@ -19,7 +19,8 @@ else ifeq ($(CONFIG_MODEL),nx5)
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_nx5  
 else ifeq ($(CONFIG_MODEL),8197)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197 -lubacktrace
-	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197  	
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197  
+	LDFLAGS         += -L$(TOP_DIR)/common/curl  -lcurl_8197 
 else ifeq ($(CONFIG_MODEL),a133)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133 
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133	

common/hal/kk_product.h

@@ -52,6 +52,25 @@
 #define  KK_CONFIG_FILE_PATH        "/data/local/kk/kk_cloud_conf.json"
 #define  KK_DEFAULT_CONFIG_FILE_PATH    "/data/local/kk/etc/cloud_default_config.json"
 #define  KK_AUTH_CONFIG_FILE_PATH    "/data/local/kk/auth_conf.json"
+#elif CONFIG_8197_PLATFORM
+#define  KK_DEVICESECRET_PATH       "/data/kk/kk_deviceSecret.txt"
+#define  KK_TOKEN_PATH              "/data/kk/kk_token.txt"
+#define KK_DEVICE_MAP_FILE_PATH      "/data/kk/map/device_%s.json"
+#define GET_CCUID_CMD               "eval `flash get CUSTOMER_HW_KK_OPTION0`; echo $CUSTOMER_HW_KK_OPTION0"
+#define GET_KEY_CMD                 "eval `flash get CUSTOMER_HW_KK_OPTION1`; echo $CUSTOMER_HW_KK_OPTION1"
+#define GET_PRODUCTID_CMD           "eval `flash get CUSTOMER_HW_KK_OPTION2`; echo $CUSTOMER_HW_KK_OPTION2"
+#define KK_DB_FILE                  "/data/kk/kk_database.db"
+#define TSL_SUBDEVICE_PATH_FILE     "/data/kk/tsl/product_%s.json"
+#define TSL_GATEWAY_PATH_FILE       "/data/kk/tsl/gateway_%s.json"
+#define TSL_CCU_PATH_FILE           "/data/kk/tsl/ccu_%s.json"
+#define TSL_SCENE_PATH_FILE         "/data/kk/tsl/ccu_%s_scene.json"
+#define OTA_IMG_PATH                "/data/OTA/"
+#define OTA_IMG_FILE                "/data/OTA/app_squashfs.img"
+#define OTA_IMG_FILE_MD5            "/data/OTA/app_squashfs.img.md5"
+#define  KK_CONFIG_FILE_PATH        "/data/kk/kk_cloud_conf.json"
+#define  KK_DEFAULT_CONFIG_FILE_PATH    "/app/ccuApps/config/cloud_default_config.json"
+#define  KK_AUTH_CONFIG_FILE_PATH    "/tmp/auth_conf.json"
+
 #else
 #define  KK_DEVICESECRET_PATH       "/data/kk/kk_deviceSecret.txt"
 #define  KK_TOKEN_PATH              "/data/kk/kk_token.txt"

midware/midware/iot.mk

@@ -9,7 +9,7 @@ CFLAGS 			+= -I$(TOP_DIR)/common/ev/include
 CFLAGS 			+= -I$(TOP_DIR)/common/api
 CFLAGS 			+= -I$(TOP_DIR)/common/sqlite
 CFLAGS 			+= -I$(TOP_DIR)/src/tsl/tsl_handle
-LDFLAGS         += -lapi_com -liot_cjson -lkk_tsl
+LDFLAGS         += -lrt -Wl,-Bdynamic -lapi_com -liot_cjson -lkk_tsl
 LDFLAGS         += -lm  -lkk_hal
 LDFLAGS         += -lsqlite -ldl 
 
@@ -21,7 +21,8 @@ else ifeq ($(CONFIG_MODEL),nx5)
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_nx5  
 else ifeq ($(CONFIG_MODEL),8197)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197 -lubacktrace
-	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197  
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197 
+	LDFLAGS         += -L$(TOP_DIR)/common/curl  -lcurl_8197  	
 else ifeq ($(CONFIG_MODEL),a133)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133 
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133

midware/midware/midware.c

@@ -124,7 +124,7 @@ static int _setDevice_Code(_IN_ char *device_code,int len)
 }
 static int HAL_Ccuid_init(void)
 {
-	#ifdef CONFIG_A133_PLATFORM
+#ifdef CONFIG_A133_PLATFORM
     uint8_t data[128] = {0};
     int data_len = 0;
 	uint8_t uuid[32] = {0};
@@ -146,7 +146,22 @@ static int HAL_Ccuid_init(void)
     }else{
         return -1;
     }
-	#else
+#elif CONFIG_8197_PLATFORM
+	//_setDevice_Code("CCU_232536",strlen("CCU_232536")+1);
+	//return 0;
+	char ccuid[DEVICE_CODE_LEN] = {0};
+	char ccuidTmp[DEVICE_CODE_LEN] = {0};
+    int ccuid_len = 0;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)ccuid,sizeof(ccuid),&ccuid_len);
+    printf("GET_CCUID_CMD:%s\n",ccuid);
+    if(ccuid_len > 0 && ccuid_len <= DEVICE_CODE_LEN){
+		sprintf(ccuidTmp,"CCU_%s",ccuid);
+        _setDevice_Code(ccuidTmp,strlen(ccuidTmp)+1);
+    }else{
+        //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		return -1;
+    }
+#else
     char ccuid[DEVICE_CODE_LEN] = {0};
 	char ccuidTmp[DEVICE_CODE_LEN] = {0};
     int ccuid_len = 0;
@@ -159,7 +174,7 @@ static int HAL_Ccuid_init(void)
         //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
 		return -1;
     }
-	#endif
+#endif
 	return 0;
 }
 /************************************************************

script/onboot_8197.sh

+#!/bin/sh
+#filepath="/home/kk"
+filepath="/app/ccuApps"
+#/etc/init.d/S90dcron stop
+
+eval `flash get CUSTOMER_HW_KK_OPTION0`	#|cut -d '=' -f 2`;
+curr_hostname=`cat /etc/hostname`;
+
+if [ "$CUSTOMER_HW_KK_OPTION0" != "$curr_hostname" ]; then
+   	echo "$CUSTOMER_HW_KK_OPTION2" > /etc/hostname
+   	hostname $CUSTOMER_HW_KK_OPTION2
+	/etc/init.d/S01syslogd restart
+fi
+
+run_Dir="/data/kk"
+tsl_Dir="${run_Dir}/tsl"
+map_Dir="${run_Dir}/map"
+smt_Dir="/etc/smarthome"
+#dev_cfg_Dir="${run_Dir}/dev_config_table"
+
+#cd /sbin/
+#insmod /sbin/ssd1306-revision.ko
+#/sbin/oled >/dev/null 2>&1 &
+#sleep 1
+
+if [ ! -d "$run_Dir" ]; then
+	mkdir ${run_Dir}
+fi
+
+if [ ! -d "$tsl_Dir" ]; then
+	cp -rf $filepath/tsl ${run_Dir}/
+else
+	if [ ! -f "${run_Dir}/tsl/version" ]; then
+		cp -rf $filepath/tsl ${run_Dir}/
+	else	
+		defaultVer=`cat ${filepath}/tsl/version`
+		curVer=`cat ${run_Dir}/tsl/version`
+		if [ $defaultVer != $curVer ]; then
+			cp -rf $filepath/tsl ${run_Dir}/
+		fi
+	fi
+fi
+#if [ ! -d "$map_Dir" ]; then
+cp -rf $filepath/map ${run_Dir}/
+#fi
+
+export LD_LIBRARY_PATH=$filepath/lib
+
+$filepath/bin/kk_midware &
+sleep 1
+$filepath/bin/kk_lan &
+sleep 2
+$filepath/bin/kk_cloud &
+sleep 5
+$filepath/bin/smarthome_z3gw_8197 -r0 -l3 --device-def=$filepath/config/kk_device_def.json --db=/data/kk/kk_z3gw.db --thingmodel-path=/data/kk/tsl/ --uart=/dev/ttyS2 &
+#sleep 1
+#if [ ! -f /etc/cron.d/ccu ]; then
+#	echo "*/1 * * * *   /app/ccuApps/script/process_check.sh" > /etc/cron.d/ccu || { echo "ERROR:add ccu crontab rule failed."; exit 1;}
+#fi
+#/etc/init.d/S90dcron restart
+#ntpd -n -q -d -p stdtime.gov.hk &
+exit 0
\ No newline at end of file

tools/board/config.linux.8197

@@ -19,16 +19,17 @@ CONFIG_ENV_CFLAGS   += \
     -DCONFIG_GUIDER_AUTH_TIMEOUT=500 \
     -DCONFIG_MQTT_RX_MAXLEN=5000 \
     -DCONFIG_MBEDTLS_DEBUG_LEVEL=0 \
-
+    -DCONFIG_8197_PLATFORM \
 
 CONFIG_ENV_CFLAGS   += -rdynamic
 CONFIG_ENV_CFLAGS   += -Wno-unused -std=c99 
 
 CONFIG_ENV_LDFLAGS  += -lpthread -lrt
+#CONFIG_ENV_LDFLAGS  += -rpath-link /home/kk/share/rtl8197f/buildroot-2021.02/output/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib -lpthread -lrt
 
 OVERRIDE_CC = mipsel-buildroot-linux-uclibc-gcc
 OVERRIDE_AR = mipsel-buildroot-linux-uclibc-ar
 OVERRIDE_LD = mipsel-buildroot-linux-uclibc-ld
 CROSS_PREFIX = mipsel-buildroot-linux-uclibc-
 
-OVERRIDE_STRIP      := strip
+OVERRIDE_STRIP      := mipsel-buildroot-linux-uclibc-strip

tools/build-rules/_rules-top.mk

@@ -228,13 +228,24 @@ else ifeq ($(CONFIG_MODEL),nx5)
 	cp -rf $(TOP_DIR)/nx5_soc_gw/smarthome_z3gw_nx5 $(TOP_DIR)/$(releaseDir)/bin/
 	cp -rf $(TOP_DIR)/nx5_soc_gw/kk_device_def.json $(TOP_DIR)/$(releaseDir)/config/
 	cp -rf $(TOP_DIR)/upgrade $(TOP_DIR)/$(releaseDir)/
+else ifeq ($(CONFIG_MODEL),8197)
+	mv $(TOP_DIR)/$(releaseDir)/script/onboot_8197.sh $(TOP_DIR)/$(releaseDir)/onboot.sh
+	cp -rf $(TOP_DIR)/common/nanomsg/libnanomsg_8197.so $(TOP_DIR)/$(releaseDir)/lib/libnanomsg.so.5.1.0
+	cp -rf $(TOP_DIR)/common/ev/libev_8197.so $(TOP_DIR)/$(releaseDir)/lib/libev.so.4
+	cp -rf $(TOP_DIR)/common/curl/libcurl_8197.so $(TOP_DIR)/$(releaseDir)/lib/libcurl.so.4
+	#cp -rf $(TOP_DIR)/common/curl/libcrypto_8197.so $(TOP_DIR)/$(releaseDir)/lib/libcrypto.so.1.1
+	#cp -rf $(TOP_DIR)/common/curl/libssl_8197.so $(TOP_DIR)/$(releaseDir)/lib/libssl.so.1.1
+	#cp -rf $(TOP_DIR)/common/sqlite/libsqlite3_nx5.so $(TOP_DIR)/$(releaseDir)/lib/libsqlite3.so.0
+	cp -rf $(TOP_DIR)/nx5_soc_gw/smarthome_z3gw_8197 $(TOP_DIR)/$(releaseDir)/bin/
+	cp -rf $(TOP_DIR)/nx5_soc_gw/kk_device_def.json $(TOP_DIR)/$(releaseDir)/config/
+	cp -rf $(TOP_DIR)/upgrade_8197 $(TOP_DIR)/$(releaseDir)/upgrade
 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)/script/*.sh
+	#fromdos $(releaseDir)/script/*.sh
 	echo $(PWD)
 
 package_a133:

upgrade_8197

+
+erase_cmd="mtd_debug erase /dev/mtd6 0x0 0x01000000"
+TARGET_FILE="/data/upgrade.sh"
+
+upgrade_cmd="nandwrite -a /dev/mtd6 /data/OTA/app_squashfs.img"
+check_md5="md5sum -c $2"
+cd /data/OTA
+while true
+do
+	if [[ -f $1 ]]  &&  [[ -f $2 ]]; 
+	then
+		check_result=$(eval $check_md5)
+		echo "$check_result"
+		result=$(echo $check_result | grep "OK")
+
+		if [[ "$result" != "" ]]
+		then		
+			tar -zxf $1 -C /data/OTA/
+			rm $TARGET_FILE -f
+			echo "echo 'now eval upgrade cmd by upgrade.sh'" >> $TARGET_FILE 
+			echo "mtd_debug erase /dev/mtd6 0x0 0x01000000" >> $TARGET_FILE
+			echo "nandwrite -a /dev/mtd6 /data/OTA/app_squashfs.img" >> $TARGET_FILE
+			echo "rm -rf /data/OTA" >> $TARGET_FILE
+			echo "reboot -f" >> $TARGET_FILE	
+			echo "now eval upgrade cmd"
+			chmod 777 $TARGET_FILE
+			sync
+			eval $erase_cmd
+			eval $upgrade_cmd
+			rm -rf /data/OTA
+		fi
+
+	else
+		echo "check load fail"
+	fi
+	echo "where is error ?"
+	exit 0
+
+done
+
+