Skip to content

Commit ab8ea27

Browse files
committed
Merge remote-tracking branch 'OFW/doom/hid_fap_fixes' into dev
2 parents ed1f400 + 61a54a1 commit ab8ea27

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

applications/system/hid_app/application.fam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ App(
33
name="USB Keyboard & Mouse",
44
apptype=FlipperAppType.EXTERNAL,
55
entry_point="hid_usb_app",
6-
stack_size=1 * 1024,
6+
stack_size=1 * 1024 + 256,
77
sources=["*.c", "!transport_ble.c"],
88
cdefines=["HID_TRANSPORT_USB"],
99
fap_description="Use Flipper as a HID remote control over USB",
@@ -20,7 +20,7 @@ App(
2020
name="Bluetooth Remote",
2121
apptype=FlipperAppType.EXTERNAL,
2222
entry_point="hid_ble_app",
23-
stack_size=1 * 1024,
23+
stack_size=1 * 1024 + 256,
2424
sources=["*.c", "!transport_usb.c"],
2525
cdefines=["HID_TRANSPORT_BLE"],
2626
fap_libs=["ble_profile"],

applications/system/hid_app/views/hid_tiktok.c

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ static void hid_tiktok_reset_cursor(HidTikTok* hid_tiktok) {
117117
furi_delay_ms(50);
118118
}
119119
// Move cursor from the corner
120-
hid_hal_mouse_move(hid_tiktok->hid, 20, 120);
120+
// Actions split for some mobiles to properly process mouse movements
121+
hid_hal_mouse_move(hid_tiktok->hid, 10, 60);
122+
furi_delay_ms(3);
123+
hid_hal_mouse_move(hid_tiktok->hid, 0, 60);
121124
furi_delay_ms(50);
122125
}
123126

@@ -180,29 +183,30 @@ static bool hid_tiktok_input_callback(InputEvent* event, void* context) {
180183
consumed = true;
181184
} else if(event->type == InputTypeShort) {
182185
if(event->key == InputKeyOk) {
186+
// delays adjusted for emulation of a finger tap
183187
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
184188
furi_delay_ms(25);
185189
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
186-
furi_delay_ms(100);
190+
furi_delay_ms(75);
187191
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
188192
furi_delay_ms(25);
189193
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
190194
consumed = true;
191195
} else if(event->key == InputKeyUp) {
192-
// Swipe to previous video
193-
hid_hal_mouse_scroll(hid_tiktok->hid, -6);
194-
hid_hal_mouse_scroll(hid_tiktok->hid, -8);
195-
hid_hal_mouse_scroll(hid_tiktok->hid, -10);
196-
hid_hal_mouse_scroll(hid_tiktok->hid, -8);
197-
hid_hal_mouse_scroll(hid_tiktok->hid, -6);
196+
// Emulate up swipe
197+
hid_hal_mouse_scroll(hid_tiktok->hid, -12);
198+
hid_hal_mouse_scroll(hid_tiktok->hid, -24);
199+
hid_hal_mouse_scroll(hid_tiktok->hid, -38);
200+
hid_hal_mouse_scroll(hid_tiktok->hid, -24);
201+
hid_hal_mouse_scroll(hid_tiktok->hid, -12);
198202
consumed = true;
199203
} else if(event->key == InputKeyDown) {
200-
// Swipe to next video
201-
hid_hal_mouse_scroll(hid_tiktok->hid, 6);
202-
hid_hal_mouse_scroll(hid_tiktok->hid, 8);
203-
hid_hal_mouse_scroll(hid_tiktok->hid, 10);
204-
hid_hal_mouse_scroll(hid_tiktok->hid, 8);
205-
hid_hal_mouse_scroll(hid_tiktok->hid, 6);
204+
// Emulate down swipe
205+
hid_hal_mouse_scroll(hid_tiktok->hid, 12);
206+
hid_hal_mouse_scroll(hid_tiktok->hid, 24);
207+
hid_hal_mouse_scroll(hid_tiktok->hid, 38);
208+
hid_hal_mouse_scroll(hid_tiktok->hid, 24);
209+
hid_hal_mouse_scroll(hid_tiktok->hid, 12);
206210
consumed = true;
207211
} else if(event->key == InputKeyBack) {
208212
// Pause

0 commit comments

Comments
 (0)