w9编译修复

diff --git a/.gitignore b/.gitignore
index 2fee7f0..fd2dee4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ code/sdk/build/config/target_config/brandy/mk_fs_image/file.bin
 code/sdk/build/config/target_config/brandy/mk_fs_image/file_tmp.bin
 code/sdk/files/fd230/fs/user/fileschecksum.txt
 code/sdk/files/evb/fs/user/fileschecksum.txt
+tools/image_converter_tool/output/**
+

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index df3a3bf..cf87849 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -528,18 +528,82 @@ target = {
        ################# W9 ############################
     'brandy-native-js-w9': {
         'base_target_name': 'brandy-native-js',
-        #自定义配置项，选择硬件及功能参数
-        'defines': [
-            'BOARD_W9',
-            'FT_SINGLE_UART',
-            'SUPPORT_AUTO_OTA_SERVER', 
-            'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
-            'TPTYPE_CST86XX',
-            'GNSS_UART1',
-            'NANDFLASH_F35UQA'
-        ],
-        #添加自定义应用
-        'ram_component': ['custom_cmd_service','gnss','custom_utils']
+        'defines': ['CONFIG_EFUSE_READ_TO_RAM',
+                                       'FT_SINGLE_UART',
+                    # 'WEARABLE_LOG_DEBUG',
+                    'SUPPORT_RC_CALIBRATION',
+                    'PPG_HX3695',
+                    'VIB_USE_PWM',
+                    'CONFIG_PWM_SUPPORT',
+                    # 'ACC_LIS2DOC',
+                    'ENABLE_CYWEE',
+                    'ENABLE_CUSTOM_I2C',
+                    'SUPPORT_AT_CYWEE',
+                    'MAG_MMC5603',
+                    'ENABLE_VIBRATOR',
+                    'ENABLE_SLIP',
+                    'ENCODER_SUPPORT',
+                    'SUPPORT_SPO2_NOTIFICATION',
+                    'SUPPORT_SPO2_NOTIFICATION_TEST',
+                    'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
+                    'ENABLE_FONT_VECTOR_GLOBAL', 
+                    'ENABLE_SHAPING',
+                    'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
+                    'SUPPORT_AT_CUSTOMUTILS',
+                    'CYWEE_SPORT',
+                    'CYWEE_MAC_ACTIVE',
+                    'SUPPORT_TCPIP',                                   
+                    'SUPPORT_HID_SERVICE',
+                    'SUPPORT_BAIDU_MAP',
+                    'CFG_FLASH_SIZE=8',
+                    # 'SUPPORT_BLE_SERVICE',
+                    # 'FD230',
+                    #"MEM_CHECK",
+                    #'ENABLE_WEBSOCKET',
+                    'SINGLE_USER_PARTITION',
+                    'BOARD_W9',
+                    'GNSS_UART1',
+                    'SUPPORT_AUTO_OTA_SERVER', 
+                    'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
+                    'GPS_CAT1_RESET_TEST',
+                    'TPTYPE_CST86XX',
+                    'TEST_4G_UI',
+                    'NANDFLASH_F35UQA'
+                    ],
+               'ram_component': [
+                        #'baidumapsdk',
+                        'audio_at_service', 
+                        'media_at_service', 
+                        'bt_manager_at_service',
+                        "ppg_sensor",
+                        "mag_sensor",
+                        "vibrator",
+                        "vibrator_service",
+                        "lwIP",
+                        "slip",
+                        "cat1_service",
+                        "audio_manager",
+                        # "CustomUIcomponentTool",
+                        "custom_utils",
+                        "custom_utilscpp",
+                        "custom_config",
+                        "rotary_encoder",
+                        "nativelauncher",
+                        "ppg_service",
+                        "gnss",
+                        "gnss_sample",
+                        #    "acc_sensor",
+                           "batterry_service",
+                        #  "bleservice",
+                        #  "ppgBleService",
+                        #  "blemoder",
+                        #  "factorytest_service",
+                        #  "hid_service",
+                        "cywee"
+                           ],
+               'image_analysis': False,
+               'fs_image_path':'evb',
+               'fs_image': True
     },
     'brandy-native-js-w9-r': {
         'base_target_name': 'brandy-native-js-r',
@@ -547,8 +611,12 @@ target = {
         'defines': [
             'BOARD_W9',
             'FT_SINGLE_UART',
+            'CFG_FLASH_SIZE=8',
+            'SINGLE_USER_PARTITION',
+            'TPTYPE_CST86XX',
             'NANDFLASH_F35UQA'
-        ]
+        ],
+               'ram_component': ["at_cmd"]
     },
     'brandy-native-js-w9-ssb': {
         'base_target_name': 'brandy-ssb',
@@ -556,8 +624,12 @@ target = {
         'defines': [
             'BOARD_W9',
             'FT_SINGLE_UART',
+            'ENABLE_ECC',
+            'CFG_DRIVERS_NANDFLASH',
+            'SINGLE_USER_PARTITION',
             'GPIO_POWERON_FLASH',
-            'NANDFLASH_F35UQA'
+            'CFG_FLASH_SIZE=8',
+            'NANDFLASH_F35UQA'            
         ]
     },
 ################# LT22 ############################

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h
index 8c67696..2613527 100644 (file)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h
@@ -285,7 +285,7 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 
 #ifdef ENABLE_CYWEE
     /**G sensor G_INT1 S_AGPIO_L11 G_INT2 S_AGPIO_L19   采用timer 时这些中断要屏蔽*/
-    {   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
+    // {   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
     //{   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
 #endif   
     /**S_AGPIO_R1 GPO alipay默认resetpin*/
@@ -293,7 +293,7 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 #ifdef SUPPORT_CAT1_SERVICE
     /**cat1 ring input key*/
     // {   S_AGPIO_L31, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE,  cat1_ring_isr_callback},
-    {   S_AGPIO_L31, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE,  cat1_ring_isr_callback},
+    // {   S_AGPIO_L31, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE,  cat1_ring_isr_callback},
 
 #endif
   /**S_AGPIO_L32 GPO gps reset*/

diff --git a/tools/image_converter_tool/test/clock_test/Galaxy.bin b/tools/image_converter_tool/test/clock_test/Galaxy.bin
deleted file mode 100644 (file)
index 735a018..0000000
Binary files a/tools/image_converter_tool/test/clock_test/Galaxy.bin and /dev/null differ