Remove unused desktop debug screen

applications/services/desktop/desktop.c

@@ -292,7 +292,6 @@ Desktop* desktop_alloc() {
         desktop->view_dispatcher, desktop_back_event_callback);
 
     desktop->lock_menu = desktop_lock_menu_alloc();
-    desktop->debug_view = desktop_debug_alloc();
     desktop->hw_mismatch_popup = popup_alloc();
     desktop->locked_view = desktop_view_locked_alloc();
     desktop->pin_input_view = desktop_view_pin_input_alloc();
@@ -326,8 +325,6 @@ Desktop* desktop_alloc() {
         desktop->view_dispatcher,
         DesktopViewIdLockMenu,
         desktop_lock_menu_get_view(desktop->lock_menu));
-    view_dispatcher_add_view(
-        desktop->view_dispatcher, DesktopViewIdDebug, desktop_debug_get_view(desktop->debug_view));
     view_dispatcher_add_view(
         desktop->view_dispatcher,
         DesktopViewIdHwMismatch,

applications/services/desktop/desktop_i.h

@@ -27,7 +27,6 @@ typedef enum {
     DesktopViewIdMain,
     DesktopViewIdLockMenu,
     DesktopViewIdLocked,
-    DesktopViewIdDebug,
     DesktopViewIdHwMismatch,
     DesktopViewIdPinInput,
     DesktopViewIdPinTimeout,
@@ -45,7 +44,7 @@ struct Desktop {
 
     Popup* hw_mismatch_popup;
     DesktopLockMenuView* lock_menu;
-    DesktopDebugView* debug_view;
+    DesktopDebugView* _debug_view; // Unused, kept for compatibility
     DesktopViewLocked* locked_view;
     DesktopMainView* main_view;
     DesktopViewPinTimeout* pin_timeout_view;

applications/services/desktop/scenes/desktop_scene_config.h

@@ -1,6 +1,5 @@
 ADD_SCENE(desktop, main, Main)
 ADD_SCENE(desktop, lock_menu, LockMenu)
-ADD_SCENE(desktop, debug, Debug)
 ADD_SCENE(desktop, hw_mismatch, HwMismatch)
 ADD_SCENE(desktop, fault, Fault)
 ADD_SCENE(desktop, locked, Locked)

applications/services/desktop/scenes/desktop_scene_debug.c

@@ -1,44 +0,0 @@
-
-#include <dolphin/dolphin.h>
-#include <dolphin/helpers/dolphin_deed.h>
-
-#include "../desktop_i.h"
-#include "../views/desktop_view_debug.h"
-#include "desktop_scene.h"
-
-void desktop_scene_debug_callback(DesktopEvent event, void* context) {
-    Desktop* desktop = (Desktop*)context;
-    view_dispatcher_send_custom_event(desktop->view_dispatcher, event);
-}
-
-void desktop_scene_debug_on_enter(void* context) {
-    Desktop* desktop = (Desktop*)context;
-
-    desktop_debug_set_callback(desktop->debug_view, desktop_scene_debug_callback, desktop);
-    view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewIdDebug);
-}
-
-bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) {
-    Desktop* desktop = (Desktop*)context;
-    Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        switch(event.event) {
-        case DesktopDebugEventExit:
-            scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain);
-            dolphin_flush(dolphin);
-            consumed = true;
-            break;
-        default:
-            break;
-        }
-    }
-
-    furi_record_close(RECORD_DOLPHIN);
-    return consumed;
-}
-
-void desktop_scene_debug_on_exit(void* context) {
-    UNUSED(context);
-}

applications/services/desktop/scenes/desktop_scene_main.c

@@ -112,11 +112,6 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
             break;
 
-        case DesktopMainEventOpenDebug:
-            scene_manager_next_scene(desktop->scene_manager, DesktopSceneDebug);
-            consumed = true;
-            break;
-
         case DesktopMainEventOpenArchive:
 #ifdef APP_ARCHIVE
             desktop_switch_to_app(desktop, &FLIPPER_ARCHIVE);

applications/services/desktop/views/desktop_events.h

@@ -10,7 +10,7 @@ typedef enum {
     _DesktopMainEventOpenFavoriteRightShort,
     _DesktopMainEventOpenFavoriteRightLong,
     DesktopMainEventOpenMenu,
-    DesktopMainEventOpenDebug,
+    _DesktopMainEventOpenDebug,
     DesktopMainEventOpenPowerOff,
 
     _DesktopDummyEventOpenLeft,
@@ -29,10 +29,10 @@ typedef enum {
 
     DesktopPinTimeoutExit,
 
-    DesktopDebugEventDeed,
+    _DesktopDebugEventDeed,
-    DesktopDebugEventWrongDeed,
+    _DesktopDebugEventWrongDeed,
-    DesktopDebugEventSaveState,
+    _DesktopDebugEventSaveState,
-    DesktopDebugEventExit,
+    _DesktopDebugEventExit,
 
     DesktopLockMenuEventLockPinCode,
     _DesktopLockMenuEventDummyModeOn,

applications/services/desktop/views/desktop_view_debug.c

@@ -1,139 +0,0 @@
-#include <toolbox/version.h>
-#include <furi.h>
-#include <furi_hal.h>
-#include <dolphin/helpers/dolphin_state.h>
-#include <dolphin/dolphin.h>
-
-#include "../desktop_i.h"
-#include "desktop_view_debug.h"
-
-void desktop_debug_set_callback(
-    DesktopDebugView* debug_view,
-    DesktopDebugViewCallback callback,
-    void* context) {
-    furi_assert(debug_view);
-    furi_assert(callback);
-    debug_view->callback = callback;
-    debug_view->context = context;
-}
-
-void desktop_debug_render(Canvas* canvas, void* model) {
-    UNUSED(model);
-    canvas_clear(canvas);
-    const Version* ver;
-    char buffer[64];
-
-    canvas_set_color(canvas, ColorBlack);
-    canvas_set_font(canvas, FontPrimary);
-
-    uint32_t uptime = furi_get_tick() / furi_kernel_get_tick_frequency();
-    snprintf(
-        buffer,
-        sizeof(buffer),
-        "Uptime: %luh%lum%lus",
-        uptime / 60 / 60,
-        uptime / 60 % 60,
-        uptime % 60);
-    canvas_draw_str_aligned(canvas, 64, 1 + STATUS_BAR_Y_SHIFT, AlignCenter, AlignTop, buffer);
-
-    canvas_set_font(canvas, FontSecondary);
-
-    // Hardware version
-    const char* my_name = furi_hal_version_get_name_ptr();
-    snprintf(
-        buffer,
-        sizeof(buffer),
-        "%d.F%dB%dC%d %s %s",
-        furi_hal_version_get_hw_version(),
-        furi_hal_version_get_hw_target(),
-        furi_hal_version_get_hw_body(),
-        furi_hal_version_get_hw_connect(),
-        furi_hal_version_get_hw_region_name_otp(),
-        my_name ? my_name : "Unknown");
-    canvas_draw_str(canvas, 0, 19 + STATUS_BAR_Y_SHIFT, buffer);
-
-    ver = furi_hal_version_get_firmware_version();
-    const BleGlueC2Info* c2_ver = NULL;
-#ifdef SRV_BT
-    c2_ver = ble_glue_get_c2_info();
-#endif
-    if(!ver) { //-V1051
-        canvas_draw_str(canvas, 0, 30 + STATUS_BAR_Y_SHIFT, "No info");
-        return;
-    }
-
-    snprintf(
-        buffer, sizeof(buffer), "%s [%s]", version_get_version(ver), version_get_builddate(ver));
-    canvas_draw_str(canvas, 0, 30 + STATUS_BAR_Y_SHIFT, buffer);
-
-    uint16_t api_major, api_minor;
-    furi_hal_info_get_api_version(&api_major, &api_minor);
-    snprintf(
-        buffer,
-        sizeof(buffer),
-        "%s%s [%d.%d] %s",
-        version_get_dirty_flag(ver) ? "[!] " : "",
-        version_get_githash(ver),
-        api_major,
-        api_minor,
-        c2_ver ? c2_ver->StackTypeString : "<none>");
-    canvas_draw_str(canvas, 0, 40 + STATUS_BAR_Y_SHIFT, buffer);
-
-    snprintf(
-        buffer, sizeof(buffer), "[%d] %s", version_get_target(ver), version_get_gitbranch(ver));
-    canvas_draw_str(canvas, 0, 50 + STATUS_BAR_Y_SHIFT, buffer);
-}
-
-View* desktop_debug_get_view(DesktopDebugView* debug_view) {
-    furi_assert(debug_view);
-    return debug_view->view;
-}
-
-static bool desktop_debug_input(InputEvent* event, void* context) {
-    furi_assert(event);
-    furi_assert(context);
-
-    DesktopDebugView* debug_view = context;
-
-    if(event->key == InputKeyBack && event->type == InputTypeShort) {
-        debug_view->callback(DesktopDebugEventExit, debug_view->context);
-    }
-
-    return true;
-}
-
-static void desktop_debug_enter(void* context) {
-    DesktopDebugView* debug_view = context;
-    furi_timer_start(debug_view->timer, furi_ms_to_ticks(1000));
-}
-
-static void desktop_debug_exit(void* context) {
-    DesktopDebugView* debug_view = context;
-    furi_timer_stop(debug_view->timer);
-}
-void desktop_debug_timer(void* context) {
-    DesktopDebugView* debug_view = context;
-    view_get_model(debug_view->view);
-    view_commit_model(debug_view->view, true);
-}
-
-DesktopDebugView* desktop_debug_alloc() {
-    DesktopDebugView* debug_view = malloc(sizeof(DesktopDebugView));
-    debug_view->view = view_alloc();
-    debug_view->timer = furi_timer_alloc(desktop_debug_timer, FuriTimerTypePeriodic, debug_view);
-    view_set_context(debug_view->view, debug_view);
-    view_set_draw_callback(debug_view->view, (ViewDrawCallback)desktop_debug_render);
-    view_set_input_callback(debug_view->view, desktop_debug_input);
-    view_set_enter_callback(debug_view->view, desktop_debug_enter);
-    view_set_exit_callback(debug_view->view, desktop_debug_exit);
-
-    return debug_view;
-}
-
-void desktop_debug_free(DesktopDebugView* debug_view) {
-    furi_assert(debug_view);
-
-    furi_timer_free(debug_view->timer);
-    view_free(debug_view->view);
-    free(debug_view);
-}

applications/services/desktop/views/desktop_view_debug.h

@@ -14,14 +14,3 @@ struct DesktopDebugView {
     DesktopDebugViewCallback callback;
     void* context;
 };
-
-void desktop_debug_set_callback(
-    DesktopDebugView* debug_view,
-    DesktopDebugViewCallback callback,
-    void* context);
-
-View* desktop_debug_get_view(DesktopDebugView* debug_view);
-
-DesktopDebugView* desktop_debug_alloc();
-
-void desktop_debug_free(DesktopDebugView* debug_view);