gengxin

diff --git a/2.sdk/new_clean.sh b/2.sdk/new_clean.sh
index a86267c..5417f62 100644 (file)
--- a/2.sdk/new_clean.sh
+++ b/2.sdk/new_clean.sh
@@ -10,25 +10,27 @@ else
     build_time=$(date "+%Y%m%d_%H%M%S")
     echo $build_time
 
-    typeset -u t_str
-    t_str=$1
-    echo "#define MMI_BUILD_PROJECT \"$t_str\"" > sdk/build_info.h
+    typeset -u project_name
+    project_name=$1
+    echo $project_name > sdk/temp_project.h
+    
+    echo "#define MMI_BUILD_PROJECT \"$project_name\"" > sdk/build_info.h
     echo >> sdk/build_info.h
     echo "#define MMI_BUILD_TIME \"$build_time\"" >> sdk/build_info.h
 
-    cp project/$1/make_option.mk sdk/
+    cp project/$project_name/make_option.mk sdk/
 
     cd sdk
-    make clean
+    make clean p=$project_name
     cd ..
 
     rm sdk/gui/lv_watch/resource -r
 
-    cp project/$1/* sdk/ -r
+    cp project/$project_name/* sdk/ -r
 
     cd sdk
-    make craneg_modem_sdk -j8
-    make craneg_modem_watch -j8
+    make craneg_modem_sdk p=$project_name -j8
+    make craneg_modem_watch p=$project_name -j8
     cd ..
 fi
 

diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh
index ddf9bc4..050a566 100644 (file)
--- a/2.sdk/new_gui.sh
+++ b/2.sdk/new_gui.sh
@@ -10,13 +10,12 @@ cd sdk
 build_time=$(date "+%Y%m%d_%H%M%S")
 echo $build_time
 
-read first_line < build_info.h  
-echo $first_line
+read project_name < temp_project.h
+echo $project_name
 
-echo $first_line > build_info.h
+echo "#define MMI_BUILD_PROJECT \"$project_name\"" > build_info.h
 echo >> build_info.h
 echo "#define MMI_BUILD_TIME \"$build_time\"" >> build_info.h
 
-
-make craneg_modem_watch -j8
+make craneg_modem_watch p=$project_name -j8
 cd ..
\ No newline at end of file

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_SETTING_MAIN_MENU_SWITCH.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_SETTING_MAIN_MENU_SWITCH.png
new file mode 100644 (file)
index 0000000..581a162
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_SETTING_MAIN_MENU_SWITCH.png differ

diff --git a/2.sdk/sdk/Makefile b/2.sdk/sdk/Makefile
index 3164526..a7b53d8 100644 (file)
--- a/2.sdk/sdk/Makefile
+++ b/2.sdk/sdk/Makefile
@@ -7,8 +7,10 @@ include build/version.mk
 #add @CHENG_
 include make_option.mk
 
+PROJECT ?= $(sort $(project) $(P) $(p))
+
 ROOT_DIR = ${shell pwd}
-OUT ?= $(ROOT_DIR)/out
+OUT ?= $(ROOT_DIR)/out/$(PROJECT)
 
 ifeq ($(CUSTOM_PRODUCT),)
   $(info ######## No CUSTOM_PRODUCT defined, use default definition ########)

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
index 5e1ac35..d4566a9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
@@ -75,12 +75,13 @@ void mmi_watch_do_not_disturb_screen_check(void);
 #endif
 
 
+#endif
+
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif //__cplusplus
 
 #endif
 
-#endif
-
 

diff --git a/2.sdk/sdk/product/craneg_modem/cust/fit/inc/sdknet.h b/2.sdk/sdk/product/craneg_modem/cust/fit/inc/sdknet.h
index 37fef75..bac6cb1 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/cust/fit/inc/sdknet.h
+++ b/2.sdk/sdk/product/craneg_modem/cust/fit/inc/sdknet.h
@@ -39,7 +39,7 @@ extern "C" {
 #define FALSE 0 
 
 #define   PKG_LEN             1024*2
-#define   LARGE_PKG_LEN             1024*6
+#define   LARGE_PKG_LEN             (1024 * 10) // 1024*6
 #ifdef FEATURE_LTE_ONLY
 #define   NET_SND_TIMEOUT_SECOND  2
 #define   NET_REV_TIMEOUT_SECOND  1

diff --git a/2.sdk/sdk/releasepack/config/partition/CRANE_SINGLE_FLASH_LAYOUT.json b/2.sdk/sdk/releasepack/config/partition/CRANE_SINGLE_FLASH_LAYOUT.json
index f473afb..6f260c4 100644 (file)
--- a/2.sdk/sdk/releasepack/config/partition/CRANE_SINGLE_FLASH_LAYOUT.json
+++ b/2.sdk/sdk/releasepack/config/partition/CRANE_SINGLE_FLASH_LAYOUT.json
@@ -87,7 +87,7 @@
         {
           "name": "nvm",
           "format": "raw",
-          "size": "2024KiB"
+          "size": "1536KiB"
         },
         {
           "name": "factory",