暂存,又行了?

This commit is contained in:
stark1898y 2025-06-03 13:35:50 +08:00
parent d5823c537c
commit 678f23f95e
5 changed files with 116 additions and 167 deletions

View File

@ -122,7 +122,7 @@
#define CLK_OSC32K 1 // 该项请勿在此修改必须在工程配置里的预处理中修改如包含主机角色必须使用外部32K #define CLK_OSC32K 1 // 该项请勿在此修改必须在工程配置里的预处理中修改如包含主机角色必须使用外部32K
#endif #endif
#ifndef BLE_MEMHEAP_SIZE #ifndef BLE_MEMHEAP_SIZE
#define BLE_MEMHEAP_SIZE (1024*8) #define BLE_MEMHEAP_SIZE (1024*10)
#endif #endif
#ifndef BLE_BUFF_MAX_LEN #ifndef BLE_BUFF_MAX_LEN
#define BLE_BUFF_MAX_LEN 251 // MTU https://www.cnblogs.com/gscw/p/17896209.html #define BLE_BUFF_MAX_LEN 251 // MTU https://www.cnblogs.com/gscw/p/17896209.html
@ -134,7 +134,7 @@
#define BLE_TX_NUM_EVENT 1 #define BLE_TX_NUM_EVENT 1
#endif #endif
#ifndef BLE_TX_POWER #ifndef BLE_TX_POWER
#define BLE_TX_POWER LL_TX_POWEER_4_DBM #define BLE_TX_POWER LL_TX_POWEER_0_DBM
#endif #endif
#ifndef PERIPHERAL_MAX_CONNECTION #ifndef PERIPHERAL_MAX_CONNECTION
#define PERIPHERAL_MAX_CONNECTION 1 #define PERIPHERAL_MAX_CONNECTION 1

View File

@ -374,7 +374,7 @@ void LowPower_Sleep(uint16_t rm)
flash_sck = R8_FLASH_SCK; flash_sck = R8_FLASH_SCK;
sys_safe_access_enable(); sys_safe_access_enable();
// R8_BAT_DET_CTRL = 0; // 关闭电压监控 R8_BAT_DET_CTRL = 0; // 关闭电压监控
sys_safe_access_disable(); sys_safe_access_disable();
sys_safe_access_enable(); sys_safe_access_enable();
R8_XT32M_TUNE = x32Mpw; R8_XT32M_TUNE = x32Mpw;

View File

@ -115,6 +115,7 @@ void SetSysClock(SYS_CLKTypeDef sc)
{ {
R8_HFCK_PWR_CTRL &= ~RB_CLK_XT32M_PON; R8_HFCK_PWR_CTRL &= ~RB_CLK_XT32M_PON;
} }
} }
R8_SAFE_MODE_CTRL |= RB_SAFE_AUTO_EN; R8_SAFE_MODE_CTRL |= RB_SAFE_AUTO_EN;
sys_safe_access_disable(); sys_safe_access_disable();
@ -235,8 +236,7 @@ void MachineMode_Call(MachineMode_Call_func func)
* @param none * @param none
* *
* @return none * @return none
*/ */void SetPI_func()
void SetPI_func()
{ {
write_csr(0xbc0, 0x25); write_csr(0xbc0, 0x25);
} }
@ -459,20 +459,9 @@ void WWDG_ClearFlag(void)
*/ */
__INTERRUPT __INTERRUPT
__HIGH_CODE __HIGH_CODE
__attribute__((weak)) void HardFault_Handler(void) __attribute__((weak))
void HardFault_Handler(void)
{ {
#if 0
uint32_t v_mepc, v_mcause, v_mtval;
printf("hardfault\n");
v_mepc = __get_MEPC();
v_mcause = __get_MCAUSE();
v_mtval = __get_MTVAL();
printf("mepc:%08x\n", v_mepc);
printf("mcause:%08x\n", v_mcause);
printf("mtval:%08x\n", v_mtval);
FLASH_ROM_SW_RESET(); FLASH_ROM_SW_RESET();
sys_safe_access_enable(); sys_safe_access_enable();
R16_INT32K_TUNE = 0xFFFF; R16_INT32K_TUNE = 0xFFFF;
@ -480,47 +469,6 @@ __attribute__((weak)) void HardFault_Handler(void)
sys_safe_access_enable(); sys_safe_access_enable();
R8_RST_WDOG_CTRL |= RB_SOFTWARE_RESET; R8_RST_WDOG_CTRL |= RB_SOFTWARE_RESET;
sys_safe_access_disable(); sys_safe_access_disable();
#endif
struct __MEMORY_CTL
{
struct __MEMORY_CTL *pNext;
uint16_t len;
uint16_t used;
};
typedef struct __MEMORY_CTL MemoryCtl;
extern MemoryCtl *MemCtlStart;
extern MemoryCtl *MemCtlEnd;
MemoryCtl *MemHead;
MemHead = MemCtlStart;
while (MemHead != MemCtlEnd)
{
printf("|%8x,%8x,%8d.....\n", MemHead->used, (uint32_t)MemHead,
(uint32_t)(MemHead->pNext) - (uint32_t)MemHead - sizeof(struct __MEMORY_CTL));
MemHead = MemHead->pNext;
}
printf("\n");
uint32_t v_mepc, v_mcause, v_mtval;
printf("hardfault\n");
v_mepc = __get_MEPC();
v_mcause = __get_MCAUSE();
v_mtval = __get_MTVAL();
printf("mepc:%08x\n", v_mepc);
printf("mcause:%08x\n", v_mcause);
printf("mtval:%08x\n", v_mtval);
#if 0
FLASH_ROM_SW_RESET();
sys_safe_access_enable();
R16_INT32K_TUNE = 0xFFFF;
sys_safe_access_disable();
sys_safe_access_enable();
R8_RST_WDOG_CTRL |= RB_SOFTWARE_RESET;
sys_safe_access_disable();
#endif
while(1); while(1);
} }
@ -634,7 +582,8 @@ int _write(int fd, char *buf, int size)
* *
* @return size: Data length * @return size: Data length
*/ */
__attribute__((used)) void *_sbrk(ptrdiff_t incr) __attribute__((used))
void *_sbrk(ptrdiff_t incr)
{ {
extern char _end[]; extern char _end[];
static char *curbrk = _end; static char *curbrk = _end;