mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-27 06:04:46 -07:00
Remove broken tiktok mode from bt remote
This commit is contained in:
19
applications/external/hid_app/hid.c
vendored
19
applications/external/hid_app/hid.c
vendored
@@ -11,7 +11,6 @@ enum HidDebugSubmenuIndex {
|
|||||||
HidSubmenuIndexKeyboard,
|
HidSubmenuIndexKeyboard,
|
||||||
HidSubmenuIndexNumpad,
|
HidSubmenuIndexNumpad,
|
||||||
HidSubmenuIndexMedia,
|
HidSubmenuIndexMedia,
|
||||||
HidSubmenuIndexTikTok,
|
|
||||||
HidSubmenuIndexYTShorts,
|
HidSubmenuIndexYTShorts,
|
||||||
HidSubmenuIndexMouse,
|
HidSubmenuIndexMouse,
|
||||||
HidSubmenuIndexMouseClicker,
|
HidSubmenuIndexMouseClicker,
|
||||||
@@ -39,9 +38,6 @@ static void hid_submenu_callback(void* context, uint32_t index) {
|
|||||||
} else if(index == HidSubmenuIndexMouse) {
|
} else if(index == HidSubmenuIndexMouse) {
|
||||||
app->view_id = HidViewMouse;
|
app->view_id = HidViewMouse;
|
||||||
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouse);
|
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouse);
|
||||||
} else if(index == HidSubmenuIndexTikTok) {
|
|
||||||
app->view_id = BtHidViewTikTok;
|
|
||||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewTikTok);
|
|
||||||
} else if(index == HidSubmenuIndexYTShorts) {
|
} else if(index == HidSubmenuIndexYTShorts) {
|
||||||
app->view_id = BtHidViewYTShorts;
|
app->view_id = BtHidViewYTShorts;
|
||||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewYTShorts);
|
view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewYTShorts);
|
||||||
@@ -73,7 +69,6 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
|
|||||||
hid_mouse_set_connected_status(hid->hid_mouse, connected);
|
hid_mouse_set_connected_status(hid->hid_mouse, connected);
|
||||||
hid_mouse_clicker_set_connected_status(hid->hid_mouse_clicker, connected);
|
hid_mouse_clicker_set_connected_status(hid->hid_mouse_clicker, connected);
|
||||||
hid_mouse_jiggler_set_connected_status(hid->hid_mouse_jiggler, connected);
|
hid_mouse_jiggler_set_connected_status(hid->hid_mouse_jiggler, connected);
|
||||||
hid_tiktok_set_connected_status(hid->hid_tiktok, connected);
|
|
||||||
hid_ytshorts_set_connected_status(hid->hid_ytshorts, connected);
|
hid_ytshorts_set_connected_status(hid->hid_ytshorts, connected);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -135,12 +130,6 @@ Hid* hid_alloc(HidTransport transport) {
|
|||||||
submenu_add_item(
|
submenu_add_item(
|
||||||
app->device_type_submenu, "Mouse", HidSubmenuIndexMouse, hid_submenu_callback, app);
|
app->device_type_submenu, "Mouse", HidSubmenuIndexMouse, hid_submenu_callback, app);
|
||||||
if(app->transport == HidTransportBle) {
|
if(app->transport == HidTransportBle) {
|
||||||
submenu_add_item(
|
|
||||||
app->device_type_submenu,
|
|
||||||
"TikTok Controller",
|
|
||||||
HidSubmenuIndexTikTok,
|
|
||||||
hid_submenu_callback,
|
|
||||||
app);
|
|
||||||
submenu_add_item(
|
submenu_add_item(
|
||||||
app->device_type_submenu,
|
app->device_type_submenu,
|
||||||
"YT Shorts Controller",
|
"YT Shorts Controller",
|
||||||
@@ -215,12 +204,6 @@ Hid* hid_app_alloc_view(void* context) {
|
|||||||
view_dispatcher_add_view(
|
view_dispatcher_add_view(
|
||||||
app->view_dispatcher, HidViewMedia, hid_media_get_view(app->hid_media));
|
app->view_dispatcher, HidViewMedia, hid_media_get_view(app->hid_media));
|
||||||
|
|
||||||
// TikTok view
|
|
||||||
app->hid_tiktok = hid_tiktok_alloc(app);
|
|
||||||
view_set_previous_callback(hid_tiktok_get_view(app->hid_tiktok), hid_exit_confirm_view);
|
|
||||||
view_dispatcher_add_view(
|
|
||||||
app->view_dispatcher, BtHidViewTikTok, hid_tiktok_get_view(app->hid_tiktok));
|
|
||||||
|
|
||||||
// YTShorts view
|
// YTShorts view
|
||||||
app->hid_ytshorts = hid_ytshorts_alloc(app);
|
app->hid_ytshorts = hid_ytshorts_alloc(app);
|
||||||
view_set_previous_callback(hid_ytshorts_get_view(app->hid_ytshorts), hid_exit_confirm_view);
|
view_set_previous_callback(hid_ytshorts_get_view(app->hid_ytshorts), hid_exit_confirm_view);
|
||||||
@@ -283,8 +266,6 @@ void hid_free(Hid* app) {
|
|||||||
hid_mouse_clicker_free(app->hid_mouse_clicker);
|
hid_mouse_clicker_free(app->hid_mouse_clicker);
|
||||||
view_dispatcher_remove_view(app->view_dispatcher, HidViewMouseJiggler);
|
view_dispatcher_remove_view(app->view_dispatcher, HidViewMouseJiggler);
|
||||||
hid_mouse_jiggler_free(app->hid_mouse_jiggler);
|
hid_mouse_jiggler_free(app->hid_mouse_jiggler);
|
||||||
view_dispatcher_remove_view(app->view_dispatcher, BtHidViewTikTok);
|
|
||||||
hid_tiktok_free(app->hid_tiktok);
|
|
||||||
view_dispatcher_remove_view(app->view_dispatcher, BtHidViewYTShorts);
|
view_dispatcher_remove_view(app->view_dispatcher, BtHidViewYTShorts);
|
||||||
hid_ytshorts_free(app->hid_ytshorts);
|
hid_ytshorts_free(app->hid_ytshorts);
|
||||||
view_dispatcher_free(app->view_dispatcher);
|
view_dispatcher_free(app->view_dispatcher);
|
||||||
|
|||||||
2
applications/external/hid_app/hid.h
vendored
2
applications/external/hid_app/hid.h
vendored
@@ -23,7 +23,6 @@
|
|||||||
#include "views/hid_media.h"
|
#include "views/hid_media.h"
|
||||||
#include "views/hid_mouse.h"
|
#include "views/hid_mouse.h"
|
||||||
#include "views/hid_mouse_jiggler.h"
|
#include "views/hid_mouse_jiggler.h"
|
||||||
#include "views/hid_tiktok.h"
|
|
||||||
#include "views/hid_ytshorts.h"
|
#include "views/hid_ytshorts.h"
|
||||||
#include "views/hid_mouse_clicker.h"
|
#include "views/hid_mouse_clicker.h"
|
||||||
|
|
||||||
@@ -51,7 +50,6 @@ struct Hid {
|
|||||||
HidMouse* hid_mouse;
|
HidMouse* hid_mouse;
|
||||||
HidMouseClicker* hid_mouse_clicker;
|
HidMouseClicker* hid_mouse_clicker;
|
||||||
HidMouseJiggler* hid_mouse_jiggler;
|
HidMouseJiggler* hid_mouse_jiggler;
|
||||||
HidTikTok* hid_tiktok;
|
|
||||||
HidYTShorts* hid_ytshorts;
|
HidYTShorts* hid_ytshorts;
|
||||||
|
|
||||||
HidTransport transport;
|
HidTransport transport;
|
||||||
|
|||||||
1
applications/external/hid_app/views.h
vendored
1
applications/external/hid_app/views.h
vendored
@@ -8,7 +8,6 @@ typedef enum {
|
|||||||
HidViewMouse,
|
HidViewMouse,
|
||||||
HidViewMouseClicker,
|
HidViewMouseClicker,
|
||||||
HidViewMouseJiggler,
|
HidViewMouseJiggler,
|
||||||
BtHidViewTikTok,
|
|
||||||
BtHidViewYTShorts,
|
BtHidViewYTShorts,
|
||||||
HidViewExitConfirm,
|
HidViewExitConfirm,
|
||||||
} HidView;
|
} HidView;
|
||||||
|
|||||||
255
applications/external/hid_app/views/hid_tiktok.c
vendored
255
applications/external/hid_app/views/hid_tiktok.c
vendored
@@ -1,255 +0,0 @@
|
|||||||
#include "hid_tiktok.h"
|
|
||||||
#include "../hid.h"
|
|
||||||
#include <gui/elements.h>
|
|
||||||
|
|
||||||
#include "hid_icons.h"
|
|
||||||
|
|
||||||
#define TAG "HidTikTok"
|
|
||||||
|
|
||||||
struct HidTikTok {
|
|
||||||
View* view;
|
|
||||||
Hid* hid;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
bool left_pressed;
|
|
||||||
bool up_pressed;
|
|
||||||
bool right_pressed;
|
|
||||||
bool down_pressed;
|
|
||||||
bool ok_pressed;
|
|
||||||
bool connected;
|
|
||||||
bool is_cursor_set;
|
|
||||||
bool back_mouse_pressed;
|
|
||||||
HidTransport transport;
|
|
||||||
} HidTikTokModel;
|
|
||||||
|
|
||||||
static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
|
|
||||||
furi_assert(context);
|
|
||||||
HidTikTokModel* model = context;
|
|
||||||
|
|
||||||
// Header
|
|
||||||
if(model->transport == HidTransportBle) {
|
|
||||||
if(model->connected) {
|
|
||||||
canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
|
|
||||||
} else {
|
|
||||||
canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
canvas_set_font(canvas, FontPrimary);
|
|
||||||
elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "TikTok");
|
|
||||||
canvas_set_font(canvas, FontSecondary);
|
|
||||||
|
|
||||||
// Keypad circles
|
|
||||||
canvas_draw_icon(canvas, 58, 3, &I_OutCircles);
|
|
||||||
|
|
||||||
// Pause
|
|
||||||
if(model->back_mouse_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Up
|
|
||||||
if(model->up_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 68, 6, &I_S_UP);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Down
|
|
||||||
if(model->down_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 68, 36, &I_S_DOWN);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Left
|
|
||||||
if(model->left_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 61, 13, &I_S_LEFT);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Right
|
|
||||||
if(model->right_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Ok
|
|
||||||
if(model->ok_pressed) {
|
|
||||||
canvas_set_bitmap_mode(canvas, 1);
|
|
||||||
canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
|
|
||||||
canvas_set_bitmap_mode(canvas, 0);
|
|
||||||
canvas_set_color(canvas, ColorWhite);
|
|
||||||
}
|
|
||||||
canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9);
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
|
||||||
|
|
||||||
// Exit
|
|
||||||
canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
|
|
||||||
canvas_set_font(canvas, FontSecondary);
|
|
||||||
elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hid_tiktok_reset_cursor(HidTikTok* hid_tiktok) {
|
|
||||||
// Set cursor to the phone's left up corner
|
|
||||||
// Delays to guarantee one packet per connection interval
|
|
||||||
for(size_t i = 0; i < 8; i++) {
|
|
||||||
hid_hal_mouse_move(hid_tiktok->hid, -127, -127);
|
|
||||||
furi_delay_ms(50);
|
|
||||||
}
|
|
||||||
// Move cursor from the corner
|
|
||||||
hid_hal_mouse_move(hid_tiktok->hid, 20, 120);
|
|
||||||
furi_delay_ms(50);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
hid_tiktok_process_press(HidTikTok* hid_tiktok, HidTikTokModel* model, InputEvent* event) {
|
|
||||||
if(event->key == InputKeyUp) {
|
|
||||||
model->up_pressed = true;
|
|
||||||
} else if(event->key == InputKeyDown) {
|
|
||||||
model->down_pressed = true;
|
|
||||||
} else if(event->key == InputKeyLeft) {
|
|
||||||
model->left_pressed = true;
|
|
||||||
hid_hal_consumer_key_press(hid_tiktok->hid, HID_CONSUMER_VOLUME_DECREMENT);
|
|
||||||
} else if(event->key == InputKeyRight) {
|
|
||||||
model->right_pressed = true;
|
|
||||||
hid_hal_consumer_key_press(hid_tiktok->hid, HID_CONSUMER_VOLUME_INCREMENT);
|
|
||||||
} else if(event->key == InputKeyOk) {
|
|
||||||
model->ok_pressed = true;
|
|
||||||
} else if(event->key == InputKeyBack) {
|
|
||||||
model->back_mouse_pressed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
hid_tiktok_process_release(HidTikTok* hid_tiktok, HidTikTokModel* model, InputEvent* event) {
|
|
||||||
if(event->key == InputKeyUp) {
|
|
||||||
model->up_pressed = false;
|
|
||||||
} else if(event->key == InputKeyDown) {
|
|
||||||
model->down_pressed = false;
|
|
||||||
} else if(event->key == InputKeyLeft) {
|
|
||||||
model->left_pressed = false;
|
|
||||||
hid_hal_consumer_key_release(hid_tiktok->hid, HID_CONSUMER_VOLUME_DECREMENT);
|
|
||||||
} else if(event->key == InputKeyRight) {
|
|
||||||
model->right_pressed = false;
|
|
||||||
hid_hal_consumer_key_release(hid_tiktok->hid, HID_CONSUMER_VOLUME_INCREMENT);
|
|
||||||
} else if(event->key == InputKeyOk) {
|
|
||||||
model->ok_pressed = false;
|
|
||||||
} else if(event->key == InputKeyBack) {
|
|
||||||
model->back_mouse_pressed = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hid_tiktok_input_callback(InputEvent* event, void* context) {
|
|
||||||
furi_assert(context);
|
|
||||||
HidTikTok* hid_tiktok = context;
|
|
||||||
bool consumed = false;
|
|
||||||
|
|
||||||
with_view_model(
|
|
||||||
hid_tiktok->view,
|
|
||||||
HidTikTokModel * model,
|
|
||||||
{
|
|
||||||
if(event->type == InputTypePress) {
|
|
||||||
hid_tiktok_process_press(hid_tiktok, model, event);
|
|
||||||
if(model->connected && !model->is_cursor_set) {
|
|
||||||
hid_tiktok_reset_cursor(hid_tiktok);
|
|
||||||
model->is_cursor_set = true;
|
|
||||||
}
|
|
||||||
consumed = true;
|
|
||||||
} else if(event->type == InputTypeRelease) {
|
|
||||||
hid_tiktok_process_release(hid_tiktok, model, event);
|
|
||||||
consumed = true;
|
|
||||||
} else if(event->type == InputTypeShort) {
|
|
||||||
if(event->key == InputKeyOk) {
|
|
||||||
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
furi_delay_ms(25);
|
|
||||||
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
furi_delay_ms(100);
|
|
||||||
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
furi_delay_ms(25);
|
|
||||||
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
consumed = true;
|
|
||||||
} else if(event->key == InputKeyDown) {
|
|
||||||
// Swipe to next video
|
|
||||||
hid_hal_mouse_scroll(hid_tiktok->hid, 19);
|
|
||||||
consumed = true;
|
|
||||||
} else if(event->key == InputKeyUp) {
|
|
||||||
// Swipe to previous video
|
|
||||||
hid_hal_mouse_scroll(hid_tiktok->hid, -19);
|
|
||||||
consumed = true;
|
|
||||||
} else if(event->key == InputKeyBack) {
|
|
||||||
// Pause
|
|
||||||
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
furi_delay_ms(50);
|
|
||||||
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
|
|
||||||
consumed = true;
|
|
||||||
}
|
|
||||||
} else if(event->type == InputTypeLong) {
|
|
||||||
if(event->key == InputKeyBack) {
|
|
||||||
hid_hal_consumer_key_release_all(hid_tiktok->hid);
|
|
||||||
model->is_cursor_set = false;
|
|
||||||
consumed = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
true);
|
|
||||||
|
|
||||||
return consumed;
|
|
||||||
}
|
|
||||||
|
|
||||||
HidTikTok* hid_tiktok_alloc(Hid* bt_hid) {
|
|
||||||
HidTikTok* hid_tiktok = malloc(sizeof(HidTikTok));
|
|
||||||
hid_tiktok->hid = bt_hid;
|
|
||||||
hid_tiktok->view = view_alloc();
|
|
||||||
view_set_context(hid_tiktok->view, hid_tiktok);
|
|
||||||
view_allocate_model(hid_tiktok->view, ViewModelTypeLocking, sizeof(HidTikTokModel));
|
|
||||||
view_set_draw_callback(hid_tiktok->view, hid_tiktok_draw_callback);
|
|
||||||
view_set_input_callback(hid_tiktok->view, hid_tiktok_input_callback);
|
|
||||||
|
|
||||||
with_view_model(
|
|
||||||
hid_tiktok->view, HidTikTokModel * model, { model->transport = bt_hid->transport; }, true);
|
|
||||||
|
|
||||||
return hid_tiktok;
|
|
||||||
}
|
|
||||||
|
|
||||||
void hid_tiktok_free(HidTikTok* hid_tiktok) {
|
|
||||||
furi_assert(hid_tiktok);
|
|
||||||
view_free(hid_tiktok->view);
|
|
||||||
free(hid_tiktok);
|
|
||||||
}
|
|
||||||
|
|
||||||
View* hid_tiktok_get_view(HidTikTok* hid_tiktok) {
|
|
||||||
furi_assert(hid_tiktok);
|
|
||||||
return hid_tiktok->view;
|
|
||||||
}
|
|
||||||
|
|
||||||
void hid_tiktok_set_connected_status(HidTikTok* hid_tiktok, bool connected) {
|
|
||||||
furi_assert(hid_tiktok);
|
|
||||||
with_view_model(
|
|
||||||
hid_tiktok->view,
|
|
||||||
HidTikTokModel * model,
|
|
||||||
{
|
|
||||||
model->connected = connected;
|
|
||||||
model->is_cursor_set = false;
|
|
||||||
},
|
|
||||||
true);
|
|
||||||
}
|
|
||||||
14
applications/external/hid_app/views/hid_tiktok.h
vendored
14
applications/external/hid_app/views/hid_tiktok.h
vendored
@@ -1,14 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include <gui/view.h>
|
|
||||||
|
|
||||||
typedef struct Hid Hid;
|
|
||||||
typedef struct HidTikTok HidTikTok;
|
|
||||||
|
|
||||||
HidTikTok* hid_tiktok_alloc(Hid* bt_hid);
|
|
||||||
|
|
||||||
void hid_tiktok_free(HidTikTok* hid_tiktok);
|
|
||||||
|
|
||||||
View* hid_tiktok_get_view(HidTikTok* hid_tiktok);
|
|
||||||
|
|
||||||
void hid_tiktok_set_connected_status(HidTikTok* hid_tiktok, bool connected);
|
|
||||||
Reference in New Issue
Block a user