From 2bc159c6a126a414553f36a97e3f25d9923166b5 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期五, 22 十一月 2024 00:06:56 +0800 Subject: [PATCH] V2.24 现场升级版本,修改升级模式为SF8,小组0不启动UWB,1秒测距一次 --- Src/main.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Src/main.c b/Src/main.c index 0772699..fa2b26f 100644 --- a/Src/main.c +++ b/Src/main.c @@ -247,7 +247,7 @@ hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2); hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); - g_com_map[VERSION] = (1<<8)|6; + g_com_map[VERSION] = (1<<8)|24; // testprogram(); // g_com_map[DEV_ID]=0x6777; #ifdef DEBUG_MODE @@ -258,7 +258,7 @@ // g_com_map[NOMOVESLEEP_TIME]=10; #endif g_com_map[ACTIVE_INDEX] = 1; - g_com_map[GROUP_ID]=0; + // g_com_map[GROUP_ID]=0; g_com_map[COM_INTERVAL] = 1000; if(g_com_map[UWBPOLLTIME_MS_IDX]<10) //如果uwbpoll 时间小于10,随机生成一个小于一千的数。 @@ -422,6 +422,16 @@ MX_USART1_UART_Init(); MX_IWDG_Init(); /* USER CODE BEGIN 2 */ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + /*Configure GPIO pin Output Level */ + HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_RESET); + /*Configure GPIO pins : SCL_Pin SDA_Pin */ + GPIO_InitStruct.Pin = GPIO_PIN_14; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + LED_LG_ON; Program_Init(); // LIS3DH_Data_Init(); @@ -911,6 +921,7 @@ extern uint8_t tx_near_msg[80],stationary_flag; float key_keeptime; extern float freqlost_count,range_lost_time; +uint8_t g_start_send_time; void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim) { static uint8_t i=0; -- Gitblit v1.9.3