DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-18 10:51:54 +03:00
Code Issues Projects Releases Wiki Activity

mac os music remote

Browse Source 
todo - add more buttons
This commit is contained in:
MX 2024-01-20 08:48:26 +03:00
parent 39e9dd0ab0
commit 41c316d612
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
5 changed files with 286 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
applications/system/hid_app/hid.c
View File

@ -11,6 +11,7 @@ enum HidDebugSubmenuIndex {
HidSubmenuIndexKeyboard,
HidSubmenuIndexNumpad,
HidSubmenuIndexMedia,
HidSubmenuIndexMusicMacOs,
HidSubmenuIndexMovie,
HidSubmenuIndexTikShorts,
HidSubmenuIndexMouse,
@ -39,6 +40,9 @@ static void hid_submenu_callback(void* context, uint32_t index) {
} else if(index == HidSubmenuIndexMedia) {
app->view_id = HidViewMedia;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMedia);
} else if(index == HidSubmenuIndexMusicMacOs) {
app->view_id = HidViewMusicMacOs;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMusicMacOs);
} else if(index == HidSubmenuIndexMovie) {
app->view_id = HidViewMovie;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMovie);
@ -75,6 +79,7 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
hid_keyboard_set_connected_status(hid->hid_keyboard, connected);
hid_numpad_set_connected_status(hid->hid_numpad, connected);
hid_media_set_connected_status(hid->hid_media, connected);
hid_music_macos_set_connected_status(hid->hid_music_macos, connected);
hid_movie_set_connected_status(hid->hid_movie, connected);
hid_mouse_set_connected_status(hid->hid_mouse, connected);
hid_mouse_clicker_set_connected_status(hid->hid_mouse_clicker, connected);
@ -131,6 +136,12 @@ Hid* hid_alloc(HidTransport transport) {
app->device_type_submenu, "Numpad", HidSubmenuIndexNumpad, hid_submenu_callback, app);
submenu_add_item(
app->device_type_submenu, "Media", HidSubmenuIndexMedia, hid_submenu_callback, app);
submenu_add_item(
app->device_type_submenu,
"Apple Music macOS",
HidSubmenuIndexMusicMacOs,
hid_submenu_callback,
app);
submenu_add_item(
app->device_type_submenu, "Movie", HidSubmenuIndexMovie, hid_submenu_callback, app);
submenu_add_item(
@ -156,7 +167,11 @@ Hid* hid_alloc(HidTransport transport) {
hid_submenu_callback,
app);
submenu_add_item(
app->device_type_submenu, "PushToTalk", HidSubmenuIndexPushToTalk, hid_submenu_callback, app);
app->device_type_submenu,
"PushToTalk",
HidSubmenuIndexPushToTalk,
hid_submenu_callback,
app);
view_set_previous_callback(submenu_get_view(app->device_type_submenu), hid_exit);
view_dispatcher_add_view(
app->view_dispatcher, HidViewSubmenu, submenu_get_view(app->device_type_submenu));
@ -192,7 +207,13 @@ Hid* hid_app_alloc_view(void* context) {
view_set_previous_callback(hid_media_get_view(app->hid_media), hid_menu_view);
view_dispatcher_add_view(
app->view_dispatcher, HidViewMedia, hid_media_get_view(app->hid_media));
// Music MacOs view
app->hid_music_macos = hid_music_macos_alloc(app);
view_set_previous_callback(hid_music_macos_get_view(app->hid_music_macos), hid_menu_view);
view_dispatcher_add_view(
app->view_dispatcher, HidViewMusicMacOs, hid_music_macos_get_view(app->hid_music_macos));
// Movie view
app->hid_movie = hid_movie_alloc(app);
view_set_previous_callback(hid_movie_get_view(app->hid_movie), hid_menu_view);
@ -213,8 +234,7 @@ Hid* hid_app_alloc_view(void* context) {
// Mouse clicker view
app->hid_mouse_clicker = hid_mouse_clicker_alloc(app);
view_set_previous_callback(
hid_mouse_clicker_get_view(app->hid_mouse_clicker), hid_menu_view);
view_set_previous_callback(hid_mouse_clicker_get_view(app->hid_mouse_clicker), hid_menu_view);
view_dispatcher_add_view(
app->view_dispatcher,
HidViewMouseClicker,
@ -222,8 +242,7 @@ Hid* hid_app_alloc_view(void* context) {
// Mouse jiggler view
app->hid_mouse_jiggler = hid_mouse_jiggler_alloc(app);
view_set_previous_callback(
hid_mouse_jiggler_get_view(app->hid_mouse_jiggler), hid_menu_view);
view_set_previous_callback(hid_mouse_jiggler_get_view(app->hid_mouse_jiggler), hid_menu_view);
view_dispatcher_add_view(
app->view_dispatcher,
HidViewMouseJiggler,
@ -233,7 +252,7 @@ Hid* hid_app_alloc_view(void* context) {
app->hid_ptt_menu = hid_ptt_menu_alloc(app);
view_set_previous_callback(hid_ptt_menu_get_view(app->hid_ptt_menu), hid_menu_view);
view_dispatcher_add_view(
app->view_dispatcher, HidViewPushToTalkMenu, hid_ptt_menu_get_view(app->hid_ptt_menu));
app->view_dispatcher, HidViewPushToTalkMenu, hid_ptt_menu_get_view(app->hid_ptt_menu));
app->hid_ptt = hid_ptt_alloc(app);
view_set_previous_callback(hid_ptt_get_view(app->hid_ptt), hid_ptt_menu_view);
view_dispatcher_add_view(
@ -261,6 +280,8 @@ void hid_free(Hid* app) {
hid_numpad_free(app->hid_numpad);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMedia);
hid_media_free(app->hid_media);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMusicMacOs);
hid_music_macos_free(app->hid_music_macos);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMovie);
hid_movie_free(app->hid_movie);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMouse);

2
applications/system/hid_app/hid.h
View File

@ -20,6 +20,7 @@
#include "views/hid_keyboard.h"
#include "views/hid_numpad.h"
#include "views/hid_media.h"
#include "views/hid_music_macos.h"
#include "views/hid_movie.h"
#include "views/hid_mouse.h"
#include "views/hid_mouse_clicker.h"
@ -48,6 +49,7 @@ struct Hid {
HidKeyboard* hid_keyboard;
HidNumpad* hid_numpad;
HidMedia* hid_media;
HidMusicMacos* hid_music_macos;
HidMovie* hid_movie;
HidMouse* hid_mouse;
HidMouseClicker* hid_mouse_clicker;

1
applications/system/hid_app/views.h
View File

@ -4,6 +4,7 @@ typedef enum {
HidViewKeyboard,
HidViewNumpad,
HidViewMedia,
HidViewMusicMacOs,
HidViewMovie,
HidViewMouse,
HidViewMouseClicker,

242
applications/system/hid_app/views/hid_music_macos.c Normal file
View File

@ -0,0 +1,242 @@
#include "hid_music_macos.h"
#include <furi.h>
#include <furi_hal_bt_hid.h>
#include <furi_hal_usb_hid.h>
#include <gui/elements.h>
#include "../hid.h"
#include "hid_icons.h"
#define TAG "HidMusicMacos"
struct HidMusicMacos {
View* view;
Hid* hid;
};
typedef struct {
bool left_pressed;
bool up_pressed;
bool right_pressed;
bool down_pressed;
bool ok_pressed;
bool connected;
bool back_pressed;
HidTransport transport;
} HidMusicMacosModel;
static void hid_music_macos_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
canvas_draw_triangle(canvas, x, y, 5, 3, dir);
if(dir == CanvasDirectionBottomToTop) {
canvas_draw_dot(canvas, x, y - 1);
} else if(dir == CanvasDirectionTopToBottom) {
canvas_draw_dot(canvas, x, y + 1);
} else if(dir == CanvasDirectionRightToLeft) {
canvas_draw_dot(canvas, x - 1, y);
} else if(dir == CanvasDirectionLeftToRight) {
canvas_draw_dot(canvas, x + 1, y);
}
}
static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
furi_assert(context);
HidMusicMacosModel* 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, "Music");
canvas_set_font(canvas, FontSecondary);
// Keypad circles
canvas_draw_icon(canvas, 58, 3, &I_OutCircles_70x51);
// Up
if(model->up_pressed) {
canvas_set_bitmap_mode(canvas, 1);
canvas_draw_icon(canvas, 68, 6, &I_S_UP_31x15);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
canvas_draw_icon(canvas, 79, 9, &I_Volup_8x6);
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_31x15);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
canvas_draw_icon(canvas, 80, 41, &I_Voldwn_6x6);
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_15x31);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
hid_music_macos_draw_arrow(canvas, 67, 28, CanvasDirectionRightToLeft);
hid_music_macos_draw_arrow(canvas, 70, 28, CanvasDirectionRightToLeft);
canvas_draw_line(canvas, 64, 26, 64, 30);
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_15x31);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
hid_music_macos_draw_arrow(canvas, 96, 28, CanvasDirectionLeftToRight);
hid_music_macos_draw_arrow(canvas, 99, 28, CanvasDirectionLeftToRight);
canvas_draw_line(canvas, 102, 26, 102, 30);
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);
}
hid_music_macos_draw_arrow(canvas, 80, 28, CanvasDirectionLeftToRight);
canvas_draw_line(canvas, 84, 26, 84, 30);
canvas_draw_line(canvas, 86, 26, 86, 30);
canvas_set_color(canvas, ColorBlack);
// Exit
if(model->back_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, 111, 38, &I_Pin_back_arrow_10x10);
canvas_set_color(canvas, ColorBlack);
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_music_macos_process_press(HidMusicMacos* hid_music_macos, InputEvent* event) {
with_view_model(
hid_music_macos->view,
HidMusicMacosModel * model,
{
if(event->key == InputKeyUp) {
model->up_pressed = true;
hid_hal_keyboard_press(
hid_music_macos->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_UP_ARROW);
hid_hal_keyboard_release(
hid_music_macos->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_UP_ARROW);
} else if(event->key == InputKeyDown) {
model->down_pressed = true;
hid_hal_keyboard_press(
hid_music_macos->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_DOWN_ARROW);
hid_hal_keyboard_release(
hid_music_macos->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_DOWN_ARROW);
} else if(event->key == InputKeyLeft) {
model->left_pressed = true;
hid_hal_consumer_key_press(hid_music_macos->hid, HID_CONSUMER_SCAN_PREVIOUS_TRACK);
} else if(event->key == InputKeyRight) {
model->right_pressed = true;
hid_hal_consumer_key_press(hid_music_macos->hid, HID_CONSUMER_SCAN_NEXT_TRACK);
} else if(event->key == InputKeyOk) {
model->ok_pressed = true;
hid_hal_consumer_key_press(hid_music_macos->hid, HID_CONSUMER_PLAY_PAUSE);
} else if(event->key == InputKeyBack) {
model->back_pressed = true;
}
},
true);
}
static void hid_music_macos_process_release(HidMusicMacos* hid_music_macos, InputEvent* event) {
with_view_model(
hid_music_macos->view,
HidMusicMacosModel * model,
{
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_music_macos->hid, HID_CONSUMER_SCAN_PREVIOUS_TRACK);
} else if(event->key == InputKeyRight) {
model->right_pressed = false;
hid_hal_consumer_key_release(hid_music_macos->hid, HID_CONSUMER_SCAN_NEXT_TRACK);
} else if(event->key == InputKeyOk) {
model->ok_pressed = false;
hid_hal_consumer_key_release(hid_music_macos->hid, HID_CONSUMER_PLAY_PAUSE);
} else if(event->key == InputKeyBack) {
model->back_pressed = false;
}
},
true);
}
static bool hid_music_macos_input_callback(InputEvent* event, void* context) {
furi_assert(context);
HidMusicMacos* hid_music_macos = context;
bool consumed = false;
if(event->type == InputTypeLong && event->key == InputKeyBack) {
hid_hal_keyboard_release_all(hid_music_macos->hid);
} else {
consumed = true;
if(event->type == InputTypePress) {
hid_music_macos_process_press(hid_music_macos, event);
} else if(event->type == InputTypeRelease) {
hid_music_macos_process_release(hid_music_macos, event);
}
}
return consumed;
}
HidMusicMacos* hid_music_macos_alloc(Hid* hid) {
HidMusicMacos* hid_music_macos = malloc(sizeof(HidMusicMacos));
hid_music_macos->view = view_alloc();
hid_music_macos->hid = hid;
view_set_context(hid_music_macos->view, hid_music_macos);
view_allocate_model(hid_music_macos->view, ViewModelTypeLocking, sizeof(HidMusicMacosModel));
view_set_draw_callback(hid_music_macos->view, hid_music_macos_draw_callback);
view_set_input_callback(hid_music_macos->view, hid_music_macos_input_callback);
with_view_model(
hid_music_macos->view,
HidMusicMacosModel * model,
{ model->transport = hid->transport; },
true);
return hid_music_macos;
}
void hid_music_macos_free(HidMusicMacos* hid_music_macos) {
furi_assert(hid_music_macos);
view_free(hid_music_macos->view);
free(hid_music_macos);
}
View* hid_music_macos_get_view(HidMusicMacos* hid_music_macos) {
furi_assert(hid_music_macos);
return hid_music_macos->view;
}
void hid_music_macos_set_connected_status(HidMusicMacos* hid_music_macos, bool connected) {
furi_assert(hid_music_macos);
with_view_model(
hid_music_macos->view, HidMusicMacosModel * model, { model->connected = connected; }, true);
}

13
applications/system/hid_app/views/hid_music_macos.h Normal file
View File

@ -0,0 +1,13 @@
#pragma once
#include <gui/view.h>
typedef struct HidMusicMacos HidMusicMacos;
HidMusicMacos* hid_music_macos_alloc();
void hid_music_macos_free(HidMusicMacos* hid_music_macos);
View* hid_music_macos_get_view(HidMusicMacos* hid_music_macos);
void hid_music_macos_set_connected_status(HidMusicMacos* hid_music_macos, bool connected);