mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into release-candidate

Browse Source
This commit is contained in:
Aleksandr Kutuzov 2023-02-27 23:59:52 +09:00
commit 119c7fe5f1
11 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/main/bad_usb/bad_usb_app.c
View File

@ -142,10 +142,6 @@ void bad_usb_app_free(BadUsbApp* app) {
app->bad_usb_script = NULL;
}
if(app->usb_if_prev) {
furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
}
// Views
view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
bad_usb_free(app->bad_usb_view);
@ -172,6 +168,10 @@ void bad_usb_app_free(BadUsbApp* app) {
furi_string_free(app->file_path);
furi_string_free(app->keyboard_layout);
if(app->usb_if_prev) {
furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
}
free(app);
}

2
applications/main/bad_usb/scenes/bad_usb_scene_work.c
View File

@ -16,7 +16,9 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == InputKeyLeft) {
if(bad_usb_is_idle_state(app->bad_usb_view)) {
scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
}
consumed = true;
} else if(event.event == InputKeyOk) {
bad_usb_script_toggle(app->bad_usb_script);

23
applications/main/bad_usb/views/bad_usb_view.c
View File

@ -48,17 +48,13 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) ||
(model->state.state == BadUsbStateNotConnected)) {
elements_button_center(canvas, "Run");
elements_button_left(canvas, "Config");
} else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) {
elements_button_center(canvas, "Stop");
} else if(model->state.state == BadUsbStateWillRun) {
elements_button_center(canvas, "Cancel");
}
if((model->state.state == BadUsbStateNotConnected) ||
(model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
elements_button_left(canvas, "Config");
}
if(model->state.state == BadUsbStateNotConnected) {
canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
canvas_set_font(canvas, FontPrimary);
@ -203,6 +199,7 @@ void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
{ strlcpy(model->layout, layout, MAX_NAME_LEN); },
true);
}
void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
furi_assert(st);
with_view_model(
@ -214,3 +211,19 @@ void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
},
true);
}
bool bad_usb_is_idle_state(BadUsb* bad_usb) {
bool is_idle = false;
with_view_model(
bad_usb->view,
BadUsbModel * model,
{
if((model->state.state == BadUsbStateIdle) ||
(model->state.state == BadUsbStateDone) ||
(model->state.state == BadUsbStateNotConnected)) {
is_idle = true;
}
},
false);
return is_idle;
}

2
applications/main/bad_usb/views/bad_usb_view.h
View File

@ -19,3 +19,5 @@ void bad_usb_set_file_name(BadUsb* bad_usb, const char* name);
void bad_usb_set_layout(BadUsb* bad_usb, const char* layout);
void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st);
bool bad_usb_is_idle_state(BadUsb* bad_usb);

2
applications/plugins/dap_link/application.fam
View File

@ -10,7 +10,7 @@ App(
stack_size=4 * 1024,
order=20,
fap_icon="dap_link.png",
fap_category="Tools",
fap_category="GPIO",
fap_private_libs=[
Lib(
name="free-dap",

8
applications/plugins/hid_app/application.fam
View File

@ -1,10 +1,10 @@
App(
appid="hid_usb",
name="USB Remote",
name="Remote",
apptype=FlipperAppType.PLUGIN,
entry_point="hid_usb_app",
stack_size=1 * 1024,
fap_category="Tools",
fap_category="USB",
fap_icon="hid_usb_10px.png",
fap_icon_assets="assets",
fap_icon_assets_symbol="hid",
@ -13,11 +13,11 @@ App(
App(
appid="hid_ble",
name="Bluetooth Remote",
name="Remote",
apptype=FlipperAppType.PLUGIN,
entry_point="hid_ble_app",
stack_size=1 * 1024,
fap_category="Tools",
fap_category="Bluetooth",
fap_icon="hid_ble_10px.png",
fap_icon_assets="assets",
fap_icon_assets_symbol="hid",

2
applications/plugins/music_player/application.fam
View File

@ -12,7 +12,7 @@ App(
stack_size=2 * 1024,
order=20,
fap_icon="icons/music_10px.png",
fap_category="Misc",
fap_category="Media",
fap_icon_assets="icons",
)

2
applications/plugins/nfc_magic/application.fam
View File

@ -11,7 +11,7 @@ App(
stack_size=4 * 1024,
order=30,
fap_icon="../../../assets/icons/Archive/125_10px.png",
fap_category="Tools",
fap_category="NFC",
fap_private_libs=[
Lib(
name="magic",

2
applications/plugins/signal_generator/application.fam
View File

@ -8,6 +8,6 @@ App(
stack_size=1 * 1024,
order=50,
fap_icon="signal_gen_10px.png",
fap_category="Tools",
fap_category="GPIO",
fap_icon_assets="icons",
)

2
applications/plugins/spi_mem_manager/application.fam
View File

@ -7,7 +7,7 @@ App(
stack_size=1 * 2048,
order=30,
fap_icon="images/Dip8_10px.png",
fap_category="Tools",
fap_category="GPIO",
fap_icon_assets="images",
fap_private_libs=[
Lib(

2
applications/plugins/weather_station/application.fam
View File

@ -9,6 +9,6 @@ App(
stack_size=4 * 1024,
order=50,
fap_icon="weather_station_10px.png",
fap_category="Tools",
fap_category="Sub-GHz",
fap_icon_assets="images",
)