Library/DS_Encoder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Dev' (#2) from Dev into main

Browse Source 
Reviewed-on: http://domstudent.ru:3000/Library/DS_Encoder/pulls/2
This commit is contained in:
Library
2024-05-25 14:44:41 -04:00
parent fc22e4a984 42b0b05734
commit 881dedfe20
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Inc/DS_Encoder.h
View File

@@ -18,8 +18,10 @@ typedef struct DS_Encoder
uint32_t PrevTick; uint32_t PrevTick;
uint8_t ValueSignal1, ValueSignal2; uint8_t ValueSignal1, ValueSignal2;
TIM_HandleTypeDef *hTim;
}DS_Encoder; }DS_Encoder;
void DS_EncoderInitTim(DS_Encoder *Encoder, TIM_HandleTypeDef *hTim);
void DS_EncoderInit(DS_Encoder *Encoder, GPIO_TypeDef* PortEncSignal1, uint16_t PinEncSignal1, GPIO_TypeDef* PortEncSignal2, uint16_t PinEncSignal2); void DS_EncoderInit(DS_Encoder *Encoder, GPIO_TypeDef* PortEncSignal1, uint16_t PinEncSignal1, GPIO_TypeDef* PortEncSignal2, uint16_t PinEncSignal2);

23
Src/DS_Encoder.c
View File

@@ -1,7 +1,16 @@
#include "Encoder.h" #include "Encoder.h"
void DS_EncoderInitTim(DS_Encoder *Encoder, TIM_HandleTypeDef *hTim)
{
Encoder->hTim = hTim;
Encoder->State = 0;
HAL_TIM_Base_Start(hTim);
}
void DS_EncoderInit(DS_Encoder *Encoder, GPIO_TypeDef *PortEncSignal1, uint16_t PinEncSignal1, GPIO_TypeDef *PortEncSignal2, uint16_t PinEncSignal2) void DS_EncoderInit(DS_Encoder *Encoder, GPIO_TypeDef *PortEncSignal1, uint16_t PinEncSignal1, GPIO_TypeDef *PortEncSignal2, uint16_t PinEncSignal2)
{ {
Encoder->hTim = 0;
Encoder->Direction = 0; Encoder->Direction = 0;
Encoder->State = 0; Encoder->State = 0;
Encoder->PrevTick = HAL_GetTick(); Encoder->PrevTick = HAL_GetTick();
@@ -68,8 +77,22 @@ void DS_EncoderUpdate(DS_Encoder *Encoder)
} }
int8_t DS_EncoderGetState(DS_Encoder *Encoder) int8_t DS_EncoderGetState(DS_Encoder *Encoder)
{
if (Encoder->hTim != 0)
{
int8_t CurrentCounter = Encoder->hTim->Instance->CNT / 4;
int8_t ValueToReturn = CurrentCounter - Encoder->State;
Encoder->State = CurrentCounter;
return ValueToReturn;
}
else
{ {
int8_t ValueToReturn = Encoder->State; int8_t ValueToReturn = Encoder->State;
Encoder->State = 0; Encoder->State = 0;
return ValueToReturn; return ValueToReturn;
} }
}