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-06-27 10:21:49 +08:00
parent 445d8a8f26
commit 1477556ae7
16 changed files with 13252 additions and 1715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,11 +49,16 @@ void Lis2dh_Init(void)
if(temp == LIS2DH12_ID)
{
// dbg_printf("lis2dh exist\r\n");
#if ((1) && (defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)))
dbg_printf("lis2dh exist\r\n");
#endif
}
else
{
// dbg_printf("lis2dh not exist\r\n");
#if ((1) && (defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)))
dbg_printf("lis2dh not exist\r\n");
#endif
work_led_count = 8;
}

10
CandeII_1.4/Hardware/lsm6d.c
View File

@ -63,13 +63,19 @@ void Lsm6dso_Init(void)
if(temp == LSM6DSO_ID)
{
PAS.exist = 1;
// dbg_printf("LSM6DSO exist\r\n");
#if ((1) && (defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)))
dbg_printf("LSM6DSO exist\r\n");
#endif
}
else
{
PAS.exist = 0;
work_led_count = 4;
// dbg_printf("LSM6DSO not exist\r\n");
#if ((1) && (defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)))
dbg_printf("LSM6DSO not exist\r\n");
#endif
}
//软件复位, 寄存器到默认配值

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -134,7 +134,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\Device\ARM\ARMCM0\Include\system_ARMCM0.h)(0x5E8ED12A)
I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\i2c.h)(0x684673D7)
I (..\..\User\mcu_bsp.h)(0x685375DD)
I (..\..\User\mcu_bsp.h)(0x685DEFCF)
F (..\..\App\app_timer.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\app_timer.o --omf_browse .\output\app_timer.crf --depend .\output\app_timer.d)
I (..\..\App\app_timer.h)(0x684673D7)
I (..\..\Include\timer.h)(0x684673D7)
@ -155,10 +155,10 @@ 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_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 (..\..\User\mcu_bsp.h)(0x685375DD)
I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Include\gpio.h)(0x684673D7)
I (..\..\Lib\lib.h)(0x684673D7)
F (..\..\Hardware\lis2dh.c)(0x685360FA)(-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)(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)
I (..\..\Hardware\lis2dh.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)
@ -174,12 +174,12 @@ I (..\..\Include\delay.h)(0x684673D7)
I (..\..\Include\gpio.h)(0x684673D7)
I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\i2c.h)(0x684673D7)
I (..\..\User\mcu_bsp.h)(0x685375DD)
I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x68479A42)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
I (..\..\Rtt\SEGGER_RTT_Conf.h)(0x684673D7)
F (..\..\Hardware\lsm6d.c)(0x68535EEB)(-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)
I (..\..\Hardware\lsm6d.h)(0x6853E2F7)
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)
@ -195,7 +195,7 @@ I (..\..\Include\gpio.h)(0x684673D7)
I (..\..\Lib\lib.h)(0x684673D7)
I (..\..\Include\i2c.h)(0x684673D7)
I (..\..\Include\delay.h)(0x684673D7)
I (..\..\User\mcu_bsp.h)(0x685375DD)
I (..\..\User\mcu_bsp.h)(0x685DEFCF)
I (..\..\Rtt\DebugLog.h)(0x684673D7)
I (..\..\User\config.h)(0x68479A42)
I (..\..\Rtt\SEGGER_RTT.h)(0x684673D7)
@ -228,8 +228,8 @@ F (..\..\Hardware\common.c)(0x684673D7)(-c --cpu Cortex-M0 -D__MICROLIB -g -O0 -
I (..\..\Hardware\common.h)(0x684673D7)
F (..\..\Lib\syd8811_ble_lib.lib)(0x684673D7)()
F (..\..\Lib\Syd8811_softtimer_lib20240514_225042.lib)(0x684673D7)()
F (..\main.c)(0x6853ED81)(-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)(0x685375DD)
F (..\main.c)(0x685DFF84)(-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 (..\..\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:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC)
@ -264,7 +264,7 @@ I (..\..\App\app_timer.h)(0x684673D7)
I (..\..\Include\timer.h)(0x684673D7)
I (..\SYD_ble_service_service.h)(0x684673D7)
F (..\mcu_bsp.c)(0x685236F4)(-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\mcu_bsp.o --omf_browse .\output\mcu_bsp.crf --depend .\output\mcu_bsp.d)
I (..\mcu_bsp.h)(0x685375DD)
I (..\mcu_bsp.h)(0x685DEFCF)
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:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC)
@ -281,7 +281,7 @@ I (..\..\Include\timer.h)(0x684673D7)
I (..\..\App\app_adc.h)(0x684673D7)
I (..\..\Include\gpadc.h)(0x684673D7)
F (..\isr.c)(0x68537C04)(-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\isr.o --omf_browse .\output\isr.crf --depend .\output\isr.d)
I (..\mcu_bsp.h)(0x685375DD)
I (..\mcu_bsp.h)(0x685DEFCF)
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:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5EC775FC)
@ -348,7 +348,7 @@ I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5EC77604)
I (D:\Keil_v5\ARM\ARMCC\include\rt_sys.h)(0x5EC775FC)
I (D:\Keil_v5\ARM\ARMCC\include\rt_misc.h)(0x5EC775F2)
I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x5EC775FC)
F (..\..\doc.txt)(0x6854F9A7)()
F (..\..\doc.txt)(0x685DFFDE)()
F (RTE\Device\ARMCM0\startup_ARMCM0.s)(0x684673D7)(--cpu Cortex-M0 -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --pd "__UVISION_VERSION SETA 531" --pd "_RTE_ SETA 1" --pd "ARMCM0 SETA 1" --pd "_RTE_ SETA 1" --list .\output\startup_armcm0.lst --xref -o .\output\startup_armcm0.o --depend .\output\startup_armcm0.d)
F (RTE\Device\ARMCM0\system_ARMCM0.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\system_armcm0.o --omf_browse .\output\system_armcm0.crf --depend .\output\system_armcm0.d)
I (..\..\Include\ARMCM0.h)(0x684673D7)

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

Binary file not shown.

BIN
CandeII_1.4/User/KEIL/Output/app_gpio.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/mcu_bsp.crf
View File

Binary file not shown.

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

File diff suppressed because one or more lines are too long

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

@ -145,6 +145,7 @@ int main()
#endif
UartEn(false);
#if ((1) && (defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)))
dbg_printf("SYD8811 GPIO test demo %s:%s\r\n", __DATE__ , __TIME__);
#endif
@ -174,8 +175,6 @@ int main()
ReadFlashData(FLASH_INTERNAL_DATA_ADDR, sizeof(PAS.transpModes), (unsigned char*)&PAS.transpModes);
dbg_printf("transpModes = %d\r\n",PAS.transpModes);
__enable_irq();
get_battery_value(); //上电或者POWNDOWN唤醒时，计算一次电量
@ -517,7 +516,7 @@ void cal_battery_value(uint16_t adc)
#endif
/* 转换为电池电压*/
batteryVoltage = batteryVoltage*4/3+0.04;
batteryVoltage = batteryVoltage*2;
batteryPercentage = (batteryVoltage*1000-3000)/11.5+0.5;
if(batteryPercentage < 0)batteryPercentage=0;
@ -854,17 +853,22 @@ void ble_evt_callback(struct gap_ble_evt *p_evt)
{
StartAdv();
Adv_State = 1;
#if defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)
DBGPRINTF(("restart adv\r\n"));
#endif
}
else
{
rf_stop();
Adv_State = 0;
}
#if defined(_DEBUG_) || defined(_SYD_RTT_DEBUG_)
DBGPRINTF(("restart adv\r\n"));
DBGPRINTF(("rf_stop\r\n"));
#endif
}
}
}
/*********************************************************************
* Function :

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

@ -23,7 +23,7 @@ Flash
/*
输出 LED IO 配置
*/
#define LED_PIN GPIO_6
#define LED_PIN GPIO_7
#define LED_ON() GPIO_Pin_Clear(U32BIT(LED_PIN))
#define LED_OFF() GPIO_Pin_Set(U32BIT(LED_PIN))
@ -61,7 +61,7 @@ Flash
/*
充电状态 IO配置
*/
#define CHARGE_STATE_PIN GPIO_7
#define CHARGE_STATE_PIN GPIO_6
/*
ADC 通道配置

6
CandeII_1.4/doc.txt
View File

@ -71,7 +71,11 @@
1、硬件上SWD的烧录引脚的下拉电阻改成4.7K，否者keil烧录有问题;
2025.6.27
1、踏频硬件第二版，修改了对应的硬件接口。
2、修改了电池电压采样放大倍速