wanrenqi
/
PASII
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、正式可上线固件

This commit is contained in:
DESKTOP-BUI7OAO\15586 2025-07-11 18:20:06 +08:00
parent f5696f9e7c
commit 5f829985ea
21 changed files with 14201 additions and 13647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CandeII_1.4/Hardware/lis2dh.c
View File

@ -13,6 +13,8 @@
#include "mcu_bsp.h" #include "mcu_bsp.h"
#include "DebugLog.h" #include "DebugLog.h"
uint8_t Lis2d_ActFlag = 0;
extern uint8_t work_led_count; extern uint8_t work_led_count;
/********************************************************************* /*********************************************************************
* Global Variables (declared in header file with 'extern') * Global Variables (declared in header file with 'extern')
@ -108,10 +110,12 @@ void Lis2dh_Act_State_Judge(void)
if((GPIO_Pin_Read(U32BIT(LIS2D_INT2)) & U32BIT(LIS2D_INT2))!= 0) if((GPIO_Pin_Read(U32BIT(LIS2D_INT2)) & U32BIT(LIS2D_INT2))!= 0)
{ {
// dbg_printf("Act_State\r\n"); // dbg_printf("Act_State\r\n");
Lis2d_ActFlag = 1;
} }
else else
{ {
// dbg_printf("Inact_State\r\n"); // dbg_printf("Inact_State\r\n");
Lis2d_ActFlag = 0;
} }
} }
/************************************************************************************************* /*************************************************************************************************

2
CandeII_1.4/Include/wdt.h
View File

@ -3,7 +3,7 @@
#include "ARMCM0.h" #include "ARMCM0.h"
#define _WDT_X #define _WDT_
#ifdef _WDT_ #ifdef _WDT_
extern void wdt_enable(uint16_t count); extern void wdt_enable(uint16_t count);

24819
CandeII_1.4/User/KEIL/JLinkLog.txt
View File

File diff suppressed because it is too large Load Diff

2851
CandeII_1.4/User/KEIL/Output/Syd8811_Peripheral.map
View File

File diff suppressed because it is too large Load Diff

32
CandeII_1.4/User/KEIL/Output/Syd8811_Peripheral_Syd8811_Peripheral.dep
View File

@ -9,7 +9,7 @@ I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E8306C2) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E8306C2)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\uart.h)(0x684673D7) I (..\..\Include\uart.h)(0x684673D7)
I (D:\Keil_v5\ARM\ARMCC\include\stdarg.h)(0x5EC775FC) I (D:\Keil_v5\ARM\ARMCC\include\stdarg.h)(0x5EC775FC)
@ -66,11 +66,11 @@ I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A)
I (..\..\Include\debug.h)(0x684673D7) I (..\..\Include\debug.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\gpio.h)(0x684673D7) I (..\..\Include\gpio.h)(0x684673D7)
F (..\..\Driver\wdt.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\wdt.o --omf_browse .\output\wdt.crf --depend .\output\wdt.d) F (..\..\Driver\wdt.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\wdt.o --omf_browse .\output\wdt.crf --depend .\output\wdt.d)
I (..\..\Include\wdt.h)(0x6853B91B) I (..\..\Include\wdt.h)(0x686751EF)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC) I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC)
@ -82,7 +82,7 @@ F (..\..\Driver\timer_handler.c)(0x68479A42)(-c --cpu Cortex-M0 -D__MICROLIB -g
I (..\..\Lib\calender.h)(0x684673D7) I (..\..\Lib\calender.h)(0x684673D7)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC) I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC)
I (..\..\Lib\softtimer.h)(0x684673D7) I (..\..\Lib\softtimer.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -95,7 +95,7 @@ I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
F (..\..\Driver\rtc_handler.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\rtc_handler.o --omf_browse .\output\rtc_handler.crf --depend .\output\rtc_handler.d) F (..\..\Driver\rtc_handler.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\rtc_handler.o --omf_browse .\output\rtc_handler.crf --depend .\output\rtc_handler.d)
I (..\..\Lib\softtimer.h)(0x684673D7) I (..\..\Lib\softtimer.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -113,7 +113,7 @@ I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E8306C2) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E8306C2)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8ED122)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\debug.h)(0x684673D7) I (..\..\Include\debug.h)(0x684673D7)
I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604) I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604)
@ -158,7 +158,7 @@ I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Incl
I (..\..\User\mcu_bsp.h)(0x685DEFCF) I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Include\gpio.h)(0x684673D7) I (..\..\Include\gpio.h)(0x684673D7)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
F (..\..\Hardware\lis2dh.c)(0x68550F60)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lis2dh.o --omf_browse .\output\lis2dh.crf --depend .\output\lis2dh.d) F (..\..\Hardware\lis2dh.c)(0x68675100)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lis2dh.o --omf_browse .\output\lis2dh.crf --depend .\output\lis2dh.d)
I (..\..\Hardware\lis2dh.h)(0x684673D7) I (..\..\Hardware\lis2dh.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -176,7 +176,7 @@ I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\i2c.h)(0x684673D7) I (..\..\Include\i2c.h)(0x684673D7)
I (..\..\User\mcu_bsp.h)(0x685DEFCF) I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
F (..\..\Hardware\lsm6d.c)(0x68550F60)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lsm6d.o --omf_browse .\output\lsm6d.crf --depend .\output\lsm6d.d) F (..\..\Hardware\lsm6d.c)(0x68550F60)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lsm6d.o --omf_browse .\output\lsm6d.crf --depend .\output\lsm6d.d)
@ -197,7 +197,7 @@ I (..\..\Include\i2c.h)(0x684673D7)
I (..\..\Include\delay.h)(0x684673D7) I (..\..\Include\delay.h)(0x684673D7)
I (..\..\User\mcu_bsp.h)(0x685DEFCF) I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
F (..\..\Hardware\lis2dh12_reg.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lis2dh12_reg.o --omf_browse .\output\lis2dh12_reg.crf --depend .\output\lis2dh12_reg.d) F (..\..\Hardware\lis2dh12_reg.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\lis2dh12_reg.o --omf_browse .\output\lis2dh12_reg.crf --depend .\output\lis2dh12_reg.d)
@ -228,7 +228,7 @@ F (..\..\Hardware\common.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 -
I (..\..\Hardware\common.h)(0x684673D7) I (..\..\Hardware\common.h)(0x684673D7)
F (..\..\Lib\syd8811_ble_lib.lib)(0x684673D7)() F (..\..\Lib\syd8811_ble_lib.lib)(0x684673D7)()
F (..\..\Lib\Syd8811_softtimer_lib20240514_225042.lib)(0x684673D7)() F (..\..\Lib\Syd8811_softtimer_lib20240514_225042.lib)(0x684673D7)()
F (..\main.c)(0x685E4A8F)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\main.o --omf_browse .\output\main.crf --depend .\output\main.d) F (..\main.c)(0x686653BD)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\main.o --omf_browse .\output\main.crf --depend .\output\main.d)
I (..\mcu_bsp.h)(0x685DEFCF) I (..\mcu_bsp.h)(0x685DEFCF)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -246,7 +246,7 @@ I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5EC77604)
I (..\..\Hardware\lis2dh.h)(0x684673D7) I (..\..\Hardware\lis2dh.h)(0x684673D7)
I (..\..\Hardware\lis2dh12_reg.h)(0x684673D7) I (..\..\Hardware\lis2dh12_reg.h)(0x684673D7)
I (..\..\Include\ota.h)(0x684673D7) I (..\..\Include\ota.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Include\gpadc.h)(0x684673D7) I (..\..\Include\gpadc.h)(0x684673D7)
I (..\..\Include\delay.h)(0x684673D7) I (..\..\Include\delay.h)(0x684673D7)
I (..\..\Hardware\cjson.h)(0x684673D7) I (..\..\Hardware\cjson.h)(0x684673D7)
@ -255,7 +255,7 @@ I (D:\Keil_v5\ARM\ARMCC\include\stdlib.h)(0x5EC775FC)
I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604) I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604)
I (..\..\Hardware\crc16.h)(0x684673D7) I (..\..\Hardware\crc16.h)(0x684673D7)
I (..\..\Hardware\common.h)(0x684673D7) I (..\..\Hardware\common.h)(0x684673D7)
I (..\..\Include\wdt.h)(0x6853B91B) I (..\..\Include\wdt.h)(0x686751EF)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
@ -296,12 +296,12 @@ I (..\..\Hardware\lsm6dso_reg.h)(0x684673D7)
I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x5EC775FC) I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x5EC775FC)
I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5EC77604) I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5EC77604)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7) I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
F (..\..\Rtt\SEGGER_RTT.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt.o --omf_browse .\output\segger_rtt.crf --depend .\output\segger_rtt.d) F (..\..\Rtt\SEGGER_RTT.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt.o --omf_browse .\output\segger_rtt.crf --depend .\output\segger_rtt.d)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -315,7 +315,7 @@ I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604) I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604)
F (..\..\Rtt\SEGGER_RTT_printf.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt_printf.o --omf_browse .\output\segger_rtt_printf.crf --depend .\output\segger_rtt_printf.d) F (..\..\Rtt\SEGGER_RTT_printf.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt_printf.o --omf_browse .\output\segger_rtt_printf.crf --depend .\output\segger_rtt_printf.d)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)
@ -331,7 +331,7 @@ I (D:\Keil_v5\ARM\ARMCC\include\stdlib.h)(0x5EC775FC)
I (D:\Keil_v5\ARM\ARMCC\include\stdarg.h)(0x5EC775FC) I (D:\Keil_v5\ARM\ARMCC\include\stdarg.h)(0x5EC775FC)
F (..\..\Rtt\SEGGER_RTT_Syscalls_KEIL.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt_syscalls_keil.o --omf_browse .\output\segger_rtt_syscalls_keil.crf --depend .\output\segger_rtt_syscalls_keil.d) F (..\..\Rtt\SEGGER_RTT_Syscalls_KEIL.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 --apcs=interwork -I ..\..\Include -I ..\..\Driver -I ..\..\Rtt -I ..\..\Lib -I ..\..\User -I ..\..\Hardware -I ..\..\Taskrun -I ..\..\App -I.\RTE\_Syd8811_Peripheral -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM0\Include -ID:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\Device\Include -D__UVISION_VERSION="531" -D_RTE_ -DARMCM0 -D_RTE_ -DSYD8811_FRB8345 -D_OTA_ -o .\output\segger_rtt_syscalls_keil.o --omf_browse .\output\segger_rtt_syscalls_keil.crf --depend .\output\segger_rtt_syscalls_keil.d)
I (..\..\Rtt\DebugLog.h)(0x684673D7) I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x685E4314) I (..\..\User\config.h)(0x686751EF)
I (..\..\Lib\lib.h)(0x684673D7) I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\ARMCM0.h)(0x684673D7) I (..\..\Include\ARMCM0.h)(0x684673D7)
I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122) I (D:\Users\15586\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm0.h)(0x5E8ED122)

BIN
CandeII_1.4/User/KEIL/Output/debug.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/gpadc.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/isr.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/lis2dh.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/lsm6d.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/main.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/ota.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/rtc_handler.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/segger_rtt.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/segger_rtt_printf.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/segger_rtt_syscalls_keil.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/timer_handler.crf
View File

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/wdt.crf
View File

Binary file not shown.

124
CandeII_1.4/User/KEIL/Syd8811_Peripheral.uvguix.15586
View File

File diff suppressed because one or more lines are too long

4
CandeII_1.4/User/config.h
View File

@ -34,8 +34,8 @@
#define MAX_TX_LENGTH 1024 #define MAX_TX_LENGTH 1024
#define MAX_RX_LENGTH 128 #define MAX_RX_LENGTH 128
#define WORK_SLEEP_TIME 20 #define WORK_SLEEP_TIME 300//20
#define ADV_TIMEOUT 10 #define ADV_TIMEOUT 30//10
typedef enum _SYD_NOSLEEP_CONTROL_{ typedef enum _SYD_NOSLEEP_CONTROL_{
SYD_NOSLEEP_SW = 0x0001, SYD_NOSLEEP_SW = 0x0001,

12
CandeII_1.4/User/main.c
View File

@ -24,6 +24,7 @@
#include "app_timer.h" #include "app_timer.h"
#include "SYD_ble_service_service.h" #include "SYD_ble_service_service.h"
extern uint8_t Lis2d_ActFlag;
/*---------------------------------------------------------------*/ /*---------------------------------------------------------------*/
//变量定义 //变量定义
Tx_Buffer_t dtts_tx_buffer; // 存放发送给主机的数据 Tx_Buffer_t dtts_tx_buffer; // 存放发送给主机的数据
@ -187,6 +188,8 @@ int main()
Charge_State_Judge(); Charge_State_Judge();
Lis2dh_Act_State_Judge();
if(start_tx & 0x01) if(start_tx & 0x01)
{ {
send_to_master(); send_to_master();
@ -386,6 +389,11 @@ static void Low_Power_IOConfig(void)
PIN_Pullup_Disable(T_QFN_48, U32BIT(SA0_PIN)); //关闭上拉输入 PIN_Pullup_Disable(T_QFN_48, U32BIT(SA0_PIN)); //关闭上拉输入
GPIO_Input_Disable(U32BIT(SA0_PIN)); GPIO_Input_Disable(U32BIT(SA0_PIN));
PIN_Set_GPIO(U32BIT(LIS2D_INT1),PIN_SEL_GPIO);
GPIO_Set_Input(U32BIT(LIS2D_INT1),0); //设置为输入 不取反
PIN_Pullup_Disable(T_QFN_48, U32BIT(LIS2D_INT1)); //关闭上拉输入
GPIO_Input_Disable(U32BIT(LIS2D_INT1));
PIN_Set_GPIO(U32BIT(I2C0_SCLK),PIN_SEL_GPIO); PIN_Set_GPIO(U32BIT(I2C0_SCLK),PIN_SEL_GPIO);
GPIO_Set_Input(U32BIT(I2C0_SCLK),0); //设置为输入 不取反 GPIO_Set_Input(U32BIT(I2C0_SCLK),0); //设置为输入 不取反
PIN_Pullup_Disable(T_QFN_48, U32BIT(I2C0_SCLK)); //关闭上拉输入 PIN_Pullup_Disable(T_QFN_48, U32BIT(I2C0_SCLK)); //关闭上拉输入
@ -429,7 +437,7 @@ static void work_timer_event(void)
/*****************判断是否进入POWERDOWN状态***********************/ /*****************判断是否进入POWERDOWN状态***********************/
if(connect_flag == 1) if(connect_flag == 1)
{ {
if(PAS.RPM == 0) if((PAS.RPM == 0)&&(Lis2d_ActFlag == 0))
{ {
PAS.sleepCnt++; PAS.sleepCnt++;
if((PAS.sleepCnt >= WORK_SLEEP_TIME)&&(PAS.sleepFlag==0)&&(ota_state == 0)) if((PAS.sleepCnt >= WORK_SLEEP_TIME)&&(PAS.sleepFlag==0)&&(ota_state == 0))
@ -450,7 +458,7 @@ static void work_timer_event(void)
dtts_tx_buffer.header = dtts_tx_buffer.tail; dtts_tx_buffer.header = dtts_tx_buffer.tail;
if((GPIO_Pin_Read(U32BIT(LIS2D_INT2)) & U32BIT(LIS2D_INT2))!= 0) if(Lis2d_ActFlag == 1)
{ {
PAS.sleepCnt = 0; PAS.sleepCnt = 0;
} }