Преглед изворни кода

Merge dap_link from https://github.com/flipperdevices/flipperzero-good-faps

# Conflicts:
#	dap_link/gui/dap_gui.c
Willy-JL пре 1 година
родитељ
комит
93a0825cf8
2 измењених фајлова са 1 додато и 2 уклоњено
  1. 1 1
      dap_link/application.fam
  2. 0 1
      dap_link/gui/dap_gui.c

+ 1 - 1
dap_link/application.fam

@@ -9,7 +9,7 @@ App(
     ],
     ],
     stack_size=4 * 1024,
     stack_size=4 * 1024,
     fap_description="Enables use of Flipper as a debug probe for ARM devices, implements the CMSIS-DAP protocol",
     fap_description="Enables use of Flipper as a debug probe for ARM devices, implements the CMSIS-DAP protocol",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_icon="dap_link.png",
     fap_icon="dap_link.png",
     fap_category="GPIO/Debug",
     fap_category="GPIO/Debug",
     fap_private_libs=[
     fap_private_libs=[

+ 0 - 1
dap_link/gui/dap_gui.c

@@ -26,7 +26,6 @@ DapGuiApp* dap_gui_alloc() {
     app->gui = furi_record_open(RECORD_GUI);
     app->gui = furi_record_open(RECORD_GUI);
     app->view_dispatcher = view_dispatcher_alloc();
     app->view_dispatcher = view_dispatcher_alloc();
     app->scene_manager = scene_manager_alloc(&dap_scene_handlers, app);
     app->scene_manager = scene_manager_alloc(&dap_scene_handlers, app);
-
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
 
 
     view_dispatcher_set_custom_event_callback(app->view_dispatcher, dap_gui_custom_event_callback);
     view_dispatcher_set_custom_event_callback(app->view_dispatcher, dap_gui_custom_event_callback);