From: SnickerSun Date: Sat, 20 Jan 2024 03:11:50 +0000 (+0800) Subject: 恢复错误的修改 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b8def62a81707423bf66aa8be0aee05207508ff1;p=mirrors%2FFD230.git 恢复错误的修改 --- diff --git a/code/sdk/application/brandy/brandy_standard/chip_init.c b/code/sdk/application/brandy/brandy_standard/chip_init.c index 151de5bea..98d6cee02 100755 --- a/code/sdk/application/brandy/brandy_standard/chip_init.c +++ b/code/sdk/application/brandy/brandy_standard/chip_init.c @@ -144,7 +144,6 @@ void chip_init(void) uapi_rtc_init(); uapi_rtc_adapter(RTC_0, RTC_0_IRQN, g_aucIntPri[RTC_0_IRQN]); - uapi_rtc_adapter(RTC_1, RTC_1_IRQN, g_aucIntPri[RTC_1_IRQN]); uapi_dma_init(); uapi_dma_open(); diff --git a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h index a33cc1c4c..af6a4f750 100755 --- a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h +++ b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h @@ -185,7 +185,7 @@ typedef enum message_type { */ typedef enum timer_event_type { /* * 常亮灭屏定时器超时 */ - KEEP_ON_TIMER_TIME_OUT = 60, + KEEP_ON_TIMER_TIME_OUT = 0, /* * 应用灭屏定时器超时 */ SLICE_TIMER_TIME_OUT, /* * 系统默认灭屏定时器超时 */ diff --git a/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h index 0b0d0af04..75ab1acf7 100755 --- a/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h +++ b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h @@ -32,7 +32,7 @@ extern "C" { #define SIZE_512M 0x20000000 //测试更改时间 -#define DELAY_100US 1000 +#define DELAY_100US 100 #define CNT_100US_PS 10000 #define WAIT_10S (10 * CNT_100US_PS) #define DELAY_1MS 1 diff --git a/code/sdk/drivers/peripheral/mag/CMakeLists.txt b/code/sdk/drivers/peripheral/mag/CMakeLists.txt index 3e81599d9..0ef2a2753 100644 --- a/code/sdk/drivers/peripheral/mag/CMakeLists.txt +++ b/code/sdk/drivers/peripheral/mag/CMakeLists.txt @@ -66,5 +66,5 @@ build_component() install_sdk(${CMAKE_CURRENT_SOURCE_DIR} "*") -find_library(LIB_PATH_MMC5603 ${CMAKE_CURRENT_SOURCE_DIR}/mmc5603/MemsicAlgo.a ${CMAKE_CURRENT_SOURCE_DIR}) +find_library(LIB_PATH_MMC5603 mmc5603/MemsicAlgo.a ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(${TARGET_NAME} PRIVATE -Wl,--whole-archive ${LIB_PATH_MMC5603} PRIVATE -Wl,--whole-archive) \ No newline at end of file