piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(color): re-add support for rotary encoder velocity increase (#2318)

Browse Source
This commit is contained in:
Raphael Coeffic
2022-09-18 13:01:19 +10:00
committed by GitHub
parent 333c2828ea
commit c2b1b6febf
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/LvglWrapper.cpp
+25 -2
View File
@@ -237,6 +237,9 @@ extern "C" void touchDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
static void rotaryDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
{
static rotenc_t prevPos = 0;
static int8_t prevDir = 0;
static int8_t accel = 0;
static tmr10ms_t lastEvent = 0;
rotenc_t newPos = (ROTARY_ENCODER_NAVIGATION_VALUE / ROTARY_ENCODER_GRANULARITY);
auto diff = newPos - prevPos;
@@ -245,8 +248,28 @@ static void rotaryDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
data->enc_diff = (int16_t)diff;
data->state = LV_INDEV_STATE_RELEASED;
// Reset inactivity counters
if (diff != 0) { reset_inactivity(); }
if (diff != 0) {
reset_inactivity();
int8_t dir = 0;
if (diff < 0) dir = -1;
else if (diff > 0) dir = 1;
if (dir == prevDir) {
if (g_tmr10ms - lastEvent <= ROTENC_DELAY_HIGHSPEED) { // 160 ms
// below ROTENC_DELAY_HIGHSPEED btw. events: accelerate
accel += abs(diff);
} else if (g_tmr10ms - lastEvent >= ROTENC_DELAY_MIDSPEED) { // 320 ms
// above ROTENC_DELAY_MIDSPEED btw. events: normal speed
accel = 0;
}
lastEvent = g_tmr10ms;
data->enc_diff = (int16_t)diff * max((int16_t)accel, (int16_t)1);
} else {
accel = 0;
}
prevDir = dir;
}
}
#endif