From f79c3929e7f70584c65f6ec1363dbdd792949f92 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 15 三月 2020 14:12:12 +0800
Subject: [PATCH] 华星初版测试
---
Src/main.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 9370bec..72c54d1 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -209,17 +209,19 @@
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
- if(sleep_flag)
- {
- HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
- }
+
+// if(sleep_flag)
+// {
+// HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+// }
if(g_start_send_flag)
{
SystemClock_Config();
g_start_send_flag = 0;
LED0_BLINK;
Tag_App();
- HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+ IdleTask();
+ // HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
}else{
IdleTask();
}
@@ -307,7 +309,7 @@
*/
hadc.Instance = ADC1;
hadc.Init.OversamplingMode = DISABLE;
- hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+ hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
hadc.Init.Resolution = ADC_RESOLUTION_12B;
hadc.Init.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
hadc.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
@@ -444,7 +446,8 @@
}
/* USER CODE BEGIN USART1_Init 2 */
// __HAL_UART_ENABLE_IT(&huart1, UART_IT_RXNE);//??idle??
-// Usart1InitVariables();
+ Usart1InitVariables();
+ LED0_BLINK;
/* USER CODE END USART1_Init 2 */
}
@@ -491,6 +494,12 @@
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, DW_WKUP_Pin|LED2_G_Pin, GPIO_PIN_RESET);
+
+ /*Configure GPIO pin : PA0 */
+ GPIO_InitStruct.Pin = GPIO_PIN_0;
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/*Configure GPIO pin : BAT_MEAS_Pin */
GPIO_InitStruct.Pin = BAT_MEAS_Pin;
@@ -542,7 +551,7 @@
/*Configure GPIO pin : PWR_ON_Pin */
GPIO_InitStruct.Pin = PWR_ON_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(PWR_ON_GPIO_Port, &GPIO_InitStruct);
/* EXTI interrupt init*/
--
Gitblit v1.9.3