SheikahWolf/KT0915_radio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add keypad module, fix keys gpio define

Browse Source
This commit is contained in:
Sheikah
2023-01-24 00:44:56 +08:00
parent df4db6d8c4
commit 22f90eb896
9 changed files with 154 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Src/gpio.c
View File

@ -69,8 +69,7 @@ void MX_GPIO_Init(void)
/*Configure GPIO pins : PAPin PAPin PAPin PAPin
PAPin */
GPIO_InitStruct.Pin = KEY_1_Pin|KEY_2_Pin|KEY_3_Pin|KEY_4_Pin
|KEY_5_Pin;
GPIO_InitStruct.Pin = KEY_4_Pin|KEY_1_Pin|KEY_5_Pin|KEY_2_Pin|KEY_6_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@ -92,10 +91,10 @@ void MX_GPIO_Init(void)
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = KEY_6_Pin;
GPIO_InitStruct.Pin = KEY_3_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(KEY_6_GPIO_Port, &GPIO_InitStruct);
HAL_GPIO_Init(KEY_3_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pins : PBPin PBPin */
GPIO_InitStruct.Pin = SWI2C_SCL_Pin|SWI2C_SDA_Pin;

6
Core/Src/main.c
View File

@ -27,6 +27,7 @@
/* USER CODE BEGIN Includes */
#include <stdio.h>
#include "st7735.h"
#include "RotaryCoder.h"
#include "app.h"
/* USER CODE END Includes */
@ -69,6 +70,10 @@ void LCD_init()
ST7735_Init(); // 屏幕初始化
HAL_GPIO_WritePin(LCD_BK_GPIO_Port, LCD_BK_Pin, GPIO_PIN_SET);
}
void Rota_init()
{
EC11_init();
}
/* USER CODE END 0 */
/**
@ -104,6 +109,7 @@ int main(void)
MX_TIM3_Init();
/* USER CODE BEGIN 2 */
LCD_init();
Rota_init();
app_init();
/* USER CODE END 2 */

6
Core/Src/tim.c
View File

@ -43,15 +43,15 @@ void MX_TIM3_Init(void)
htim3.Instance = TIM3;
htim3.Init.Prescaler = 0;
htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
htim3.Init.Period = 255;
htim3.Init.Period = 0xFFFF;
htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
sConfig.EncoderMode = TIM_ENCODERMODE_TI1;
sConfig.IC1Polarity = TIM_ICPOLARITY_FALLING;
sConfig.IC1Polarity = TIM_ICPOLARITY_RISING;
sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI;
sConfig.IC1Prescaler = TIM_ICPSC_DIV1;
sConfig.IC1Filter = 0;
sConfig.IC2Polarity = TIM_ICPOLARITY_FALLING;
sConfig.IC2Polarity = TIM_ICPOLARITY_RISING;
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
sConfig.IC2Filter = 0;