Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

# Conflicts:
#	midware/midware/midware.c

application/kcloud/kcloud_main.c

@@ -27,7 +27,7 @@
 #include "com_api.h"
 #include "kk_product.h"
 #include "kk_hal.h"
-#include "ccu_ver.h"
+
 //#include "kcloud_log.h"
 static char s_ccuid[DEVICE_CODE_LEN] = {0};
 int KK_Get_ccuid(char *device_code)
@@ -257,6 +257,7 @@ static int setStoragePath(char* path){
 #ifdef CONFIG_A133_PLATFORM
 	sprintf(KK_DEFAULT_CONFIG_FILE_PATH, "%s/%s", path, KK_DEFAULT_CONFIG_FILE_PATH_SUB);
 	sprintf(KK_AUTH_CONFIG_FILE_PATH, "%s/%s", path, KK_AUTH_CONFIG_FILE_PATH_SUB);
+	sprintf(KK_VERSION_FILE_PATH, "%s/%s", path, KK_VERSION_FILE_PATH_SUB);
 #endif
 
 	kk_set_storage_dir(path);
@@ -311,7 +312,7 @@ int main(int argc, char* argv[])
 #if CONFIG_NX5_PLATFORM
 	kk_cloud_ccuid_version();
 	kk_info_report_start();
-#endif	
+#endif
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
 #if 1
 again:

application/klansdk/kk_lan_main.c

@@ -232,6 +232,7 @@ static int setStoragePath(char* path){
 #ifdef CONFIG_A133_PLATFORM
 	sprintf(KK_DEFAULT_CONFIG_FILE_PATH, "%s/%s", path, KK_DEFAULT_CONFIG_FILE_PATH_SUB);
 	sprintf(KK_AUTH_CONFIG_FILE_PATH, "%s/%s", path, KK_AUTH_CONFIG_FILE_PATH_SUB);
+	sprintf(KK_VERSION_FILE_PATH, "%s/%s", path, KK_VERSION_FILE_PATH_SUB);
 #endif
 	kk_set_storage_dir(path);
 

common/api/ccu_ver.h

-#ifndef _KK_CCU_VER_H_
-#define _KK_CCU_VER_H_
-
-#define KK_CCU_VERSION 	"1.3.0"
-
-#ifdef CONFIG_A133_PLATFORM
-#define KK_VERSION_FILE_PATH 	"/data/local/kk/etc/VERSION"
-#else
-#define KK_VERSION_FILE_PATH 	"/app/ccuApps/VERSION"
-#endif
-#endif
-

common/hal/HAL_OS_linux.c

@@ -28,7 +28,6 @@
 #include <time.h>
 #include <signal.h>
 #include "kk_product.h"
-#include "ccu_ver.h"
 #include "com_api.h"
 #include "kk_log.h"
 
@@ -149,8 +148,8 @@ time_t HAL_Uptimes(void)
 
 time_t HAL_GetTime(void)
 {
-    time_t t;  
-    t = time(NULL);  
+    time_t t;
+    t = time(NULL);
     return t;
 }
 
@@ -161,7 +160,7 @@ time_t HAL_GetTime_s(char *outStr)
 	t = time(NULL);
 
 	sprintf(outStr,"%ld",t);
-	
+
 	return t;
 }
 
@@ -195,14 +194,14 @@ char *HAL_GetTimeStr(_IN_ char *buf, _IN_ int len)
 }
 
 
- 
+
 int HAL_Get_TimeZone(void)
 {
- 
+
      int timezone = 0;
      time_t t1, t2 ;
      struct tm *tm_local, *tm_utc;
- 
+
 	time(&t1);
 	t2 = t1;
 	tm_local = localtime(&t1);
@@ -211,10 +210,10 @@ int HAL_Get_TimeZone(void)
 
 	t2 = mktime(tm_utc);
 
-	
+
     timezone = (t1 - t2) / 3600;
 	printf("%d\n", timezone);
- 
+
 	return timezone;
 }
 
@@ -513,8 +512,8 @@ static char *_get_default_routing_ifname(char *ifname, int ifname_size)
             continue;
         }
         /*default route */
-        #ifndef CONFIG_A133_PLATFORM 
-        if ((destination == 0) && (mask == 0)) 
+        #ifndef CONFIG_A133_PLATFORM
+        if ((destination == 0) && (mask == 0))
         #endif
         {
             strncpy(ifname, iface, ifname_size - 1);
@@ -676,8 +675,8 @@ int HAL_Get_mac(char* mac)
                      (unsigned char)ifr.ifr_hwaddr.sa_data[2],
                      (unsigned char)ifr.ifr_hwaddr.sa_data[3],
                      (unsigned char)ifr.ifr_hwaddr.sa_data[4],
-                     (unsigned char)ifr.ifr_hwaddr.sa_data[5]   
-        );    
+                     (unsigned char)ifr.ifr_hwaddr.sa_data[5]
+        );
     }
     else {
         int ret_ = 0;
@@ -686,7 +685,7 @@ int HAL_Get_mac(char* mac)
         return ret_;
     }
     memcpy(mac,mac_addr,strlen(mac_addr));
-    return 0;  
+    return 0;
 }
 
 

common/hal/kk_product.h

@@ -33,6 +33,8 @@
 #define KK_GW_PRODUCTID    "gateway_2"
 #define KK_CCU_RANDOM    "0000000000"
 #define KK_CCU_NAME      "NEW_CCU"
+#define KK_CCU_VERSION 	"1.3.0"
+
 /*
 #ifdef CONFIG_A133_PLATFORM
 #define  KK_DEVICESECRET_PATH   "/data/local/kk/kk_deviceSecret.txt"
@@ -137,7 +139,7 @@
 #define KK_DEFAULT_CONFIG_FILE_PATH_SUB 	"kk/etc/cloud_default_config.json"
 #endif
 #define KK_AUTH_CONFIG_FILE_PATH_SUB 		"kk/auth_conf.json"
-
+#define KK_VERSION_FILE_PATH_SUB			"kk/etc/VERSION"
 
 
 __attribute__((weak)) char KK_DEVICESECRET_PATH[128]	= STORSGE_DIR"/"KK_DEVICESECRET_PATH_SUB;
@@ -156,9 +158,12 @@ __attribute__((weak)) char KK_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_CONFIG_FI
 #ifdef CONFIG_A133_PLATFORM
 __attribute__((weak)) char KK_DEFAULT_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_DEFAULT_CONFIG_FILE_PATH_SUB;
 __attribute__((weak)) char KK_AUTH_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_AUTH_CONFIG_FILE_PATH_SUB;
+__attribute__((weak)) char KK_VERSION_FILE_PATH[128] 		= STORSGE_DIR"/"KK_VERSION_FILE_PATH_SUB;
 #else
 __attribute__((weak)) char KK_DEFAULT_CONFIG_FILE_PATH[128]	= "/app/ccuApps/config/cloud_default_config.json";
 __attribute__((weak)) char KK_AUTH_CONFIG_FILE_PATH[128]	= "/tmp/auth_conf.json";
+__attribute__((weak)) char KK_VERSION_FILE_PATH[128] 		= "/app/ccuApps/VERSION"
+
 #endif
 
 enum {