增加n9编译选项，修复编译问题

diff --git a/autobuild.sh b/autobuild.sh
index 3585ee4..f6a5df4 100644 (file)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -135,8 +135,8 @@ if [ "$1" == "n9" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_n9
 APPLICATION_NAME=brandy-native-js-n9
-RECOVERY_NAME=brandy-native-js-n9-r
-SSB_NAME=brandy-native-js-n9-ssb
+RECOVERY_NAME=$APPLICATION_NAME-r
+SSB_NAME=$APPLICATION_NAME-ssb
 BUILD_NAME=_N9
 fi
 

diff --git a/code/sdk/application/wearable/CMakeLists.txt b/code/sdk/application/wearable/CMakeLists.txt
index dccf1cc..1fcb3cf 100644 (file)
--- a/code/sdk/application/wearable/CMakeLists.txt
+++ b/code/sdk/application/wearable/CMakeLists.txt
@@ -16,6 +16,9 @@ add_subdirectory_if_exist(alipay)
 if("SUPPORT_AUTO_OTA" IN_LIST DEFINES)
     add_subdirectory_if_exist(auto_ota)
 endif()
+if("BOARD_N9" IN_LIST DEFINES)
+    add_subdirectory_if_exist(n9)
+endif()
 add_subdirectory_if_exist(dsoftbus_deps)
 add_subdirectory_with_alias_if_exist(SystemView ${PROJECT_BINARY_DIR}/systemview)
 add_subdirectory_if_exist(svr_dynload)
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-n9/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-n9/libuikit_fwk.a
index b1ab9d2..e3ce469 100644 (file)
Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-n9/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-n9/libuikit_fwk.a differ

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-n9/libmsg_center.a b/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-n9/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-n9/libmsg_center.a differ

diff --git a/code/sdk/application/wearable/n9/nativeapp/brandy-native-js-n9/libuikit_fwk.a b/code/sdk/application/wearable/n9/nativeapp/brandy-native-js-n9/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/n9/nativeapp/brandy-native-js-n9/libuikit_fwk.a differ

diff --git a/code/sdk/application/wearable/n9/service/msg_center/brandy-native-js-n9/libmsg_center.a b/code/sdk/application/wearable/n9/service/msg_center/brandy-native-js-n9/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/n9/service/msg_center/brandy-native-js-n9/libmsg_center.a differ

diff --git a/code/sdk/application/wearable/nativeapp/brandy-native-js-n9/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-native-js-n9/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/nativeapp/brandy-native-js-n9/libuikit_fwk.a differ

diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-n9/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-n9/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/service/msg_center/brandy-native-js-n9/libmsg_center.a differ

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index f31b149..6a39ae2 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -44,6 +44,7 @@ extern "C" {
 
 #ifdef SUPPORT_CYWEE_SERVICE
 #include "cywee_data.h"
+#include "cywee_hal.h"
 #endif
 
 extern uint8_t g_bloodoxygen;
@@ -55,6 +56,7 @@ extern LocationInfo_t g_locationInfo;
 /* 订阅事件设定优先级 */
 const PriorityMapper PRI_MAPPER[] = {
     {TOPIC_EVENT_ALARM_RING, PRIORITY_TWO},
+    {TOPIC_EVENT_ON_TIME,PRIORITY_TWO},
     {TOPIC_EVENT_NEXTDAY_UPDATE, PRIORITY_TWO},
     {TOPIC_EVENT_HFP_INCOMMING, PRIORITY_ONE},
     {TOPIC_EVENT_HFP_FINISHED, PRIORITY_ONE},
@@ -93,6 +95,7 @@ static bool CheckPriority(const Topic topic)
 void MsgCenterSubscribe()
 {
     MsgCenterSubscribeTopic(TOPIC_EVENT_ALARM_RING);
+    MsgCenterSubscribeTopic(TOPIC_EVENT_ON_TIME);
     MsgCenterSubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
     MsgCenterSubscribeTopic(TOPIC_EVENT_HFP_INCOMMING);
     MsgCenterSubscribeTopic(TOPIC_EVENT_HFP_PHONE_ACTIVE);

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 3fc4ddf..3d4aa30 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -931,9 +931,16 @@ target = {
     ################# N9 ############################
     'brandy-native-js-n9': {
         'base_target_name': 'brandy-native-js',
+        #自定义配置项，选择硬件及功能参数
         'defines': [
             'BOARD_N9',
+
+            # cat1 相关配置
             'FT_SINGLE_UART',
+            'ENABLE_SLIP',
+            'SUPPORT_CAT1_SERVICE',
+            'SUPPORT_TCPIP',           
+            
             'CONFIG_EFUSE_READ_TO_RAM',
              'CUSTOM_UTILS',
             # 'CUSTOM_HID_SERVICE',
@@ -944,8 +951,9 @@ target = {
             # 'ACC_LIS2DOC',
             'ENABLE_CUSTOM_I2C',
             #'ENABLE_VIBRATOR',
-            # 'ENABLE_SLIP',
             'ENCODER_SUPPORT',
+            # 'SUPPORT_SPO2_NOTIFICATION',
+            # 'SUPPORT_SPO2_NOTIFICATION_TEST',
             'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
             # 'ENABLE_FONT_VECTOR_GLOBAL', 
             # 'ENABLE_SHAPING',
@@ -961,12 +969,10 @@ target = {
             # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
             #"MEM_CHECK",
             #'ENABLE_WEBSOCKET',
-            'CYWEE_MAC_ACTIVE',
-            'SUPPORT_CAT1_SERVICE',
-            #'SUPPORT_TCPIP',                                  
+            'CYWEE_MAC_ACTIVE',                        
             #'SUPPORT_HID_SERVICE',
             'SUPPORT_BAIDU_MAP',
-            'CFG_FLASH_SIZE=16',
+            'CONFIG_NORFLASH_SIZE=16',
             'SINGLE_USER_PARTITION',
             'TPTYPE_CST86XX',
             'ROTARYENCODER_MIXO',
@@ -988,9 +994,9 @@ target = {
                            "mag_sensor_mmc5603",
                           "vibrator",
                           "vibrator_service",
-                          "-:lwip",
+                          #"-:lwip",
                           "cat1Service",
-                        #   "cat1Test",
+                           "cat1Test",
                           "audio_manager",
                           "CustomUIcomponentTool",
                           "nativeabilityfwk",
@@ -1017,6 +1023,7 @@ target = {
                            ],
                'image_analysis': False,
                'fs_image_path':'fd230',
+        'ssb_version': 'brandy-native-js-n9-ssb',
                # 'fs_image_path':'evb',
                'fs_image': True
     },
@@ -1026,11 +1033,11 @@ target = {
         'defines': [
                     'BOARD_N9',
                     'FT_SINGLE_UART',
-                    'CFG_FLASH_SIZE=16',
-                    'FD230',
-                                       'SINGLE_USER_PARTITION',
+                    'NANDFLASH_F35UQA',
                     'TPTYPE_CST86XX',
-                    'NANDFLASH_F35UQA'
+                    'CONFIG_NORFLASH_SIZE=16',
+                    'FD230',
+                                       'SINGLE_USER_PARTITION'
                ],
                'ram_component': ["at_cmd"]
     },
@@ -1038,15 +1045,14 @@ target = {
         'base_target_name': 'brandy-ssb',
         #自定义配置项，选择硬件及功能参数
         'defines': [
-            'CFG_FLASH_SIZE=16',
-            'FD230',
             'BOARD_N9',
             'FT_SINGLE_UART',
             'ENABLE_ECC',
             'CFG_DRIVERS_NANDFLASH',
-            'SINGLE_USER_PARTITION',
-            'GPIO_POWERON_FLASH',
-            'NANDFLASH_F35UQA' 
+            'CONFIG_NORFLASH_SIZE=16',
+            'FD230',
+            'NANDFLASH_F35UQA',
+            'GPIO_POWERON_FLASH'
         ]
     },
 }

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 48630ff..7c0f984 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
@@ -15,10 +15,22 @@
 extern void bp_int_callback(pin_t pin, uintptr_t param);
 #endif
 
-#ifdef PPG_GH3X2X
+#ifdef SUPPORT_PPG_SERVICE
 extern void ppg_int_callback(pin_t pin, uintptr_t param);
 #endif
 
+#ifdef ENABLE_GYRO
+extern void gyro_int_callback(pin_t pin, uintptr_t param);
+#endif
+
+#ifdef ROTARYENCODER_MIXO
+// extern void mixo_int_callback(pin_t pin, uintptr_t param);
+#endif
+
+#ifdef SUPPORT_CYWEE_SERVICE
+extern void cywee_int_callback(pin_t pin, uintptr_t param);
+#endif
+
 /**
  * @addtogroup connectivity_config_boards
  * @{
@@ -84,13 +96,8 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_EMMC, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_HGPIO15 emmc clk
 #endif
     { HAL_PIO_FUNC_SPI0, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_MGPIO0   NC
-#ifdef BOARD_W9
     { HAL_PIO_FUNC_I2C2_M3, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },  // S_MGPIO1 I2C2 SCL Sensor 6轴 指南针 心率
     { HAL_PIO_FUNC_I2C2_M3, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },  // S_MGPIO2 I2C2 SDA Sensor
-#else
-    { HAL_PIO_FUNC_SPI0, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_MGPIO1   NC
-    { HAL_PIO_FUNC_SPI0, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_MGPIO2   NC
-#endif
     { HAL_PIO_FUNC_SPI0, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_MGPIO3   NC
 
 // #if (defined BRANDY_PRODUCT_EVB4)
@@ -110,13 +117,8 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_I2C0_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE }, // S_MGPIO12 I2C0 SDA
     { HAL_PIO_FUNC_I2C1_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO13 I2C1 SCL touch i2c
     { HAL_PIO_FUNC_I2C1_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO14  I2C1 SDA
-#ifdef BOARD_W9
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },  // S_MGPIO15 I2C2 SCL Sensor 6轴 指南针 心率
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },  // S_MGPIO16 I2C2 SDA Sensor
-#else
-    { HAL_PIO_FUNC_I2C2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },  // S_MGPIO15 I2C2 SCL Sensor 6轴 指南针 心率
-    { HAL_PIO_FUNC_I2C2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },  // S_MGPIO16 I2C2 SDA Sensor
-#endif
     { HAL_PIO_FUNC_I2C3_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_MGPIO17 i2c3 SCL    smart pa\ 预留马达控制 \安全芯片
     { HAL_PIO_FUNC_I2C3_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_MGPIO18  I2C3 SDA
     { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },    // S_MGPIO19 uart1 tx
@@ -153,6 +155,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },     // S_MGPIO37 uart tx  NC
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },       // S_MGPIO38 uart rx  NC
 #endif
+
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },     // S_AGPIO_L0  NC
 
     { HAL_PIO_FUNC_I2S1_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_L1 i2s1
@@ -212,10 +215,14 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
 //   #else
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_R2     VIBR_PWM 马达控制脚 兼容预留马达驱动复位脚
 //   #endif
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE  },   // S_AGPIO_R3     NC   
+#ifdef BOARD_N9
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE  },   // S_AGPIO_R3     NC   
+#else
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE  }, 
+#endif
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE  },    // S_AGPIO_R4     tp reset
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE  },   // S_AGPIO_R5     touch int
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },    // S_AGPIO_R6     PRG_INT 心率中断
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },    // S_AGPIO_R6     PRG_INT 心率中断
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_R7     GYRO_INT2
 #ifdef ENABLE_GYRO
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_R8     GYRO_INT1
@@ -308,9 +315,9 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 
 #ifdef SUPPORT_CYWEE_SERVICE
     /**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   
+#endif    
     /**S_AGPIO_R1 GPO alipay默认resetpin*/
     {   S_AGPIO_R1, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
 #ifdef SUPPORT_CAT1_SERVICE
@@ -320,7 +327,7 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 
 #endif
 #ifdef ENABLE_GYRO
-     {   S_AGPIO_R8, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
+     {   S_AGPIO_R8, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, gyro_int_callback },
 #else
   /**S_AGPIO_L32 GPO gps reset*/
     // {   S_AGPIO_L32, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
@@ -328,8 +335,15 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 #ifdef ENABLE_BN02
      {   S_AGPIO_R3, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, bp_int_callback },
 #endif
+#ifdef SUPPORT_PPG_SERVICE
 #ifdef PPG_GH3X2X
-    // {   S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE,  ppg_int_callback},
+    {   S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE,  ppg_int_callback},
+#elif defined PPG_PAH8009
+    // {   S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_FALLING_EDGE,  ppg_int_callback},
+#endif
+#endif
+#ifdef ROTARYENCODER_MIXO
+    // {   S_AGPIO_L0, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_FALLING_EDGE,  mixo_int_callback},
 #endif
 };
 /**

diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9-r/libgfx_rm.a
new file mode 100644 (file)
index 0000000..a731301
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9-r/libgfx_rm.a differ

diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9/libgfx_rm.a
new file mode 100644 (file)
index 0000000..7337ef0
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-n9/libgfx_rm.a differ

diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-n9/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-n9/libdisplay_gfx.a
new file mode 100644 (file)
index 0000000..8864f8e
Binary files /dev/null and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-n9/libdisplay_gfx.a differ

diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-n9/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-n9/libuikit_ext.a
new file mode 100644 (file)
index 0000000..9d278be
Binary files /dev/null and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-n9/libuikit_ext.a differ

diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9-r/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..ef8c37d
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9-r/libx_vfs_private.a differ

diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..1c08fcb
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9/libx_vfs_private.a differ

diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9-r/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..00beb36
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9-r/libfs_yaffs2.a differ

diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..50e244a
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9/libfs_yaffs2.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-n9/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-n9/libams.a
new file mode 100644 (file)
index 0000000..b294a76
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-n9/libams.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace.a
new file mode 100644 (file)
index 0000000..e807091
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace_http.a
new file mode 100644 (file)
index 0000000..cdfdb31
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libace_http.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libnetstack_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libnetstack_http.a
new file mode 100644 (file)
index 0000000..b9c1bb0
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libnetstack_http.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libwebsocket.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libwebsocket.a
new file mode 100644 (file)
index 0000000..93b5e6f
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-n9/libwebsocket.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-n9/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-n9/libbms.a
new file mode 100644 (file)
index 0000000..f262ad8
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-n9/libbms.a differ

diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-n9/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-n9/libjerryscript.a
new file mode 100644 (file)
index 0000000..bafd4fc
Binary files /dev/null and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-n9/libjerryscript.a differ

diff --git a/code/sdk/zhihui/drivers/cywee/dml/board_yh601s.c b/code/sdk/zhihui/drivers/cywee/dml/board_yh601s.c
index 3faad48..d801efb 100644 (file)
--- a/code/sdk/zhihui/drivers/cywee/dml/board_yh601s.c
+++ b/code/sdk/zhihui/drivers/cywee/dml/board_yh601s.c
@@ -243,7 +243,7 @@ int CWM_OS_dbgOutput(const char * format)
 {
     PRINT("%s", format); 
 #ifdef SUPPORT_CYWEE_BLE_SERVICE
-    if(cywee_dml_get_log_flag())
+    if(cywee_get_log_flag())
         ble_cywee_server_send_input_report((uint8_t *)format,strlen(format));
 #endif
     return 0;

diff --git a/code/sdk/zhihui/drivers/cywee/dml/cywee_data.h b/code/sdk/zhihui/drivers/cywee/dml/cywee_data.h
index 375eb81..91810eb 100644 (file)
--- a/code/sdk/zhihui/drivers/cywee/dml/cywee_data.h
+++ b/code/sdk/zhihui/drivers/cywee/dml/cywee_data.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: 2025-05-20 11:51:23
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2025-07-23 14:02:35
+ * @LastEditTime: 2025-08-05 11:05:44
  * @FilePath: /FD230/code/sdk/zhihui/drivers/cywee/dml/cywee_data.h
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -84,6 +84,7 @@ void cywee_stand_history_save(uint32_t time);
 void cywee_restoreData(void);
 void cywee_save_data(void);
 int32_t cywee_get_now_hour_data(void*value, uint8_t type);
+void cywee_fat_history_save(uint32_t time);
 
 #ifdef __cplusplus
 #if __cplusplus

diff --git a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c
index 960bb7b..279ab28 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c
+++ b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c
@@ -506,7 +506,7 @@ static void get_avg_hrs(uint8_t hrs)
                 max_hrs = hrs_data[i];\r
         }\r
         avg_hrs = (sum_hrs - max_hrs - min_hrs) / (hrs_num - 2);\r
-        printf("max_hrs[%d],min_hrs[%d],avg_hrs[%d]\n",max_hrs,min_hrs,avg_hrs);\r
+        // printf("max_hrs[%d],min_hrs[%d],avg_hrs[%d]\n",max_hrs,min_hrs,avg_hrs);\r
     }\r
 }\r
 \r
@@ -1815,7 +1815,7 @@ void pah8009_control(char *mode,uint8_t enable)
             // touch_only_sensor_start();\r
             ppg_only_sensor_start();\r
 #if POLLING_MODE\r
-            time_out = 30;\r
+            time_out = 40;\r
 #endif\r
         } else if (strcmp(mode, "hrv") == 0) {\r
             // md = HRV_MODE;\r
@@ -1825,7 +1825,7 @@ void pah8009_control(char *mode,uint8_t enable)
             ppg_only_sensor_start();\r
             work_mode = 2;\r
 #if POLLING_MODE\r
-            time_out = 30;\r
+            time_out = 40;\r
 #endif\r
         } else if (strcmp(mode, "leaklight") == 0) {\r
             // md = FT_LEAK_LIGHT_MODE;\r

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/mixo/mixo_ots_driver.c b/code/sdk/zhihui/drivers/rotary_encoder/mixo/mixo_ots_driver.c
index 34c2068..518d963 100644 (file)
--- a/code/sdk/zhihui/drivers/rotary_encoder/mixo/mixo_ots_driver.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/mixo/mixo_ots_driver.c
@@ -32,9 +32,9 @@ static void put_crown_result(int16_t x)
     {   
         return;
     }
-    if(abs(x)>=8 )
+    if(abs(x)>=4 )
     {
-        ots_result += x/8; //大于4的值除以4, 代表角度, 单位0.5°
+        ots_result += x/4; //大于4的值除以4, 代表角度, 单位0.5°
     }
     else
     {

diff --git a/code/sdk/zhihui/services/gnss/CMakeLists.txt b/code/sdk/zhihui/services/gnss/CMakeLists.txt
index 637cfa9..912d56b 100644 (file)
--- a/code/sdk/zhihui/services/gnss/CMakeLists.txt
+++ b/code/sdk/zhihui/services/gnss/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/uart_gnss.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/gnss_ctl.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/NMEA0183.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/gnss_tcp_server.c
+    # ${CMAKE_CURRENT_SOURCE_DIR}/src/gnss_tcp_server.c
     ${TIOT_SRC_LIST}
 )
 set(PUBLIC_HEADER