Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth Remote: [Add camera control mode to bluetooth remote app. #2336 (By LoganMD)] #513

Merged
merged 3 commits into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions applications/plugins/hid_app/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum HidDebugSubmenuIndex {
HidSubmenuIndexTikTok,
HidSubmenuIndexMouse,
HidSubmenuIndexMouseJiggler,
HidSubmenuIndexCamera,
};

static void hid_submenu_callback(void* context, uint32_t index) {
Expand All @@ -35,6 +36,9 @@ static void hid_submenu_callback(void* context, uint32_t index) {
} else if(index == HidSubmenuIndexMouseJiggler) {
app->view_id = HidViewMouseJiggler;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouseJiggler);
} else if(index == HidSubmenuIndexCamera) {
app->view_id = HidViewCamera;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewCamera);
}
}

Expand All @@ -55,6 +59,7 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
hid_mouse_set_connected_status(hid->hid_mouse, connected);
hid_mouse_jiggler_set_connected_status(hid->hid_mouse_jiggler, connected);
hid_tiktok_set_connected_status(hid->hid_tiktok, connected);
hid_camera_set_connected_status(hid->hid_camera, connected);
}

static void hid_dialog_callback(DialogExResult result, void* context) {
Expand Down Expand Up @@ -120,6 +125,12 @@ Hid* hid_alloc(HidTransport transport) {
HidSubmenuIndexMouseJiggler,
hid_submenu_callback,
app);
submenu_add_item(
app->device_type_submenu,
"Camera",
HidSubmenuIndexCamera,
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));
Expand Down Expand Up @@ -181,6 +192,12 @@ Hid* hid_app_alloc_view(void* context) {
HidViewMouseJiggler,
hid_mouse_jiggler_get_view(app->hid_mouse_jiggler));

// Camera view
app->hid_camera = hid_camera_alloc(app);
view_set_previous_callback(hid_camera_get_view(app->hid_camera), hid_exit_confirm_view);
view_dispatcher_add_view(
app->view_dispatcher, HidViewCamera, hid_camera_get_view(app->hid_camera));

return app;
}

Expand Down Expand Up @@ -209,6 +226,8 @@ void hid_free(Hid* app) {
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, HidViewCamera);
hid_camera_free(app->hid_camera);
view_dispatcher_free(app->view_dispatcher);

// Close records
Expand Down
2 changes: 2 additions & 0 deletions applications/plugins/hid_app/hid.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "views/hid_mouse.h"
#include "views/hid_mouse_jiggler.h"
#include "views/hid_tiktok.h"
#include "views/hid_camera.h"

#define HID_BT_KEYS_STORAGE_PATH EXT_PATH("apps/Tools/.bt_hid.keys")

Expand All @@ -45,6 +46,7 @@ struct Hid {
HidMouse* hid_mouse;
HidMouseJiggler* hid_mouse_jiggler;
HidTikTok* hid_tiktok;
HidCamera* hid_camera;

HidTransport transport;
uint32_t view_id;
Expand Down
1 change: 1 addition & 0 deletions applications/plugins/hid_app/views.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ typedef enum {
HidViewMouse,
HidViewMouseJiggler,
BtHidViewTikTok,
HidViewCamera,
HidViewExitConfirm,
} HidView;
112 changes: 112 additions & 0 deletions applications/plugins/hid_app/views/hid_camera.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
#include "hid_camera.h"
#include <gui/elements.h>
#include "../hid.h"

#include "hid_icons.h"

#define TAG "HidCamera"

struct HidCamera {
View* view;
Hid* hid;
};

typedef struct {
bool ok_pressed;
bool connected;
HidTransport transport;
} HidCameraModel;

static void hid_camera_draw_callback(Canvas* canvas, void* context) {
furi_assert(context);
HidCameraModel* 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, "Camera");
canvas_set_font(canvas, FontSecondary);

// Ok
canvas_draw_icon(canvas, 63, 25, &I_Space_65x18);
if(model->ok_pressed) {
elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
canvas_set_color(canvas, ColorWhite);
}
canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Photo");
canvas_set_color(canvas, ColorBlack);

// Back
canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8);
elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Quit");
}

static void hid_camera_process(HidCamera* hid_camera, InputEvent* event) {
with_view_model(
hid_camera->view,
HidCameraModel * model,
{
if(event->type == InputTypePress) {
if(event->key == InputKeyOk) {
model->ok_pressed = true;
hid_hal_consumer_key_press(hid_camera->hid, HID_CONSUMER_VOLUME_INCREMENT);
}
} else if(event->type == InputTypeRelease) {
if(event->key == InputKeyOk) {
model->ok_pressed = false;
hid_hal_consumer_key_release(hid_camera->hid, HID_CONSUMER_VOLUME_INCREMENT);
}
}
},
true);
}

static bool hid_camera_input_callback(InputEvent* event, void* context) {
furi_assert(context);
HidCamera* hid_camera = context;
bool consumed = false;

hid_camera_process(hid_camera, event);

return consumed;
}

HidCamera* hid_camera_alloc(Hid* hid) {
HidCamera* hid_camera = malloc(sizeof(HidCamera));
hid_camera->view = view_alloc();
hid_camera->hid = hid;
view_set_context(hid_camera->view, hid_camera);
view_allocate_model(hid_camera->view, ViewModelTypeLocking, sizeof(HidCameraModel));
view_set_draw_callback(hid_camera->view, hid_camera_draw_callback);
view_set_input_callback(hid_camera->view, hid_camera_input_callback);

with_view_model(
hid_camera->view, HidCameraModel * model, { model->transport = hid->transport; }, true);

return hid_camera;
}

void hid_camera_free(HidCamera* hid_camera) {
furi_assert(hid_camera);
view_free(hid_camera->view);
free(hid_camera);
}

View* hid_camera_get_view(HidCamera* hid_camera) {
furi_assert(hid_camera);
return hid_camera->view;
}

void hid_camera_set_connected_status(HidCamera* hid_camera, bool connected) {
furi_assert(hid_camera);
with_view_model(
hid_camera->view, HidCameraModel * model, { model->connected = connected; }, true);
}
14 changes: 14 additions & 0 deletions applications/plugins/hid_app/views/hid_camera.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#pragma once

#include <gui/view.h>

typedef struct Hid Hid;
typedef struct HidCamera HidCamera;

HidCamera* hid_camera_alloc(Hid* bt_hid);

void hid_camera_free(HidCamera* hid_camera);

View* hid_camera_get_view(HidCamera* hid_camera);

void hid_camera_set_connected_status(HidCamera* hid_camera, bool connected);