From b473b9e6b3a511358d127d5c8d3b56e42ab41bfc Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期三, 27 九月 2023 11:08:29 +0800 Subject: [PATCH] 1 --- Src/main.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/Src/main.c b/Src/main.c index c4d7f05..0d208be 100644 --- a/Src/main.c +++ b/Src/main.c @@ -38,7 +38,7 @@ #define NSH1 0x0001 #define GP 0x0002 #define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置 -#define DEBUG_MODE +//#define DEBUG_MODE /* USER CODE END Includes */ /* Private typedef -----------------------------------------------------------*/ @@ -227,7 +227,7 @@ hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); g_com_map[VERSION] = (1<<8)|68; - + g_com_map[DEV_ID]=0x6777; #ifdef DEBUG_MODE // g_com_map[GROUP_ID]=21; g_com_map[DEV_ID]=0x6777; @@ -358,6 +358,13 @@ HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_RESET); } uint8_t tx_num; +void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) +{ + if(GPIO_Pin == GPIO_PIN_11) + { + RadioIrqProcess(); + } +} /* USER CODE END 0 */ /** @@ -393,7 +400,7 @@ MX_SPI1_Init(); MX_ADC_Init(); MX_DMA_Init(); -// MX_IWDG_Init(); + MX_IWDG_Init(); /* USER CODE BEGIN 2 */ LED_LG_ON; Program_Init(); @@ -414,6 +421,7 @@ HAL_Delay(2000); // Uwb_Lora_Switch(0,1); Lora_Init(); +// RadioSleep(); Delay_Ms(10); // Uwb_Lora_Switch(0,0); // mcu_sleep(); @@ -421,7 +429,7 @@ // SystemPower_Config(); //HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI); /* USER CODE END 2 */ - HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET); + /* Infinite loop */ /* USER CODE BEGIN WHILE */ while (1) @@ -435,15 +443,24 @@ g_start_send_flag = 0; HAL_IWDG_Refresh(&hiwdg); - // Uwb_Lora_Switch(0,1); // HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET); memcpy(&TX_Buffer+3,&tx_num,1); +// HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_RESET); +// delay_us(100); +// HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_SET); +// delay_us(600); +// Lora_Init(); +// printf("TX fasong\r\n"); Radio.Send( &TX_Buffer, 4); +// delay_us(1000); +//// RadioSleep(); +// delay_us(1000); tx_num++; // delay_ms(10); // HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET); delay_ms(9); +// Lora_Init(); // Uwb_Lora_Switch(1,0); if(bat_percent>15) @@ -471,10 +488,12 @@ { SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; } - #ifndef DEBUG_MODE - if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)) + if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)) HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI); - #endif +// #ifndef DEBUG_MODE +// if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)) +// HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI); +// #endif } // HAL_Delay(100); // Get_Battary(); @@ -807,12 +826,7 @@ GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(SPI_CS_GPIO_Port, &GPIO_InitStruct); - - GPIO_InitStruct.Pin = GPIO_PIN_2; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; - HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /*Configure GPIO pin : BAT_MEAS_GND_Pin */ GPIO_InitStruct.Pin = BAT_MEAS_GND_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD; @@ -864,6 +878,9 @@ HAL_NVIC_SetPriority(EXTI0_1_IRQn, 1, 0); HAL_NVIC_EnableIRQ(EXTI0_1_IRQn); + HAL_NVIC_SetPriority(EXTI4_15_IRQn, 1, 0); + HAL_NVIC_EnableIRQ(EXTI4_15_IRQn); + } /* USER CODE BEGIN 4 */ -- Gitblit v1.9.3