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

BadKB properly discard switch mode thread

Browse Source
This commit is contained in:
Willy-JL
2023-05-01 21:12:48 +01:00
parent 044cbd1d7d
commit 677d30dd73
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/bad_kb/helpers/ducky_script.c
+9 -4
View File
@@ -377,17 +377,22 @@ static bool ducky_script_preload(BadKbScript* bad_kb, File* script_file) {
} while(ret > 0);
const char* line_tmp = furi_string_get_cstr(bad_kb->line);
if(bad_kb->app->switch_mode_thread) {
furi_thread_join(bad_kb->app->switch_mode_thread);
furi_thread_free(bad_kb->app->switch_mode_thread);
bad_kb->app->switch_mode_thread = NULL;
}
// Looking for ID or BT_ID command at first line
bool reset_bt_id = !!bad_kb->bt;
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(
bad_kb->app->switch_mode_thread = furi_thread_alloc_ex(
"BadKbSwitchMode",
1024,
(FuriThreadCallback)bad_kb_config_switch_mode,
bad_kb->app);
furi_thread_start(thread);
furi_thread_start(bad_kb->app->switch_mode_thread);
return false;
}
if(ducky_set_usb_id(bad_kb, &line_tmp[strlen(ducky_cmd_id) + 1])) {
@@ -398,12 +403,12 @@ static bool ducky_script_preload(BadKbScript* bad_kb, File* script_file) {
} 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(
bad_kb->app->switch_mode_thread = furi_thread_alloc_ex(
"BadKbSwitchMode",
1024,
(FuriThreadCallback)bad_kb_config_switch_mode,
bad_kb->app);
furi_thread_start(thread);
furi_thread_start(bad_kb->app->switch_mode_thread);
return false;
}
if(!bad_kb->app->bt_remember) {
applications/main/bad_kb/helpers/ducky_script.h
+1
View File
@@ -138,6 +138,7 @@ struct BadKbApp {
BadKbConfig config;
BadKbConfig prev_config;
FuriThread* conn_init_thread;
FuriThread* switch_mode_thread;
};
int32_t bad_kb_config_switch_mode(BadKbApp* app);