From: SnickerSun Date: Thu, 20 Mar 2025 08:04:56 +0000 (+0800) Subject: 修复fd230配置 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~411 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=af7ea46027d7b48bcb23b4f2f771ed63cd5ae582;p=mirrors%2FFD230.git 修复fd230配置 --- diff --git a/code/sdk/application/brandy/brandy_standard/thread_init.c b/code/sdk/application/brandy/brandy_standard/thread_init.c index cb8cd4f90..d54b5d982 100644 --- a/code/sdk/application/brandy/brandy_standard/thread_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_init.c @@ -193,7 +193,7 @@ app_task_definition_t g_app_tasks[] = { (osThreadFunc_t)transmit_process_thread, NULL, (CreateQueueFunction_t)transmit_thread_msg_init, USE_DTCM_MEM }, #endif -#if defined(SUPPORT_POWER_MANAGER) && !defined(SUPPORT_AT_OHOSFWK) +#if defined(SUPPORT_POWER_MANAGER) && !defined(SUPPORT_OHOSFWK) /* OHOS场景,pms不需要独立的队列和线程,事件由UI线程接管处理 */ { { "power_display", 0, NULL, 0, NULL, PM_DISPLAY_MSG_STACK_SIZE, TASK_PRIORITY_TRANSMIT, 0, 0 }, (osThreadFunc_t)power_display_msg_thread, NULL, diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c index 4bfb9ebdc..137b70080 100644 --- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c @@ -461,10 +461,7 @@ static void thread_main(const void *unused) /* nv init and file system init must be before nv_upg_upgrade_task_process */ (void)nv_upg_upgrade_task_process(); thread_init(); - - //尽早显示启动logo ,需要 lcd 驱动,mount file system , power_display 线程管理 lcd背光 - // ohos_show_bootup_logo(); - ShowGraphicLogo(); + button_app_init(); #ifdef SUPPORT_AT_VIBRATOR @@ -539,11 +536,11 @@ static void thread_main(const void *unused) #ifdef CUSTOM_UTILS start_custom_ble_service(); #endif -#ifdef SUPPORT_ALIPAY_SEC -#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) - uapi_alipay_svr_init(); -#endif -#endif +// #ifdef SUPPORT_ALIPAY_SEC +// #if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) +// uapi_alipay_svr_init(); +// #endif +// #endif #ifdef SUPPORT_A5133_SERVICE uapi_a5133_service_init(); @@ -557,7 +554,7 @@ static void thread_main(const void *unused) gnss_uart_init(); #endif -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK //开始播放开机动画,并启动ohos系统 ohos_startup(); #endif diff --git a/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c b/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c index 788647dd2..3a221726d 100644 --- a/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c +++ b/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c @@ -75,7 +75,7 @@ void IIC_Master_Receive(unsigned char byAddr, unsigned char *pData, unsigned sho } if (ret != ERRCODE_SUCC) { - MyPrintf("se i2c data read fail! ret=0x%x", ret); + if (ret != ERRCODE_I2C_TIMEOUT) MyPrintf("se i2c data read fail! and not equal ERRCODE_I2C_TIMEOUT , ret=0x%x", ret); } return; diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c index f05c1d10d..e02955308 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.c +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c @@ -207,11 +207,10 @@ void svr_alipay_enter_lpm(void) return; } -void svr_alipay_exit_lpm(void) +int svr_alipay_exit_lpm(void) { uint32_t data; - csi_exit_lpm((void *)&data); - return; + return csi_exit_lpm((void *)&data); } int32_t svr_alipay_trans_get_last_code(char *title, uint8_t *transitcode, uint32_t *len) diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 4bf06ba47..0b51bc144 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -295,7 +295,17 @@ target = { #删除reg/mem dump,写法如下:'-:DUMP_MEM_SUPPORT', '-:DUMP_REG_SUPPORT', '-:SUPPORT_DFX_EXCEPTION' 'brandy-native-js-user': { 'base_target_name': 'brandy-native-js', - 'defines': ['-:SW_UART_DEBUG', '-:DUMP_MEM_SUPPORT', '-:DUMP_REG_SUPPORT', '-:SUPPORT_DFX_EXCEPTION'], + 'defines': [ + 'BOARD_FD230', + 'FT_SINGLE_UART', + 'NANDFLASH_DS35X', + 'SUPPORT_BAIDU_MAP', + 'CFG_FLASH_SIZE=16', + 'SINGLE_USER_PARTITION', + 'TPTYPE_FT6X46', + 'ROTARYENCODER_HX3507', + '-:SW_UART_DEBUG', '-:DUMP_MEM_SUPPORT', '-:DUMP_REG_SUPPORT', '-:SUPPORT_DFX_EXCEPTION' + ], }, 'brandy-native-js-user-r': { 'base_target_name': 'brandy-native-js-r', @@ -303,6 +313,8 @@ target = { 'defines': [ 'BOARD_FD230', 'FT_SINGLE_UART', + 'CFG_FLASH_SIZE=16', + 'SINGLE_USER_PARTITION', 'NANDFLASH_DS35X' ] }, @@ -312,6 +324,8 @@ target = { 'defines': [ 'BOARD_FD230', 'FT_SINGLE_UART', + 'CFG_FLASH_SIZE=16', + 'SINGLE_USER_PARTITION', 'NANDFLASH_DS35X' ] }, @@ -357,9 +371,7 @@ target = { 'SUPPORT_HID_SERVICE', 'SUPPORT_BAIDU_MAP', 'CFG_FLASH_SIZE=16', - 'SINGLE_USER_PARTITION' - # 'SUPPORT_AUTO_OTA_SERVER', - # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1', + 'SINGLE_USER_PARTITION', 'TPTYPE_FT6X46', 'ROTARYENCODER_HX3507', 'NANDFLASH_DS35X', @@ -396,7 +408,8 @@ target = { # "producttest", ], 'image_analysis': False, - 'fs_image_path':'fd230', + # 'fs_image_path':'fd230', + 'fs_image_path':'evb', 'fs_image': True }, 'brandy-native-js-fd230-r': { @@ -405,7 +418,7 @@ target = { 'defines': [ 'BOARD_FD230', 'FT_SINGLE_UART', - 'NANDFLASH_DS35X' + 'NANDFLASH_DS35X', 'TPTYPE_FT6X46', 'CFG_FLASH_SIZE=16', 'FD230', diff --git a/code/sdk/drivers/boards/brandy_evb/product/product.h b/code/sdk/drivers/boards/brandy_evb/product/product.h index 0c8cb8ec5..fc156185d 100644 --- a/code/sdk/drivers/boards/brandy_evb/product/product.h +++ b/code/sdk/drivers/boards/brandy_evb/product/product.h @@ -72,5 +72,5 @@ #define EMMC_SD_BUSWIDTH MMCSD_BUSWIDTH_8 #define PARTITION_EXIST YES #define ALIPAY_SEC_I2C_INDEX I2C_BUS_3 -#define ALIPAY_SEC_GPIO S_AGPIO_L29 +#define ALIPAY_SEC_GPIO S_AGPIO_R1 #endif diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/hal_nandflash.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/hal_nandflash.c index 16e087191..c95cb86df 100644 --- a/code/sdk/drivers/drivers/driver/nand_flash/nand/hal_nandflash.c +++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/hal_nandflash.c @@ -998,7 +998,7 @@ uint32_t program_load_width_32(qspi_data_type_def *qspi_data) uint32_t write_by_cpu_single_line(qspi_data_type_def *qspi_data) { - PRINT("write_by_cpu_single_line !!!\r\n"); + // PRINT("write_by_cpu_single_line !!!\r\n"); qspi_busy_wait(); uint16_t address = SWAP_U16(qspi_data->address); uint8_t *addr = (uint8_t *)&address; diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c index 68843f510..a2dafbbdc 100644 --- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c +++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c @@ -41,14 +41,16 @@ uint8_t buffer_verify[DEFALUT_BUFLENGTH] __attribute__((aligned(4))); uint8_t buffer_oob_verify[128] __attribute__((aligned(4))); // 128 is one max oob size int has_nandflash_init = 0; -// #ifndef MEMORY_MINI -// #define YF_NAME_STRS "/system/", "/update/", "/music/", "/user/" -// uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 10, 10, 10, 70 }; -// #else +#ifdef SINGLE_USER_PARTITION #define YF_VOLUMES_NUM 1 #define YF_NAME_STRS "/user/" uint32_t yf_volume_percent[YF_VOLUMES_NUM] = {100}; -// #endif +#else +#define YF_VOLUMES_NUM 4 +#define YF_NAME_STRS "/system/", "/update/", "/music/", "/user/" +uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 10, 10, 10, 70 }; + +#endif static const char * const g_volume_names[YF_VOLUMES_NUM] = { YF_NAME_STRS }; diff --git a/code/sdk/files/evb/fs/user/system/KUMI_LOGO.bin b/code/sdk/files/evb/fs/user/system/KUMI_LOGO.bin new file mode 100644 index 000000000..43fa9aee7 Binary files /dev/null and b/code/sdk/files/evb/fs/user/system/KUMI_LOGO.bin differ diff --git a/code/sdk/files/evb/fs/user/system/OTAUpdata.bin b/code/sdk/files/evb/fs/user/system/OTAUpdata.bin new file mode 100644 index 000000000..f7689f22c Binary files /dev/null and b/code/sdk/files/evb/fs/user/system/OTAUpdata.bin differ diff --git a/code/sdk/files/evb/fs/user/system/OTAUpdataRecover.bin b/code/sdk/files/evb/fs/user/system/OTAUpdataRecover.bin new file mode 100644 index 000000000..e89ad7813 Binary files /dev/null and b/code/sdk/files/evb/fs/user/system/OTAUpdataRecover.bin differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a index e74a4dc4e..7efb9ea53 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp index c08094b8b..5e72603db 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp @@ -44,7 +44,14 @@ static OHOS::ImageInfo* g_imgInfo = nullptr; #ifdef QSPI_DISPLAY #define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO_QSPI.bin" #else -#define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO.bin" +//#define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO.bin" +#ifdef SINGLE_USER_PARTITION +#define IMAGE_OPEN_LOGO_PATH "/user/system/KUMI_LOGO.bin" +#define IMAGE_OTA_LOGO_PATH "/user/system/OTAUpdata.bin" +#else +#define IMAGE_OPEN_LOGO_PATH "/system/KUMI_LOGO.bin" +#define IMAGE_OTA_LOGO_PATH "/system/OTAUpdata.bin" +#endif #endif static void UikitRTCCallBack(uintptr_t data) diff --git a/code/sdk/open_source/openharmony/third_party/icu/icu4c/source/ohos/init_data.cpp b/code/sdk/open_source/openharmony/third_party/icu/icu4c/source/ohos/init_data.cpp index 84a87a78d..ecdc47419 100644 --- a/code/sdk/open_source/openharmony/third_party/icu/icu4c/source/ohos/init_data.cpp +++ b/code/sdk/open_source/openharmony/third_party/icu/icu4c/source/ohos/init_data.cpp @@ -16,7 +16,11 @@ #include "init_data.h" namespace { +#ifdef SINGLE_USER_PARTITION +const char* g_hwDirectory = "/user/system/usr/ohos_icu"; +#else const char* g_hwDirectory = "/system/usr/ohos_icu"; +#endif } /** diff --git a/code/sdk/zhihui/drivers/cywee/service/cywee_ble_Service.c b/code/sdk/zhihui/drivers/cywee/service/cywee_ble_Service.c index 24fd25797..fade5b053 100644 --- a/code/sdk/zhihui/drivers/cywee/service/cywee_ble_Service.c +++ b/code/sdk/zhihui/drivers/cywee/service/cywee_ble_Service.c @@ -9,7 +9,7 @@ #include "bts_gatt_server.h" #include "securec.h" #include "wearable_log.h" -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif @@ -45,7 +45,7 @@ static void ble_cywee_add_service(uint8_t server_id) bts_data_to_uuid_len2(BLE_UUID_CYWEE_REPORT_SERVICE, &cywee_service_uuid); //只有一个服务,永远是1 errcode_t ret = 0; -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK ret = gatts_add_service(server_id, &cywee_service_uuid, true); printf("ble_cywee_add_service gatts_add_service ret: 0x%x serverId = 0x%x uuid.uuid_len:%d\n", ret, server_id,cywee_service_uuid.uuid_len); #else diff --git a/code/sdk/zhihui/drivers/ppg/ppgBleService/ppgBleService.c b/code/sdk/zhihui/drivers/ppg/ppgBleService/ppgBleService.c index 9edec1dcc..51d59db2c 100644 --- a/code/sdk/zhihui/drivers/ppg/ppgBleService/ppgBleService.c +++ b/code/sdk/zhihui/drivers/ppg/ppgBleService/ppgBleService.c @@ -16,7 +16,7 @@ extern "C" { #include "bts_gatt_server.h" #include "securec.h" #include "wearable_log.h" -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif // #include "bts_def.h" @@ -62,7 +62,7 @@ static void ble_ppgtest_add_service(uint8_t server_id) bts_data_to_uuid_len2(BLE_UUID_PPG_BLE_SERVICE, &ppgtest_service_uuid); //只有一个服务,永远是1 errcode_t ret = 0; -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK ret = gatts_add_service(server_id, &ppgtest_service_uuid, true); // printf("ble_ppgtest_add_service wrapper_gatts_add_service ret: 0x%x server_id = 0x%x uuid.uuid_len:%d\n", ret, server_id,ppgtest_service_uuid.uuid_len); #else diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c b/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c index 876873f87..add967e42 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c @@ -39,7 +39,7 @@ #ifdef BLE_INSTRUCT #include "bleInstruct.h" #endif -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c index 1052df47d..43fe179e5 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c @@ -50,7 +50,7 @@ extern "C" { #ifdef SUPPORT_AT_CYWEE #include "cywee_ble_Service.h" #endif -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif #include "custom_save_runtime.h" @@ -1837,7 +1837,7 @@ void srv_ble_server_register_gap_ble_callbacks(void)//ble基础通讯服务注 g_ble_gapble_cbs.start_adv_cb=svr_ble_adv_start_cb; g_ble_gapble_cbs.stop_adv_cb=svr_ble_adv_stop_cb; g_ble_gapble_cbs.conn_param_update_cb=srv_gap_ble_connect_param_update_callback; -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK gap_ble_register_callbacks(&g_ble_gapble_cbs); #else wrapper_gap_ble_register_callbacks(&g_ble_gapble_cbs); @@ -1853,7 +1853,7 @@ void srv_ble_server_register_gatt_callbacks(void) g_ble_gatts_cbs.write_request_cb = svr_ble_bt_gatts_req_write_cb; g_ble_gatts_cbs.mtu_changed_cb = svr_ble_mtu_exchange; -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK gatts_register_callbacks(&g_ble_gatts_cbs); #else wrapper_gatts_register_callbacks(&g_ble_gatts_cbs); @@ -1871,7 +1871,7 @@ static void svr_ble_register_service(void) uuid.uuid_len = (uint8_t)sizeof(ser_id); memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&ser_id, sizeof(ser_id)); -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK ret = gatts_register_server(&uuid, &serverId); /* 注册gatt server */ WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_register_server ret: 0x%x serverId = 0x%x uuid.uuid_len:%d", ret, serverId,uuid.uuid_len); #else @@ -1883,7 +1883,7 @@ static void svr_ble_register_service(void) bt_uuid_t ble_service_uuid = {0}; bts_data_to_uuid_len2(srevr_id, &ble_service_uuid); -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK ret = gatts_add_service(serverId, &ble_service_uuid, true); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_add_service ret: 0x%x", ret); #else diff --git a/code/sdk/zhihui/services/factorytest_service/factorytestService.c b/code/sdk/zhihui/services/factorytest_service/factorytestService.c index e2753f90b..bc7334ee7 100644 --- a/code/sdk/zhihui/services/factorytest_service/factorytestService.c +++ b/code/sdk/zhihui/services/factorytest_service/factorytestService.c @@ -11,7 +11,7 @@ #include "bts_gatt_server.h" #include "securec.h" #include "wearable_log.h" -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif @@ -50,7 +50,7 @@ static void ble_factorytest_add_service(uint8_t server_id) bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid); //只有一个服务,永远是1 errcode_t ret = 0; -#ifndef SUPPORT_AT_OHOSFWK +#ifndef SUPPORT_OHOSFWK ret = gatts_add_service(server_id, &factory_service_uuid, true); // printf("ble_factorytest_add_service gatts_add_service ret: 0x%x serverId = 0x%x uuid.uuid_len:%d\n", ret, server_id,factory_service_uuid.uuid_len); #else