kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
Enc2 and tooltips update
rodzic
440b3a7b23
commit
59ad38193a
|
@ -178,6 +178,8 @@ void FRONTPANEL_ENCODER_checkRotate(void)
|
|||
|
||||
void FRONTPANEL_ENCODER2_checkRotate(void)
|
||||
{
|
||||
static int8_t enc2_slowler = 0;
|
||||
#define enc2_slowler_val 2
|
||||
uint8_t ENCODER2_DTVal = HAL_GPIO_ReadPin(ENC2_DT_GPIO_Port, ENC2_DT_Pin);
|
||||
uint8_t ENCODER2_CLKVal = HAL_GPIO_ReadPin(ENC2_CLK_GPIO_Port, ENC2_CLK_Pin);
|
||||
|
||||
|
@ -187,12 +189,24 @@ void FRONTPANEL_ENCODER2_checkRotate(void)
|
|||
if (!CALIBRATE.ENCODER_ON_FALLING || ENCODER2_CLKVal == 0)
|
||||
{
|
||||
if (ENCODER2_DTVal != ENCODER2_CLKVal)
|
||||
{ // If pin A changed first - clockwise rotation
|
||||
FRONTPANEL_ENCODER2_Rotated(CALIBRATE.ENCODER2_INVERT ? 1 : -1);
|
||||
{
|
||||
// If pin A changed first - clockwise rotation
|
||||
enc2_slowler--;
|
||||
if(enc2_slowler <= -enc2_slowler_val)
|
||||
{
|
||||
FRONTPANEL_ENCODER2_Rotated(CALIBRATE.ENCODER2_INVERT ? 1 : -1);
|
||||
enc2_slowler = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // otherwise B changed its state first - counterclockwise rotation
|
||||
FRONTPANEL_ENCODER2_Rotated(CALIBRATE.ENCODER2_INVERT ? -1 : 1);
|
||||
{
|
||||
// otherwise B changed its state first - counterclockwise rotation
|
||||
enc2_slowler++;
|
||||
if(enc2_slowler >= enc2_slowler_val)
|
||||
{
|
||||
FRONTPANEL_ENCODER2_Rotated(CALIBRATE.ENCODER2_INVERT ? -1 : 1);
|
||||
enc2_slowler = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
ENCODER2_AValDeb = HAL_GetTick();
|
||||
|
|
|
@ -817,10 +817,10 @@ void LCD_showInfo(char text[], bool autohide)
|
|||
void LCD_showTooltip(char text[])
|
||||
{
|
||||
Tooltip_DiplayStartTime = HAL_GetTick();
|
||||
strcpy(Tooltip_string, text);
|
||||
Tooltip_first_draw = true;
|
||||
if(LCD_UpdateQuery.Tooltip) //redraw old tooltip
|
||||
if(LCD_UpdateQuery.Tooltip && strlen(Tooltip_string) != strlen(text)) //redraw old tooltip
|
||||
LCD_UpdateQuery.FreqInfoRedraw = true;
|
||||
Tooltip_first_draw = true;
|
||||
strcpy(Tooltip_string, text);
|
||||
LCD_UpdateQuery.Tooltip = true;
|
||||
}
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue