Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 15:48:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update bt_hid_keynote.c

Browse Source
This commit is contained in:
RogueMaster
2022-10-10 02:18:12 -04:00
parent e29d12aa03
commit ca851d933d
1 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
applications/plugins/bt_hid_app/views/bt_hid_keynote.c
View File

@@ -4,12 +4,6 @@
#include <furi_hal_usb_hid.h> #include <furi_hal_usb_hid.h>
#include <gui/elements.h> #include <gui/elements.h>
const char* bt_hid_hold_exit = "Hold : exit";
const char* bt_hid_hold_space = "Hold : space";
const char* bt_hid_hold_enter = "Hold : enter";
const char* bt_hid_space_btn = "Space";
const char* bt_hid_enter_btn = "Enter";
struct BtHidKeynote { struct BtHidKeynote {
View* view; View* view;
}; };
@@ -22,7 +16,6 @@ typedef struct {
bool ok_pressed; bool ok_pressed;
bool back_pressed; bool back_pressed;
bool connected; bool connected;
bool switch_space_return;
} BtHidKeynoteModel; } BtHidKeynoteModel;
static void bt_hid_keynote_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) { static void bt_hid_keynote_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
@@ -51,18 +44,9 @@ static void bt_hid_keynote_draw_callback(Canvas* canvas, void* context) {
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keynote"); elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keynote");
// Hold instructions canvas_draw_icon(canvas, 68, 2, &I_Pin_back_arrow_10x8);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
elements_multiline_text_aligned(canvas, 68, 3, AlignLeft, AlignTop, bt_hid_hold_exit); elements_multiline_text_aligned(canvas, 127, 3, AlignRight, AlignTop, "Hold to exit");
canvas_draw_icon(canvas, 87, 2, &I_Pin_back_arrow_10x8);
const char* bt_hid_hold_btn;
if(!model->switch_space_return) {
bt_hid_hold_btn = bt_hid_hold_enter;
} else {
bt_hid_hold_btn = bt_hid_hold_space;
}
elements_multiline_text_aligned(canvas, 68, 12, AlignLeft, AlignTop, bt_hid_hold_btn);
canvas_draw_icon(canvas, 87, 11, &I_Ok_btn_9x9);
// Up // Up
canvas_draw_icon(canvas, 21, 24, &I_Button_18x18); canvas_draw_icon(canvas, 21, 24, &I_Button_18x18);
@@ -107,13 +91,7 @@ static void bt_hid_keynote_draw_callback(Canvas* canvas, void* context) {
canvas_set_color(canvas, ColorWhite); canvas_set_color(canvas, ColorWhite);
} }
canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9); canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
const char* bt_hid_btn; elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Space");
if(!model->switch_space_return) {
bt_hid_btn = bt_hid_space_btn;
} else {
bt_hid_btn = bt_hid_enter_btn;
}
elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, bt_hid_btn);
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
// Back // Back
@@ -146,6 +124,7 @@ static void bt_hid_keynote_process(BtHidKeynote* bt_hid_keynote, InputEvent* eve
furi_hal_bt_hid_kb_press(HID_KEYBOARD_RIGHT_ARROW); furi_hal_bt_hid_kb_press(HID_KEYBOARD_RIGHT_ARROW);
} else if(event->key == InputKeyOk) { } else if(event->key == InputKeyOk) {
model->ok_pressed = true; model->ok_pressed = true;
furi_hal_bt_hid_kb_press(HID_KEYBOARD_SPACEBAR);
} else if(event->key == InputKeyBack) { } else if(event->key == InputKeyBack) {
model->back_pressed = true; model->back_pressed = true;
} }
@@ -164,6 +143,7 @@ static void bt_hid_keynote_process(BtHidKeynote* bt_hid_keynote, InputEvent* eve
furi_hal_bt_hid_kb_release(HID_KEYBOARD_RIGHT_ARROW); furi_hal_bt_hid_kb_release(HID_KEYBOARD_RIGHT_ARROW);
} else if(event->key == InputKeyOk) { } else if(event->key == InputKeyOk) {
model->ok_pressed = false; model->ok_pressed = false;
furi_hal_bt_hid_kb_release(HID_KEYBOARD_SPACEBAR);
} else if(event->key == InputKeyBack) { } else if(event->key == InputKeyBack) {
model->back_pressed = false; model->back_pressed = false;
} }
@@ -174,15 +154,6 @@ static void bt_hid_keynote_process(BtHidKeynote* bt_hid_keynote, InputEvent* eve
furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_AC_BACK); furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_AC_BACK);
furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_AC_BACK); furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_AC_BACK);
} }
if(event->key == InputKeyOk) {
if(!model->switch_space_return) {
furi_hal_bt_hid_kb_press(HID_KEYBOARD_SPACEBAR);
furi_hal_bt_hid_kb_release(HID_KEYBOARD_SPACEBAR);
} else {
furi_hal_bt_hid_kb_press(HID_KEYBOARD_RETURN);
furi_hal_bt_hid_kb_release(HID_KEYBOARD_RETURN);
}
}
} }
}, },
true); true);
@@ -195,12 +166,6 @@ static bool bt_hid_keynote_input_callback(InputEvent* event, void* context) {
if(event->type == InputTypeLong && event->key == InputKeyBack) { if(event->type == InputTypeLong && event->key == InputKeyBack) {
furi_hal_bt_hid_kb_release_all(); furi_hal_bt_hid_kb_release_all();
} else if(event->type == InputTypeLong && event->key == InputKeyOk) {
with_view_model(
bt_hid_keynote->view, (BtHidKeynoteModel * model) {
model->switch_space_return = !model->switch_space_return;
return true;
});
} else { } else {
bt_hid_keynote_process(bt_hid_keynote, event); bt_hid_keynote_process(bt_hid_keynote, event);
consumed = true; consumed = true;