M17_Project
/
TR-9_HMI
mirror of https://github.com/M17-Project/TR-9_HMI.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add files via upload

master
Wojciech Kaczmarski 2019-05-12 15:31:47 +02:00 committed by GitHub
parent 89336be230
commit 061203ebde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Src/main.c
View File

@ -52,7 +52,8 @@ UART_HandleTypeDef huart2;
/* USER CODE BEGIN PV */ /* USER CODE BEGIN PV */
uint8_t pin=0; //for pin scanning uint8_t pin=0; //for pin scanning
uint8_t pressed=0; uint8_t pressed=0; //button being pressed?
uint8_t enc=0; //encoder position
/* USER CODE END PV */ /* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
@ -184,12 +185,14 @@ int main(void)
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
GPIOA->BSRR=(1<<(5+16))|(1<<(6+16))|(1<<(7+16)); GPIOA->BSRR=(1<<(5+16))|(1<<(6+16))|(1<<(7+16));
HAL_TIM_Base_Start_IT(&htim2); HAL_TIM_Base_Start_IT(&htim2);
HAL_TIM_Encoder_Start(&htim21, TIM_CHANNEL_ALL);
/* USER CODE END 2 */ /* USER CODE END 2 */
/* Infinite loop */ /* Infinite loop */
/* USER CODE BEGIN WHILE */ /* USER CODE BEGIN WHILE */
while (1) while (1)
{ {
enc=(TIM21->CNT)>>2;
last=GPIOB->IDR&((1<<5)|(1<<4)); last=GPIOB->IDR&((1<<5)|(1<<4));
HAL_Delay(1); HAL_Delay(1);
if(!(GPIOB->IDR&(1<<5)) && (last&(1<<5))) //falling edge on B1 if(!(GPIOB->IDR&(1<<5)) && (last&(1<<5))) //falling edge on B1
@ -309,7 +312,7 @@ static void MX_TIM21_Init(void)
htim21.Init.CounterMode = TIM_COUNTERMODE_UP; htim21.Init.CounterMode = TIM_COUNTERMODE_UP;
htim21.Init.Period = 47; htim21.Init.Period = 47;
htim21.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; htim21.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
sConfig.EncoderMode = TIM_ENCODERMODE_TI1; sConfig.EncoderMode = TIM_ENCODERMODE_TI12;
sConfig.IC1Polarity = TIM_ICPOLARITY_RISING; sConfig.IC1Polarity = TIM_ICPOLARITY_RISING;
sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI; sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI;
sConfig.IC1Prescaler = TIM_ICPSC_DIV1; sConfig.IC1Prescaler = TIM_ICPSC_DIV1;

3
TR-9_KBD.ioc
View File

@ -186,7 +186,8 @@ TIM2.IPParameters=Prescaler,Period,TIM_MasterOutputTrigger
TIM2.Period=31999 TIM2.Period=31999
TIM2.Prescaler=0 TIM2.Prescaler=0
TIM2.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE TIM2.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE
TIM21.IPParameters=Period TIM21.EncoderMode=TIM_ENCODERMODE_TI12
TIM21.IPParameters=Period,EncoderMode
TIM21.Period=47 TIM21.Period=47
USART2.BaudRate=9600 USART2.BaudRate=9600
USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,Mode USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,Mode