Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-13 19:43:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

BadKB add BT_ID + switch mode with ID / BT_ID

Browse Source
This commit is contained in:
Willy-JL
2023-05-01 20:02:21 +01:00
parent b19573bcc5
commit 1fb9cfcb98
8 changed files with 123 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/bad_kb/bad_kb_app.c
+10 -10
View File
@@ -100,19 +100,19 @@ static void bad_kb_save_settings(BadKbApp* app) {
void bad_kb_reload_worker(BadKbApp* app) {
bad_kb_script_close(app->bad_kb_script);
app->bad_kb_script = bad_kb_script_open(app->file_path, app->is_bt ? app->bt : NULL);
app->bad_kb_script = bad_kb_script_open(app->file_path, app->is_bt ? app->bt : NULL, app);
bad_kb_script_set_keyboard_layout(app->bad_kb_script, app->keyboard_layout);
}
void bad_kb_config_switch_mode(BadKbApp* app) {
scene_manager_previous_scene(app->scene_manager);
if(app->is_bt) {
furi_hal_bt_start_advertising();
} else {
furi_hal_bt_stop_advertising();
}
scene_manager_next_scene(app->scene_manager, BadKbSceneConfig);
int32_t bad_kb_config_switch_mode(BadKbApp* app) {
if(!app->is_bt) furi_hal_bt_stop_advertising();
XTREME_SETTINGS()->bad_bt = app->is_bt;
XTREME_SETTINGS_SAVE();
bad_kb_reload_worker(app);
if(app->is_bt) furi_hal_bt_start_advertising();
scene_manager_next_scene(app->scene_manager, BadKbSceneConfig);
scene_manager_previous_scene(app->scene_manager);
return 0;
}
void bad_kb_config_switch_remember_mode(BadKbApp* app) {
@@ -269,7 +269,7 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
"BadKbConnInit", 1024, (FuriThreadCallback)bad_kb_connection_init, app);
furi_thread_start(app->conn_init_thread);
if(!furi_string_empty(app->file_path)) {
app->bad_kb_script = bad_kb_script_open(app->file_path, app->is_bt ? app->bt : NULL);
app->bad_kb_script = bad_kb_script_open(app->file_path, app->is_bt ? app->bt : NULL, app);
bad_kb_script_set_keyboard_layout(app->bad_kb_script, app->keyboard_layout);
scene_manager_next_scene(app->scene_manager, BadKbSceneWork);
} else {
applications/main/bad_kb/bad_kb_app.h
-48
View File
@@ -6,67 +6,21 @@
#include <gui/gui.h>
#include <assets_icons.h>
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include <dialogs/dialogs.h>
#include <notification/notification_messages.h>
#include <gui/modules/variable_item_list.h>
#include <gui/modules/widget.h>
#include <gui/modules/text_input.h>
#include <gui/modules/byte_input.h>
#include "views/bad_kb_view.h"
#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badkb")
#define BAD_KB_APP_PATH_LAYOUT_FOLDER BAD_KB_APP_BASE_FOLDER "/assets/layouts"
#define BAD_KB_APP_SCRIPT_EXTENSION ".txt"
#define BAD_KB_APP_LAYOUT_EXTENSION ".kl"
#define BAD_KB_ADV_NAME_MAX_LEN FURI_HAL_BT_ADV_NAME_LENGTH
#define BAD_KB_MAC_ADDRESS_LEN GAP_MAC_ADDR_SIZE
typedef enum {
BadKbAppErrorNoFiles,
BadKbAppErrorCloseRpc,
} BadKbAppError;
typedef enum BadKbCustomEvent {
BadKbAppCustomEventTextEditResult,
BadKbAppCustomEventByteInputDone,
BadKbCustomEventErrorBack
} BadKbCustomEvent;
typedef struct {
char bt_name[BAD_KB_ADV_NAME_MAX_LEN + 1];
uint8_t bt_mac[BAD_KB_MAC_ADDRESS_LEN];
FuriHalUsbInterface* usb_mode;
GapPairing bt_mode;
} BadKbConfig;
typedef struct {
Gui* gui;
ViewDispatcher* view_dispatcher;
SceneManager* scene_manager;
NotificationApp* notifications;
DialogsApp* dialogs;
Widget* widget;
VariableItemList* var_item_list;
TextInput* text_input;
ByteInput* byte_input;
BadKbAppError error;
FuriString* file_path;
FuriString* keyboard_layout;
BadKb* bad_kb_view;
BadKbScript* bad_kb_script;
Bt* bt;
bool is_bt;
bool bt_remember;
BadKbConfig config;
BadKbConfig prev_config;
FuriThread* conn_init_thread;
} BadKbApp;
typedef enum {
BadKbAppViewError,
BadKbAppViewWork,
@@ -75,8 +29,6 @@ typedef enum {
BadKbAppViewConfigName
} BadKbAppView;
void bad_kb_config_switch_mode(BadKbApp* app);
void bad_kb_config_switch_remember_mode(BadKbApp* app);
int32_t bad_kb_connection_init(BadKbApp* app);
applications/main/bad_kb/helpers/ducky_script.c
+48 -8
View File
@@ -10,6 +10,7 @@
#include "ducky_script.h"
#include "ducky_script_i.h"
#include <dolphin/dolphin.h>
#include <toolbox/hex.h>
#define TAG "BadKB"
#define WORKER_TAG TAG "Worker"
@@ -67,6 +68,7 @@ typedef enum {
} WorkerEvtFlags;
static const char ducky_cmd_id[] = {"ID"};
static const char ducky_cmd_bt_id[] = {"BT_ID"};
static const uint8_t numpad_keys[10] = {
HID_KEYPAD_0,
@@ -327,6 +329,28 @@ static bool ducky_set_usb_id(BadKbScript* bad_kb, const char* line) {
return false;
}
static bool ducky_set_bt_id(BadKbScript* bad_kb, const char* line) {
size_t line_len = strlen(line);
size_t mac_len = BAD_KB_MAC_ADDRESS_LEN * 3;
if(line_len < mac_len + 1) return false; // MAC + at least 1 char for name
uint8_t mac[BAD_KB_MAC_ADDRESS_LEN];
for(size_t i = 0; i < BAD_KB_MAC_ADDRESS_LEN; i++) {
char a = line[i * 3];
char b = line[i * 3 + 1];
if((a < 'A' && a > 'F') || (a < '0' && a > '9') || (b < 'A' && b > 'F') || (b < '0' && b > '9') || !hex_char_to_uint8(a, b, &mac[i])) {
return false;
}
}
strncpy(bad_kb->app->config.bt_name, line + mac_len, BAD_KB_ADV_NAME_MAX_LEN);
memcpy(bad_kb->app->config.bt_mac, mac, BAD_KB_MAC_ADDRESS_LEN);
furi_hal_bt_set_profile_adv_name(FuriHalBtProfileHidKeyboard, bad_kb->app->config.bt_name);
bt_set_profile_mac_address(bad_kb->bt, bad_kb->app->config.bt_mac);
return true;
}
static bool ducky_script_preload(BadKbScript* bad_kb, File* script_file) {
uint8_t ret = 0;
uint32_t line_len = 0;
@@ -354,20 +378,35 @@ static bool ducky_script_preload(BadKbScript* bad_kb, File* script_file) {
}
} while(ret > 0);
if(!bad_kb->bt) {
const char* line_tmp = furi_string_get_cstr(bad_kb->line);
bool id_set = false; // Looking for ID command at first line
if(strncmp(line_tmp, ducky_cmd_id, strlen(ducky_cmd_id)) == 0) {
id_set = ducky_set_usb_id(bad_kb, &line_tmp[strlen(ducky_cmd_id) + 1]);
const char* line_tmp = furi_string_get_cstr(bad_kb->line);
// Looking for ID or BT_ID command at first line
if(strncmp(line_tmp, ducky_cmd_id, strlen(ducky_cmd_id)) == 0) {
if(bad_kb->bt) {
bad_kb->app->is_bt = false;
FuriThread* thread = furi_thread_alloc_ex(
"BadKbSwitchMode", 1024, (FuriThreadCallback)bad_kb_config_switch_mode, bad_kb->app);
furi_thread_start(thread);
return false;
}
if(id_set) {
if(ducky_set_usb_id(bad_kb, &line_tmp[strlen(ducky_cmd_id) + 1])) {
furi_check(furi_hal_usb_set_config(&usb_hid, &bad_kb->hid_cfg));
} else {
furi_check(furi_hal_usb_set_config(&usb_hid, NULL));
}
} else if(strncmp(line_tmp, ducky_cmd_bt_id, strlen(ducky_cmd_bt_id)) == 0) {
if(!bad_kb->bt) {
bad_kb->app->is_bt = true;
FuriThread* thread = furi_thread_alloc_ex(
"BadKbSwitchMode", 1024, (FuriThreadCallback)bad_kb_config_switch_mode, bad_kb->app);
furi_thread_start(thread);
return false;
}
if(!bad_kb->app->bt_remember) {
ducky_set_bt_id(bad_kb, &line_tmp[strlen(ducky_cmd_bt_id) + 1]);
}
}
storage_file_seek(script_file, 0, true);
furi_string_reset(bad_kb->line);
@@ -766,10 +805,11 @@ static void bad_kb_script_set_default_keyboard_layout(BadKbScript* bad_kb) {
memcpy(bad_kb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), sizeof(bad_kb->layout)));
}
BadKbScript* bad_kb_script_open(FuriString* file_path, Bt* bt) {
BadKbScript* bad_kb_script_open(FuriString* file_path, Bt* bt, BadKbApp* app) {
furi_assert(file_path);
BadKbScript* bad_kb = malloc(sizeof(BadKbScript));
bad_kb->app = app;
bad_kb->file_path = furi_string_alloc();
furi_string_set(bad_kb->file_path, file_path);
bad_kb->keyboard_layout = furi_string_alloc();
applications/main/bad_kb/helpers/ducky_script.h
+55 -3
View File
@@ -8,6 +8,13 @@ extern "C" {
#include <furi_hal.h>
#include <bt/bt_service/bt_i.h>
#include <gui/view_dispatcher.h>
#include <gui/modules/widget.h>
#include <gui/modules/variable_item_list.h>
#include <gui/modules/text_input.h>
#include <gui/modules/byte_input.h>
#include "../views/bad_kb_view.h"
#define FILE_BUFFER_LEN 16
typedef enum {
@@ -38,7 +45,7 @@ typedef enum {
BadKbStateFileError,
} BadKbWorkerState;
typedef struct {
struct BadKbState {
BadKbWorkerState state;
bool is_bt;
uint32_t pin;
@@ -47,7 +54,9 @@ typedef struct {
uint32_t delay_remain;
uint16_t error_line;
char error[64];
} BadKbState;
};
typedef struct BadKbApp BadKbApp;
typedef struct {
FuriHalUsbHidConfig hid_cfg;
@@ -74,9 +83,10 @@ typedef struct {
size_t string_print_pos;
Bt* bt;
BadKbApp* app;
} BadKbScript;
BadKbScript* bad_kb_script_open(FuriString* file_path, Bt* bt);
BadKbScript* bad_kb_script_open(FuriString* file_path, Bt* bt, BadKbApp* app);
void bad_kb_script_close(BadKbScript* bad_kb);
@@ -90,6 +100,48 @@ void bad_kb_script_toggle(BadKbScript* bad_kb);
BadKbState* bad_kb_script_get_state(BadKbScript* bad_kb);
#define BAD_KB_ADV_NAME_MAX_LEN FURI_HAL_BT_ADV_NAME_LENGTH
#define BAD_KB_MAC_ADDRESS_LEN GAP_MAC_ADDR_SIZE
typedef enum {
BadKbAppErrorNoFiles,
BadKbAppErrorCloseRpc,
} BadKbAppError;
typedef struct {
char bt_name[BAD_KB_ADV_NAME_MAX_LEN + 1];
uint8_t bt_mac[BAD_KB_MAC_ADDRESS_LEN];
FuriHalUsbInterface* usb_mode;
GapPairing bt_mode;
} BadKbConfig;
struct BadKbApp {
Gui* gui;
ViewDispatcher* view_dispatcher;
SceneManager* scene_manager;
NotificationApp* notifications;
DialogsApp* dialogs;
Widget* widget;
VariableItemList* var_item_list;
TextInput* text_input;
ByteInput* byte_input;
BadKbAppError error;
FuriString* file_path;
FuriString* keyboard_layout;
BadKb* bad_kb_view;
BadKbScript* bad_kb_script;
Bt* bt;
bool is_bt;
bool bt_remember;
BadKbConfig config;
BadKbConfig prev_config;
FuriThread* conn_init_thread;
};
int32_t bad_kb_config_switch_mode(BadKbApp* app);
#ifdef __cplusplus
}
#endif
applications/main/bad_kb/scenes/bad_kb_scene_config.c
+1 -2
View File
@@ -1,4 +1,5 @@
#include "../bad_kb_app.h"
#include "../helpers/ducky_script.h"
#include "furi_hal_power.h"
#include "furi_hal_usb.h"
#include <xtreme.h>
@@ -15,8 +16,6 @@ enum VarItemListIndex {
void bad_kb_scene_config_connection_callback(VariableItem* item) {
BadKbApp* bad_kb = variable_item_get_context(item);
bad_kb->is_bt = variable_item_get_current_value_index(item);
XTREME_SETTINGS()->bad_bt = bad_kb->is_bt;
XTREME_SETTINGS_SAVE();
variable_item_set_current_value_text(item, bad_kb->is_bt ? "BT" : "USB");
view_dispatcher_send_custom_event(bad_kb->view_dispatcher, VarItemListIndexConnection);
}
applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
+1 -1
View File
@@ -29,7 +29,7 @@ void bad_kb_scene_file_select_on_enter(void* context) {
if(bad_kb_file_select(bad_kb)) {
bad_kb->bad_kb_script =
bad_kb_script_open(bad_kb->file_path, bad_kb->is_bt ? bad_kb->bt : NULL);
bad_kb_script_open(bad_kb->file_path, bad_kb->is_bt ? bad_kb->bt : NULL, bad_kb);
bad_kb_script_set_keyboard_layout(bad_kb->bad_kb_script, bad_kb->keyboard_layout);
scene_manager_next_scene(bad_kb->scene_manager, BadKbSceneWork);
applications/main/bad_kb/views/bad_kb_view.c
-6
View File
@@ -8,12 +8,6 @@
#define MAX_NAME_LEN 64
struct BadKb {
View* view;
BadKbButtonCallback callback;
void* context;
};
typedef struct {
char file_name[MAX_NAME_LEN];
char layout[MAX_NAME_LEN];
applications/main/bad_kb/views/bad_kb_view.h
+8 -2
View File
@@ -1,11 +1,17 @@
#pragma once
#include <gui/view.h>
#include "../helpers/ducky_script.h"
typedef struct BadKb BadKb;
typedef void (*BadKbButtonCallback)(InputKey key, void* context);
typedef struct {
View* view;
BadKbButtonCallback callback;
void* context;
} BadKb;
typedef struct BadKbState BadKbState;
BadKb* bad_kb_alloc();
void bad_kb_free(BadKb* bad_kb);