From: 罗正yun <1732036298@qq.com> Date: Thu, 11 Jan 2024 08:05:55 +0000 (+0800) Subject: 产品名称修改,每台设备的SN号生成还未实现 X-Git-Tag: release_V1.2.70_20241020_135402~1372 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=295bbef58b7181d711ba6e7b9b291100c14e799e;p=mirrors%2FFD230.git 产品名称修改,每台设备的SN号生成还未实现 --- diff --git a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c index e308f60cc..a97d70d3e 100755 --- a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c +++ b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c @@ -181,7 +181,7 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = { NULL, #endif { - .baud_rate = 115200, + .baud_rate = 2000000, .data_bits = UART_DATA_BIT_8, .parity = UART_PARITY_NONE, .stop_bits = UART_STOP_BIT_1, diff --git a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c index b7fc9b5d5..0cda4a998 100755 --- a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c +++ b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c @@ -23,11 +23,11 @@ #include static const char OHOS_PRODUCT_TYPE[] = {"litewearable"}; -static const char OHOS_MANUFACTURE[] = {"Shenzhen Tenxinbona Technology Co., Ltd."}; -static const char OHOS_BRAND[] = {"Shenzhen Tenxinbona Technology Co., Ltd."}; -static const char OHOS_MARKET_NAME[] = {"KUMI WATCH Soar HarmonyOS Call Watch"}; +static const char OHOS_MANUFACTURE[] = {"KUMI"}; +static const char OHOS_BRAND[] = {"KUMI"}; +static const char OHOS_MARKET_NAME[] = {"KUMI WATCH Soar"}; static const char OHOS_PRODUCT_SERIES[] = {"KUMI WATCH Soar"}; -static const char OHOS_PRODUCT_MODEL[] = {"FD230"}; +static const char OHOS_PRODUCT_MODEL[] = {"Watch Soar"}; static const char OHOS_SOFTWARE_MODEL[] = {"1.0.0"}; static const char OHOS_HARDWARE_MODEL[] = {"FD230V10"}; static const char OHOS_HARDWARE_PROFILE[] = {"aout:true,display:true"}; @@ -35,15 +35,15 @@ static const char OHOS_BOOTLOADER_VERSION[] = {"bootloader"}; static const char OHOS_SECURITY_PATCH_TAG[] = {"2023/03/01"}; static const char OHOS_ABI_LIST[] = {"riscv-liteos"}; static const char OHOS_SERIAL[] = {"1234567890"}; // provided by OEM. -const char g_roBuildOs[] = {"OpenHarmony"}; -const char g_roBuildVerShow[] = {"OpenHarmony 3.2.11.9"}; +const char g_roBuildOs[] = {"OpenHarmony-3.2.11.9"}; +const char g_roBuildVerShow[] = {"1.0.0"}; const int g_roFirstApiLevel = 1; const char INCREMENTAL_VERSION[] = {"version"}; -const char BUILD_TYPE[] = {"BUILD_TYPE"}; -const char BUILD_USER[] = {"BUILD_USER"}; -const char BUILD_HOST[] = {"BUILD_HOST"}; -const char BUILD_TIME[] = {"BUILD_TIME"}; -const char BUILD_ROOTHASH[] = {"BUILD_ROOTHASH"}; +const char BUILD_TYPE[] = {"debug"}; +const char BUILD_USER[] = {"luozheng"}; +const char BUILD_HOST[] = {"linux"}; +const char BUILD_TIME[] = {"2024111"}; +const char BUILD_ROOTHASH[] = {"default"}; #define DATA_PATH "/user/res/" #define MAX_KEY_PATH 128 diff --git a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/parameter_common.c b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/parameter_common.c index 76c44cb7c..3cb62f65d 100755 --- a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/parameter_common.c +++ b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/parameter_common.c @@ -28,11 +28,11 @@ #define VERSION_ID_LEN 256 #define PROPERTY_MAX_LENGTH 2048 #define INCREMENTAL_VERSION "version" -#define BUILD_TYPE "BUILD_TYPE" -#define BUILD_USER "BUILD_USER" -#define BUILD_HOST "BUILD_HOST" -#define BUILD_TIME "BUILD_TIME" -#define BUILD_ROOTHASH "BUILD_ROOTHASH" +#define BUILD_TYPE "debug" +#define BUILD_USER "luozheng" +#define BUILD_HOST "linux" +#define BUILD_TIME "2024111"//处本来是和真正的编译时间一致的,当下写死,因为后面提交的时候也要求必须一致。动态是我们平时release的状态,这个功能以后添加 +#define BUILD_ROOTHASH "default" #define HASH_LENGTH 32 #define DEV_BUF_LENGTH 3 @@ -40,8 +40,8 @@ #define DEV_UUID_LENGTH 65 #define OS_FULL_NAME_LEN 128 -static char g_roBuildOs[] = {"OpenHarmony"}; -static char g_roBuildVerShow[] = {"OpenHarmony 3.2.11.9"}; +static char g_roBuildOs[] = {"OpenHarmony-3.2.11.9"}; +static char g_roBuildVerShow[] = {"1.0.0"}; static char g_roSdkApiLevel[] = {"9"}; static char g_roFirstApiLevel[] = {"1"}; static const char OHOS_OS_NAME[] = { "OpenHarmony" }; @@ -372,12 +372,12 @@ static int g_seniorVersion = 2; /* * * Feature(F) version number. */ -static int g_featureVersion = 0; +static int g_featureVersion = 11; /* * * Build(B) version number. */ -static int g_buildVersion = 0; +static int g_buildVersion = 9; static const char *BuildOSFullName(void) { const char release[] = "Release";