소스 검색

添加poweron 和 juge gpio引脚

xuxinyi 2 달 전
부모
커밋
15c5be5551
3개의 변경된 파일48개의 추가작업 그리고 10개의 파일을 삭제
  1. 4 0
      Core/Inc/main.h
  2. 22 1
      Core/Src/main.c
  3. 22 9
      lora_bl.ioc

+ 4 - 0
Core/Inc/main.h

@@ -57,6 +57,10 @@ void Error_Handler(void);
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/
+#define JUGE_PIN_Pin GPIO_PIN_15
+#define JUGE_PIN_GPIO_Port GPIOB
+#define POWER_ON_Pin GPIO_PIN_8
+#define POWER_ON_GPIO_Port GPIOA
 
 /* USER CODE BEGIN Private defines */
 extern uint8_t rx_buf[100];

+ 22 - 1
Core/Src/main.c

@@ -199,6 +199,10 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
+
+  // 将GPIO引脚拉高
+  HAL_GPIO_WritePin(POWER_ON_GPIO_Port, POWER_ON_Pin, GPIO_PIN_SET);
+
   MX_DMA_Init();
   MX_USART1_UART_Init();
   MX_USART2_UART_Init();
@@ -249,7 +253,7 @@ int main(void)
   srand(HAL_GetTick());
   // HAL_TIM_Base_Start(&htim4);
   /* USER CODE END 2 */
-  RTC_Sleep_Enter_Fun();
+
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   printf("Device is ready\r\n");
@@ -655,6 +659,7 @@ static void MX_DMA_Init(void)
   */
 static void MX_GPIO_Init(void)
 {
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
   /* USER CODE BEGIN MX_GPIO_Init_1 */
 
   /* USER CODE END MX_GPIO_Init_1 */
@@ -665,6 +670,22 @@ static void MX_GPIO_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
 
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(POWER_ON_GPIO_Port, POWER_ON_Pin, GPIO_PIN_SET);
+
+  /*Configure GPIO pin : JUGE_PIN_Pin */
+  GPIO_InitStruct.Pin = JUGE_PIN_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(JUGE_PIN_GPIO_Port, &GPIO_InitStruct);
+
+  /*Configure GPIO pin : POWER_ON_Pin */
+  GPIO_InitStruct.Pin = POWER_ON_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(POWER_ON_GPIO_Port, &GPIO_InitStruct);
+
   /* USER CODE BEGIN MX_GPIO_Init_2 */
 
   /* USER CODE END MX_GPIO_Init_2 */

+ 22 - 9
lora_bl.ioc

@@ -42,21 +42,23 @@ Mcu.Name=STM32F103C(8-B)Tx
 Mcu.Package=LQFP48
 Mcu.Pin0=PC14-OSC32_IN
 Mcu.Pin1=PC15-OSC32_OUT
-Mcu.Pin10=PA13
-Mcu.Pin11=PA14
-Mcu.Pin12=VP_RTC_VS_RTC_Activate
-Mcu.Pin13=VP_RTC_VS_RTC_Calendar
-Mcu.Pin14=VP_SYS_VS_tim3
-Mcu.Pin15=VP_TIM4_VS_ClockSourceINT
+Mcu.Pin10=PA9
+Mcu.Pin11=PA10
+Mcu.Pin12=PA13
+Mcu.Pin13=PA14
+Mcu.Pin14=VP_RTC_VS_RTC_Activate
+Mcu.Pin15=VP_RTC_VS_RTC_Calendar
+Mcu.Pin16=VP_SYS_VS_tim3
+Mcu.Pin17=VP_TIM4_VS_ClockSourceINT
 Mcu.Pin2=PD0-OSC_IN
 Mcu.Pin3=PD1-OSC_OUT
 Mcu.Pin4=PA2
 Mcu.Pin5=PA3
 Mcu.Pin6=PB10
 Mcu.Pin7=PB11
-Mcu.Pin8=PA9
-Mcu.Pin9=PA10
-Mcu.PinsNb=16
+Mcu.Pin8=PB15
+Mcu.Pin9=PA8
+Mcu.PinsNb=18
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103C8Tx
@@ -92,12 +94,23 @@ PA2.Mode=Asynchronous
 PA2.Signal=USART2_TX
 PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
+PA8.GPIOParameters=PinState,GPIO_PuPd,GPIO_Label
+PA8.GPIO_Label=POWER_ON
+PA8.GPIO_PuPd=GPIO_PULLUP
+PA8.Locked=true
+PA8.PinState=GPIO_PIN_SET
+PA8.Signal=GPIO_Output
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
 PB10.Mode=Asynchronous
 PB10.Signal=USART3_TX
 PB11.Mode=Asynchronous
 PB11.Signal=USART3_RX
+PB15.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB15.GPIO_Label=JUGE_PIN
+PB15.GPIO_PuPd=GPIO_NOPULL
+PB15.Locked=true
+PB15.Signal=GPIO_Input
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
 PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator