XTS编译相关文件提交
authorluozheng <1732036298@qq.com>
Sat, 10 May 2025 02:27:05 +0000 (10:27 +0800)
committerluozheng <1732036298@qq.com>
Mon, 12 May 2025 07:13:24 +0000 (15:13 +0800)
12 files changed:
autobuild.sh
code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c
code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h
code/sdk/middleware/utils/fs/yaffs2/yaffs/direct/include/yaffscfg.h
code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
code/sdk/open_source/openharmony/base/startup/syspara_lite/src/parameter_common.c
code/sdk/open_source/openharmony/test/xts/acts/commonlibrary_lite/file_hal/src/utils_file_reli_test.c
code/sdk/open_source/openharmony/test/xts/tools/lite/hctest/src/hctest.c
code/sdk/open_source/openharmony/utils/native/lite/kv_store/src/kvstore_impl_posix/kv_store.c
tools/scripts/create_project.sh

index 854e78d..70952c2 100644 (file)
@@ -87,6 +87,16 @@ RECOVERY_NAME=$APPLICATION_NAME-r
 SSB_NAME=$APPLICATION_NAME-ssb
 BUILD_NAME=_FD230
 fi
+
+if [ "$1" == "xts" ]
+then
+TARGET_PACK_NAME=pack_brandy_native_js_xts
+APPLICATION_NAME=brandy-native-js-xts
+RECOVERY_NAME=$APPLICATION_NAME-r
+SSB_NAME=$APPLICATION_NAME-ssb
+BUILD_NAME=_XTS
+fi
+
 if [ "$1" == "u8" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_u8
index 1281da4..0f37f1a 100644 (file)
@@ -122,7 +122,11 @@ namespace OHOS
                         #else
                         uapi_set4GCapability(false);
                         #endif
+                        #ifdef SUPPORT_CAT1_SERVICE
                         ConfigModel::GetInstance()->SetCat1_4Gability(cat1_api_is_cat1_enabled());
+                        #else
+                        ConfigModel::GetInstance()->SetCat1_4Gability(false);//xts
+                        #endif
                     
                         if(p_NetworkAndCallView->GetVoLTEToggleButton() && p_NetworkAndCallView->GetVoLTEToggleButton()->GetState())
                         {
index b8a32b9..53c85ca 100644 (file)
@@ -161,7 +161,7 @@ target = {
         'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'xts_set', 'xts_test_set', 'alipay_set', 'msg_center_service'],
         'dsp_version': 'max',
         'packet': True,
-        'fs_image': False
+        # 'fs_image': False
     },
 
     'brandy-target1-r': {
@@ -440,6 +440,117 @@ target = {
             'FD230',
             'NANDFLASH_DS35X'
         ]
+    },
+       ##################xts#######################
+    'brandy-native-js-xts': {
+    'base_target_name': 'brandy-xts',
+    #自定义配置项,选择硬件及功能参数
+    'defines': [
+        'BOARD_FD230',
+        'FT_SINGLE_UART',
+        'CONFIG_EFUSE_READ_TO_RAM',
+        # 'CUSTOM_UTILS',
+        # 'CUSTOM_HID_SERVICE',
+        # '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',
+        # 'SUPPORT_BLE_SERVICE',
+        'FD230',
+        # 'SUPPORT_AUTO_OTA_SERVER',
+        # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
+        #"MEM_CHECK",
+        # 'ENABLE_WEBSOCKET',
+        # 'CYWEE_SPORT',
+        # 'CYWEE_MAC_ACTIVE',
+        # 'SUPPORT_CAT1_SERVICE',
+        # 'SUPPORT_TCPIP',                                     
+        'SUPPORT_HID_SERVICE',
+        'SUPPORT_BAIDU_MAP',
+        'CFG_FLASH_SIZE=16',
+        'SINGLE_USER_PARTITION',
+        'TPTYPE_FT6X46',
+        'ROTARYENCODER_HX3507',
+        'NANDFLASH_DS35X',
+        # 'BLE_INSTRUCT',
+        # 'FACTORYTEST_SERVICE',
+    ],
+    #添加自定义应用
+    'ram_component': [
+                        # 'audio_at_service', 
+                        # 'media_at_service', 
+                        # 'bt_manager_at_service',
+                    #   "ppg_sensor",
+                    #   "ppgBleService",
+                    #   "mag_sensor",
+                        "vibrator",
+                        "vibrator_service",
+                        "-:lwip",
+                        # "cat1Service",
+                        # "cat1Test",
+                        # "audio_manager",
+                        "CustomUIcomponentTool",
+                        "nativeabilityfwk",
+                        "custom_utils",
+                        "custom_utilscpp",
+                        "custom_config",
+                        "rotary_encoder",
+                        "nativelauncher",
+                    #    "ppg_service",
+                    #    "cywee",
+                    #    "batterry_service",
+                    #    "bleservice",
+                    #    "blemoder",
+                    #    "factorytest_service",
+                    #    "hid_service",
+                    #    "producttest",
+                        ],
+    'image_analysis': False,
+    'fs_image_path':'fd230',
+    'fs_image': True
+    },
+    'brandy-native-js-xts-r': {
+        'base_target_name': 'brandy-xts-r',
+        #自定义配置项,选择硬件及功能参数
+        'defines': [
+                    'BOARD_FD230',
+                    'FT_SINGLE_UART',
+                    'NANDFLASH_DS35X',
+                    'TPTYPE_FT6X46',
+                    'CFG_FLASH_SIZE=16',
+                    'FD230',
+                                       'SINGLE_USER_PARTITION'
+               ],
+               'ram_component': ["at_cmd"]
+    },
+    'brandy-native-js-xts-ssb': {
+        'base_target_name': 'brandy-ssb',
+        #自定义配置项,选择硬件及功能参数
+        'defines': [
+            'BOARD_FD230',
+            'FT_SINGLE_UART',
+            'ENABLE_ECC',
+            'CFG_DRIVERS_NANDFLASH',
+            'CFG_FLASH_SIZE=16',
+            'FD230',
+            'NANDFLASH_DS35X'
+        ]
     },
        ##################u8#######################
     'brandy-native-js-u8':{
@@ -802,6 +913,8 @@ target_group = {
     'pack_brandy_native_js_user': ['brandy-native-js-user-ssb', 'brandy-native-js-user-r', 'brandy-native-js-user'],
     'pack_brandy_xts': ['brandy-ssb', 'brandy-xts-r', 'brandy-xts'],
 
+    'pack_brandy_native_js_xts': ['brandy-native-js-xts-ssb', 'brandy-native-js-xts-r', 'brandy-native-js-xts'],
+
     'brandy_all': ['brandy-ssb',
                    'brandy-target1', 'brandy-target3', 'brandy-target4', 'brandy-target5', 'brandy-native-js', 'brandy-native-js-user', 'brandy-xts',
                    'brandy-target1-r', 'brandy-target3-r', 'brandy-target4-r', 'brandy-target5-r', 'brandy-native-js-r', 'brandy-xts-r',
index c7df904..dc93256 100644 (file)
@@ -290,6 +290,19 @@ static uart_recovery_regs_t g_uart_recovery_reg[UART_BUS_MAX_NUMBER] = { 0 };
 #ifdef FT_SINGLE_UART
 void log_factory_at_callback(const void *buffer, uint16_t length, bool remaining)
 {
+#ifdef XTS_SUPPORT
+    #if SYS_DEBUG_MODE_ENABLE == YES
+        log_uart_rx_callback(buffer, length, remaining);
+    #endif
+    if (zdiag_is_enable() == false) {
+    #ifdef SUPPORT_AT_CMD
+        at_cmd_msg_receive_handler((uint8_t *)buffer, length);
+    #endif
+        hal_uart_clear_pending(UART_BUS_1);
+    }
+    return;
+#endif
+
 #ifndef SUPPORT_RECOVERY_DISPLAY //判定是否是在编译RECOVERY image,本参数不支持RECOVERY
 #ifdef CUSTOM_UTILS
     if (uapi_custom_uart_rx_enable_flag() == false)
index fd819e2..123a704 100644 (file)
@@ -544,7 +544,11 @@ const char* get_language_font(uint8_t id);
 
 bool is_load_languages(uint8_t id);
 
+#ifdef XTS_SUPPORT
+#define DEFAULT_VECTOR_FONT_FILENAME     HARMONYOS_VECTOR_FONT_FILENAME
+#else
 #define DEFAULT_VECTOR_FONT_FILENAME     get_current_global_font_name()
+#endif
 
 
 #define DEFAULT_VECTOR_FONT_FILENAME_EN     HARMONYOS_VECTOR_FONT_FILENAME
index baa96fc..00da22a 100644 (file)
@@ -31,7 +31,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 #ifndef MEMORY_MINI
+#ifdef XTS_SUPPORT
+#define YAFFSFS_N_HANDLES    110
+#else
 #define YAFFSFS_N_HANDLES    100
+#endif
 #define YAFFSFS_N_DSC        20
 #else
 #define YAFFSFS_N_HANDLES    10
index 5c1d229..e9c6ea8 100644 (file)
 #include <ctype.h>\r
 #include <securec.h>\r
 \r
-static const char OHOS_PRODUCT_TYPE[] = {"****"};\r
-static const char OHOS_MANUFACTURE[] = {"****"};\r
-static const char OHOS_BRAND[] = {"****"};\r
-static const char OHOS_MARKET_NAME[] = {"OpenHarmony 5.0"};\r
-static const char OHOS_PRODUCT_SERIES[] = {"****"};\r
-static const char OHOS_PRODUCT_MODEL[] = {"****"};\r
-static const char OHOS_SOFTWARE_MODEL[] = {"****"};\r
-static const char OHOS_HARDWARE_MODEL[] = {"****"};\r
+static const char OHOS_PRODUCT_TYPE[] = {"litewearable"}; \r
+static const char OHOS_MANUFACTURE[] = {"Tenxinbona"};\r
+static const char OHOS_BRAND[] = {"KUMI"};\r
+static const char OHOS_MARKET_NAME[] = {"KUMI WATCH Soar"};\r
+static const char OHOS_PRODUCT_SERIES[] = {"KUMI WATCH Soar"};\r
+static const char OHOS_PRODUCT_MODEL[] = {"Watch Soar"};\r
+static const char OHOS_SOFTWARE_MODEL[] = {"1.0.0"};\r
+static const char OHOS_HARDWARE_MODEL[] = {"FD230V10"};\r
 static const char OHOS_HARDWARE_PROFILE[] = {"aout:true,display:true"};\r
 static const char OHOS_BOOTLOADER_VERSION[] = {"bootloader"};\r
 static const char OHOS_SECURITY_PATCH_TAG[] = {"2024/12/01"};\r
-static const char OHOS_ABI_LIST[] = {"****"};\r
+static const char OHOS_ABI_LIST[] = {"riscv-liteos"};\r
 static const char OHOS_SERIAL[] = {"1234567890"};  // provided by OEM.\r
 const char g_roBuildOs[] = {"OpenHarmony"};\r
 const char g_roBuildVerShow[] = {"OpenHarmony 5.0.1.115"};\r
@@ -45,7 +45,8 @@ const char BUILD_HOST[] = {"BUILD_HOST"};
 const char BUILD_TIME[] = {"BUILD_TIME"};\r
 const char BUILD_ROOTHASH[] = {"BUILD_ROOTHASH"};\r
 \r
-#define DATA_PATH          "/user/res/"\r
+// #define DATA_PATH          "/user/res/"\r
+#define DATA_PATH          "/user/"\r
 #define MAX_KEY_PATH       128\r
 \r
 static boolean IsValidChar(const char ch)\r
@@ -282,17 +283,32 @@ char* HalGetHardwareProfile(void)
 \r
 char* HalGetSerial(void)\r
 {\r
-    char* value = (char*)malloc(strlen(OHOS_SERIAL) + 1);\r
-    if (value == NULL) {\r
-        return NULL;\r
+    static const char OHOS_SERIAL[] = "1234567890";\r
+    unsigned char sn_buf[32] = {0};\r
+    unsigned int len = 0;\r
+    unsigned int ret = zh_get_sn(sn_buf, &len);\r
+    \r
+    // 检查返回值和缓冲区是否为空\r
+    if (ret != 0 || len == 0 || sn_buf[0] == '\0') {\r
+        char* value = (char*)malloc(sizeof(OHOS_SERIAL));\r
+        if (value == NULL) {\r
+            printf("malloc failed\n");\r
+            return NULL;\r
+        }\r
+        strcpy_s(value, sizeof(OHOS_SERIAL), OHOS_SERIAL);\r
+        return value;\r
     }\r
-    if (strcpy_s(value, strlen(OHOS_SERIAL) + 1, OHOS_SERIAL) != 0) {\r
-        free(value);\r
+    \r
+    // 正常处理非空情况\r
+    char* value = (char*)malloc(len + 1); // 使用实际长度而非strlen\r
+    if (value == NULL) {\r
+        printf("malloc failed\n");\r
         return NULL;\r
     }\r
+    memcpy(value, sn_buf, len); // 使用memcpy确保二进制安全\r
+    value[len] = '\0';          // 手动添加字符串结束符\r
     return value;\r
 }\r
-\r
 char* HalGetBootloaderVersion(void)\r
 {\r
     char* value = (char*)malloc(strlen(OHOS_BOOTLOADER_VERSION) + 1);\r
index e71be67..e58aff1 100644 (file)
 #define VERSION_ID_LEN 256\r
 #define PROPERTY_MAX_LENGTH 2048\r
 #define INCREMENTAL_VERSION "version"\r
-#define BUILD_TYPE "BUILD_TYPE"\r
-#define BUILD_USER "BUILD_USER"\r
-#define BUILD_HOST "BUILD_HOST"\r
-#define BUILD_TIME "BUILD_TIME"\r
-#define BUILD_ROOTHASH "BUILD_ROOTHASH"\r
+#define BUILD_TYPE "release"\r
+#define BUILD_USER "luozheng"\r
+#define BUILD_HOST "linux"\r
+#define BUILD_TIME "20250508"//ci处本来是和真正的编译时间一致的,当下写死,因为后面提交的时候也要求必须一致。动态是我们平时release的状态,这个功能以后添加\r
+#define BUILD_ROOTHASH "default"\r
 \r
 #define HASH_LENGTH 32\r
 #define DEV_BUF_LENGTH 3\r
index 8458f55..1fc220c 100644 (file)
@@ -21,7 +21,7 @@
 #define FILE_SEEK_OFFSET_0 0
 #define FILE_SEEK_OFFSET_20 20
 #define FILE_SEEK_OFFSET_MINUS_20 (-20)
-#define MAX_NUM_OF_OPENED_FILES 99
+#define MAX_NUM_OF_OPENED_FILES 96
 #define LENGTH_OF_READ_BUF 36
 #define FILE_INDEX_31 31
 #define LENGTH_OF_FILE_NAME_BUF 32
index 5122aa0..0c66578 100644 (file)
@@ -373,3 +373,13 @@ TestSuiteManager* GetTestMgrInstance(void)
 {
     return &g_testSuiteManager;
 }
+
+// 检查测试是否完成
+uint8_t  is_xts_test_done(void)
+{
+    if (g_totalSuitesNum == g_doneSuitesNum) {
+        return 1;
+    }else{
+        return 0;
+    }
+}
\ No newline at end of file
index a6b64e9..6b20a15 100644 (file)
 #include "ohos_types.h"
 #include "utils_config.h"
 
+#ifdef XTS_SUPPORT
+#define KVSTORE_PATH       "kvstore"
+#else
 #define KVSTORE_PATH       "user/system/kvstore"
+#endif
 #define MAX_KEY_PATH       256
 #define MAX_GET_VALUE_LEN  0x7FFFFFFF
 static pthread_mutex_t g_kvGlobalMutex = PTHREAD_MUTEX_INITIALIZER;
index 031b9bf..7ad4c96 100644 (file)
@@ -37,9 +37,15 @@ done
 
 for l in $projectlist_wearable
 do
+if [ "$projectname" == "xts" ]; then
+targetdir=code/sdk/application/wearable/fd230/$projectname/$l-$projectname
+targetdir2=code/sdk/application/wearable/fd230/$l-$projectname
+srcdir=code/sdk/application/wearable/fd230/$l
+else
 targetdir=code/sdk/application/wearable/$projectname/$l-$projectname
 targetdir2=code/sdk/application/wearable/$l-$projectname
 srcdir=code/sdk/application/wearable/$l
+fi
 # echo rm -r $targetdir
 # echo mkdir -p $targetdir
 # echo cp -r $srcdir/* $targetdir/