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

fix(color): Rework rotary encoder acceleration calculation, fix getRotEntSpeed not working (#3441)

Browse Source 
* Rework the rotary encoder acceleration calculation, and remove double handling of acceleration.

* Reduce the acceleration sensitivity.

* Set the 'rotencSpeed' variable for the Lua getRotEntSpeed function().
This commit is contained in:
philmoz
2023-04-16 16:54:46 +10:00
committed by GitHub
parent a49ab1d673
commit 5b0e47ff42
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/LvglWrapper.cpp
+8 -15
View File
@@ -254,32 +254,25 @@ static void rotaryDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
if (diff != 0) {
reset_inactivity();
bool use_accel = false;
auto i = lv_indev_get_act();
if (i) {
auto g = i->group;
if (g && lv_group_get_editing(g)) {
auto obj = lv_group_get_focused(g);
use_accel = obj && lv_obj_has_flag(obj, LV_OBJ_FLAG_ENCODER_ACCEL);
}
}
int8_t dir = 0;
if (diff < 0) dir = -1;
else if (diff > 0) dir = 1;
if (use_accel && (dir == prevDir)) {
if (dir == prevDir) {
auto dt = rotencDt - lastDt;
auto dx_dt = (abs(diff) * 50) / max(dt, (uint32_t)1);
dt = max(dt, (uint32_t)1);
auto dx_dt = (diff * diff * 50) / dt;
dx_dt = min(dx_dt, (uint32_t)100);
_rotary_enc_accel = (int8_t)dx_dt;
if (_rotary_enc_accel > 0) {
data->enc_diff = (int16_t)diff * (int16_t)_rotary_enc_accel;
}
} else {
_rotary_enc_accel = 0;
}
// For Lua getRotEncSpeed() function
rotencSpeed = max(_rotary_enc_accel, (int8_t)1);
prevDir = dir;
lastDt = rotencDt;
}