Просмотр исходного кода

[FL-2957] Unified Info API, App Error, Data Xchange (#1998)

* Update protobuf definitions
* Add Property subsystem entry point function
* Key-based system info and power info function stubs
* Remove unneeded functions
* Working power info
* Working system info
* Replace #defines with string literals
* Remove unneeded field
* Simplify system info formatting
* Refactor output callback handling
* Handle the last info element correctly
* Optimise power info, rename methods
* Add comments
* Add power debug
* Remove unneeded definitions
* Rename some files and functions
* Update protobuf definitions
* Implement App GetError and DataExchange APIs
* Send GetErrorReply with correct command_id
* Add RPC debug app stub
* Add more scenes
* Add warning, increase stack size
* Add receive data exchange scene
* Improve data exchange
* Add notifications
* Update application requirements
* Bump format version for property-based infos
* Correctly reset error text
* RCP: sync protobuf repo to latest release tag

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Georgii Surkov 3 лет назад
Родитель
Сommit
0261dc3075
30 измененных файлов с 1446 добавлено и 216 удалено
  1. 10 0
      applications/debug/rpc_debug_app/application.fam
  2. 138 0
      applications/debug/rpc_debug_app/rpc_debug_app.c
  3. 54 0
      applications/debug/rpc_debug_app/rpc_debug_app.h
  4. 30 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene.c
  5. 29 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene.h
  6. 8 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_config.h
  7. 40 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_data_exchange.c
  8. 60 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_code.c
  9. 40 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_text.c
  10. 70 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c
  11. 57 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_start.c
  12. 30 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_start_dummy.c
  13. 57 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_test_app_error.c
  14. 58 0
      applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_test_data_exchange.c
  15. 1 1
      applications/services/cli/cli_commands.c
  16. 3 3
      applications/services/power/power_cli.c
  17. 6 1
      applications/services/rpc/rpc.c
  18. 120 0
      applications/services/rpc/rpc_app.c
  19. 13 0
      applications/services/rpc/rpc_app.h
  20. 1 0
      applications/services/rpc/rpc_i.h
  21. 107 0
      applications/services/rpc/rpc_property.c
  22. 2 2
      applications/services/rpc/rpc_system.c
  23. 1 1
      assets/protobuf
  24. 9 4
      firmware/targets/f7/api_symbols.csv
  25. 218 81
      firmware/targets/f7/furi_hal/furi_hal_info.c
  26. 199 99
      firmware/targets/f7/furi_hal/furi_hal_power.c
  27. 4 11
      firmware/targets/furi_hal_include/furi_hal_info.h
  28. 9 13
      firmware/targets/furi_hal_include/furi_hal_power.h
  29. 33 0
      lib/toolbox/property.c
  30. 39 0
      lib/toolbox/property.h

+ 10 - 0
applications/debug/rpc_debug_app/application.fam

@@ -0,0 +1,10 @@
+App(
+    appid="rpc_debug",
+    name="RPC Debug",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="rpc_debug_app",
+    requires=["gui", "rpc_start", "notification"],
+    stack_size=2 * 1024,
+    order=10,
+    fap_category="Debug",
+)

+ 138 - 0
applications/debug/rpc_debug_app/rpc_debug_app.c

@@ -0,0 +1,138 @@
+#include "rpc_debug_app.h"
+#include <core/log.h>
+
+#include <string.h>
+
+static bool rpc_debug_app_custom_event_callback(void* context, uint32_t event) {
+    furi_assert(context);
+    RpcDebugApp* app = context;
+    return scene_manager_handle_custom_event(app->scene_manager, event);
+}
+
+static bool rpc_debug_app_back_event_callback(void* context) {
+    furi_assert(context);
+    RpcDebugApp* app = context;
+    return scene_manager_handle_back_event(app->scene_manager);
+}
+
+static void rpc_debug_app_tick_event_callback(void* context) {
+    furi_assert(context);
+    RpcDebugApp* app = context;
+    scene_manager_handle_tick_event(app->scene_manager);
+}
+
+static void rpc_debug_app_rpc_command_callback(RpcAppSystemEvent event, void* context) {
+    furi_assert(context);
+    RpcDebugApp* app = context;
+    furi_assert(app->rpc);
+
+    if(event == RpcAppEventSessionClose) {
+        scene_manager_stop(app->scene_manager);
+        view_dispatcher_stop(app->view_dispatcher);
+        rpc_system_app_set_callback(app->rpc, NULL, NULL);
+        app->rpc = NULL;
+    } else if(event == RpcAppEventAppExit) {
+        scene_manager_stop(app->scene_manager);
+        view_dispatcher_stop(app->view_dispatcher);
+        rpc_system_app_confirm(app->rpc, RpcAppEventAppExit, true);
+    } else {
+        rpc_system_app_confirm(app->rpc, event, false);
+    }
+}
+
+static bool rpc_debug_app_rpc_init_rpc(RpcDebugApp* app, const char* args) {
+    bool ret = false;
+    if(args && strlen(args)) {
+        uint32_t rpc = 0;
+        if(sscanf(args, "RPC %lX", &rpc) == 1) {
+            app->rpc = (RpcAppSystem*)rpc;
+            rpc_system_app_set_callback(app->rpc, rpc_debug_app_rpc_command_callback, app);
+            rpc_system_app_send_started(app->rpc);
+            ret = true;
+        }
+    }
+    return ret;
+}
+
+static RpcDebugApp* rpc_debug_app_alloc() {
+    RpcDebugApp* app = malloc(sizeof(RpcDebugApp));
+
+    app->gui = furi_record_open(RECORD_GUI);
+    app->notifications = furi_record_open(RECORD_NOTIFICATION);
+    app->scene_manager = scene_manager_alloc(&rpc_debug_app_scene_handlers, app);
+    app->view_dispatcher = view_dispatcher_alloc();
+
+    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+    view_dispatcher_set_custom_event_callback(
+        app->view_dispatcher, rpc_debug_app_custom_event_callback);
+    view_dispatcher_set_navigation_event_callback(
+        app->view_dispatcher, rpc_debug_app_back_event_callback);
+    view_dispatcher_set_tick_event_callback(
+        app->view_dispatcher, rpc_debug_app_tick_event_callback, 100);
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_enable_queue(app->view_dispatcher);
+
+    app->widget = widget_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, RpcDebugAppViewWidget, widget_get_view(app->widget));
+    app->submenu = submenu_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, RpcDebugAppViewSubmenu, submenu_get_view(app->submenu));
+    app->text_box = text_box_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, RpcDebugAppViewTextBox, text_box_get_view(app->text_box));
+    app->text_input = text_input_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, RpcDebugAppViewTextInput, text_input_get_view(app->text_input));
+    app->byte_input = byte_input_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, RpcDebugAppViewByteInput, byte_input_get_view(app->byte_input));
+
+    return app;
+}
+
+static void rpc_debug_app_free(RpcDebugApp* app) {
+    view_dispatcher_remove_view(app->view_dispatcher, RpcDebugAppViewByteInput);
+    view_dispatcher_remove_view(app->view_dispatcher, RpcDebugAppViewTextInput);
+    view_dispatcher_remove_view(app->view_dispatcher, RpcDebugAppViewTextBox);
+    view_dispatcher_remove_view(app->view_dispatcher, RpcDebugAppViewSubmenu);
+    view_dispatcher_remove_view(app->view_dispatcher, RpcDebugAppViewWidget);
+
+    free(app->byte_input);
+    free(app->text_input);
+    free(app->text_box);
+    free(app->submenu);
+    free(app->widget);
+
+    free(app->scene_manager);
+    free(app->view_dispatcher);
+
+    furi_record_close(RECORD_NOTIFICATION);
+    app->notifications = NULL;
+    furi_record_close(RECORD_GUI);
+    app->gui = NULL;
+
+    if(app->rpc) {
+        rpc_system_app_set_callback(app->rpc, NULL, NULL);
+        rpc_system_app_send_exited(app->rpc);
+        app->rpc = NULL;
+    }
+
+    free(app);
+}
+
+int32_t rpc_debug_app(void* args) {
+    RpcDebugApp* app = rpc_debug_app_alloc();
+
+    if(rpc_debug_app_rpc_init_rpc(app, args)) {
+        notification_message(app->notifications, &sequence_display_backlight_on);
+        scene_manager_next_scene(app->scene_manager, RpcDebugAppSceneStart);
+    } else {
+        scene_manager_next_scene(app->scene_manager, RpcDebugAppSceneStartDummy);
+    }
+
+    view_dispatcher_run(app->view_dispatcher);
+
+    rpc_debug_app_free(app);
+    return 0;
+}

+ 54 - 0
applications/debug/rpc_debug_app/rpc_debug_app.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <furi.h>
+#include <gui/gui.h>
+#include <gui/view.h>
+#include <gui/scene_manager.h>
+#include <gui/view_dispatcher.h>
+
+#include <gui/modules/widget.h>
+#include <gui/modules/submenu.h>
+#include <gui/modules/text_box.h>
+#include <gui/modules/text_input.h>
+#include <gui/modules/byte_input.h>
+
+#include <rpc/rpc_app.h>
+#include <notification/notification_messages.h>
+
+#include "scenes/rpc_debug_app_scene.h"
+
+#define DATA_STORE_SIZE 64U
+#define TEXT_STORE_SIZE 64U
+
+typedef struct {
+    Gui* gui;
+    RpcAppSystem* rpc;
+    SceneManager* scene_manager;
+    ViewDispatcher* view_dispatcher;
+    NotificationApp* notifications;
+
+    Widget* widget;
+    Submenu* submenu;
+    TextBox* text_box;
+    TextInput* text_input;
+    ByteInput* byte_input;
+
+    char text_store[TEXT_STORE_SIZE];
+    uint8_t data_store[DATA_STORE_SIZE];
+} RpcDebugApp;
+
+typedef enum {
+    RpcDebugAppViewWidget,
+    RpcDebugAppViewSubmenu,
+    RpcDebugAppViewTextBox,
+    RpcDebugAppViewTextInput,
+    RpcDebugAppViewByteInput,
+} RpcDebugAppView;
+
+typedef enum {
+    // Reserve first 100 events for button types and indexes, starting from 0
+    RpcDebugAppCustomEventInputErrorCode = 100,
+    RpcDebugAppCustomEventInputErrorText,
+    RpcDebugAppCustomEventInputDataExchange,
+    RpcDebugAppCustomEventRpcDataExchange,
+} RpcDebugAppCustomEvent;

+ 30 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene.c

@@ -0,0 +1,30 @@
+#include "rpc_debug_app_scene.h"
+
+// Generate scene on_enter handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
+void (*const rpc_debug_app_on_enter_handlers[])(void*) = {
+#include "rpc_debug_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_event handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
+bool (*const rpc_debug_app_on_event_handlers[])(void* context, SceneManagerEvent event) = {
+#include "rpc_debug_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
+void (*const rpc_debug_app_on_exit_handlers[])(void* context) = {
+#include "rpc_debug_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Initialize scene handlers configuration structure
+const SceneManagerHandlers rpc_debug_app_scene_handlers = {
+    .on_enter_handlers = rpc_debug_app_on_enter_handlers,
+    .on_event_handlers = rpc_debug_app_on_event_handlers,
+    .on_exit_handlers = rpc_debug_app_on_exit_handlers,
+    .scene_num = RpcDebugAppSceneNum,
+};

+ 29 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <gui/scene_manager.h>
+
+// Generate scene id and total number
+#define ADD_SCENE(prefix, name, id) RpcDebugAppScene##id,
+typedef enum {
+#include "rpc_debug_app_scene_config.h"
+    RpcDebugAppSceneNum,
+} RpcDebugAppScene;
+#undef ADD_SCENE
+
+extern const SceneManagerHandlers rpc_debug_app_scene_handlers;
+
+// Generate scene on_enter handlers declaration
+#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
+#include "rpc_debug_app_scene_config.h"
+#undef ADD_SCENE
+
+// Generate scene on_event handlers declaration
+#define ADD_SCENE(prefix, name, id) \
+    bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
+#include "rpc_debug_app_scene_config.h"
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers declaration
+#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
+#include "rpc_debug_app_scene_config.h"
+#undef ADD_SCENE

+ 8 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_config.h

@@ -0,0 +1,8 @@
+ADD_SCENE(rpc_debug_app, start, Start)
+ADD_SCENE(rpc_debug_app, start_dummy, StartDummy)
+ADD_SCENE(rpc_debug_app, test_app_error, TestAppError)
+ADD_SCENE(rpc_debug_app, test_data_exchange, TestDataExchange)
+ADD_SCENE(rpc_debug_app, input_error_code, InputErrorCode)
+ADD_SCENE(rpc_debug_app, input_error_text, InputErrorText)
+ADD_SCENE(rpc_debug_app, input_data_exchange, InputDataExchange)
+ADD_SCENE(rpc_debug_app, receive_data_exchange, ReceiveDataExchange)

+ 40 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_data_exchange.c

@@ -0,0 +1,40 @@
+#include "../rpc_debug_app.h"
+
+static void rpc_debug_app_scene_input_data_exchange_result_callback(void* context) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(
+        app->view_dispatcher, RpcDebugAppCustomEventInputDataExchange);
+}
+
+void rpc_debug_app_scene_input_data_exchange_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    byte_input_set_header_text(app->byte_input, "Enter data to exchange");
+    byte_input_set_result_callback(
+        app->byte_input,
+        rpc_debug_app_scene_input_data_exchange_result_callback,
+        NULL,
+        app,
+        app->data_store,
+        DATA_STORE_SIZE);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewByteInput);
+}
+
+bool rpc_debug_app_scene_input_data_exchange_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == RpcDebugAppCustomEventInputDataExchange) {
+            rpc_system_app_exchange_data(app->rpc, app->data_store, DATA_STORE_SIZE);
+            scene_manager_previous_scene(app->scene_manager);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_input_data_exchange_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    UNUSED(app);
+}

+ 60 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_code.c

@@ -0,0 +1,60 @@
+#include "../rpc_debug_app.h"
+
+static bool rpc_debug_app_scene_input_error_code_validator_callback(
+    const char* text,
+    FuriString* error,
+    void* context) {
+    UNUSED(context);
+
+    for(; *text; ++text) {
+        const char c = *text;
+        if(c < '0' || c > '9') {
+            furi_string_printf(error, "%s", "Please enter\na number!");
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static void rpc_debug_app_scene_input_error_code_result_callback(void* context) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, RpcDebugAppCustomEventInputErrorCode);
+}
+
+void rpc_debug_app_scene_input_error_code_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    strncpy(app->text_store, "666", TEXT_STORE_SIZE);
+    text_input_set_header_text(app->text_input, "Enter error code");
+    text_input_set_validator(
+        app->text_input, rpc_debug_app_scene_input_error_code_validator_callback, NULL);
+    text_input_set_result_callback(
+        app->text_input,
+        rpc_debug_app_scene_input_error_code_result_callback,
+        app,
+        app->text_store,
+        TEXT_STORE_SIZE,
+        true);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewTextInput);
+}
+
+bool rpc_debug_app_scene_input_error_code_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == RpcDebugAppCustomEventInputErrorCode) {
+            rpc_system_app_set_error_code(app->rpc, (uint32_t)atol(app->text_store));
+            scene_manager_previous_scene(app->scene_manager);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_input_error_code_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    text_input_reset(app->text_input);
+    text_input_set_validator(app->text_input, NULL, NULL);
+}

+ 40 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_text.c

@@ -0,0 +1,40 @@
+#include "../rpc_debug_app.h"
+
+static void rpc_debug_app_scene_input_error_text_result_callback(void* context) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, RpcDebugAppCustomEventInputErrorText);
+}
+
+void rpc_debug_app_scene_input_error_text_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    strncpy(app->text_store, "I'm a scary error message!", TEXT_STORE_SIZE);
+    text_input_set_header_text(app->text_input, "Enter error text");
+    text_input_set_result_callback(
+        app->text_input,
+        rpc_debug_app_scene_input_error_text_result_callback,
+        app,
+        app->text_store,
+        TEXT_STORE_SIZE,
+        true);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewTextInput);
+}
+
+bool rpc_debug_app_scene_input_error_text_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == RpcDebugAppCustomEventInputErrorText) {
+            rpc_system_app_set_error_text(app->rpc, app->text_store);
+            scene_manager_previous_scene(app->scene_manager);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_input_error_text_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    text_input_reset(app->text_input);
+}

+ 70 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c

@@ -0,0 +1,70 @@
+#include "../rpc_debug_app.h"
+
+static void rpc_debug_app_scene_start_format_hex(
+    const uint8_t* data,
+    size_t data_size,
+    char* buf,
+    size_t buf_size) {
+    furi_assert(data);
+    furi_assert(buf);
+
+    const size_t byte_width = 3;
+    const size_t line_width = 7;
+
+    data_size = MIN(data_size, buf_size / (byte_width + 1));
+
+    for(size_t i = 0; i < data_size; ++i) {
+        char* p = buf + (i * byte_width);
+        char sep = !((i + 1) % line_width) ? '\n' : ' ';
+        snprintf(p, byte_width + 1, "%02X%c", data[i], sep);
+    }
+
+    buf[buf_size - 1] = '\0';
+}
+
+static void rpc_debug_app_scene_receive_data_exchange_callback(
+    const uint8_t* data,
+    size_t data_size,
+    void* context) {
+    RpcDebugApp* app = context;
+    if(data) {
+        rpc_debug_app_scene_start_format_hex(data, data_size, app->text_store, TEXT_STORE_SIZE);
+    } else {
+        strncpy(app->text_store, "<Data empty>", TEXT_STORE_SIZE);
+    }
+    view_dispatcher_send_custom_event(app->view_dispatcher, RpcDebugAppCustomEventRpcDataExchange);
+}
+
+void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    strncpy(app->text_store, "Received data will appear here...", TEXT_STORE_SIZE);
+
+    text_box_set_text(app->text_box, app->text_store);
+    text_box_set_font(app->text_box, TextBoxFontHex);
+
+    rpc_system_app_set_data_exchange_callback(
+        app->rpc, rpc_debug_app_scene_receive_data_exchange_callback, app);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewTextBox);
+}
+
+bool rpc_debug_app_scene_receive_data_exchange_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == RpcDebugAppCustomEventRpcDataExchange) {
+            notification_message(app->notifications, &sequence_blink_cyan_100);
+            notification_message(app->notifications, &sequence_display_backlight_on);
+            text_box_set_text(app->text_box, app->text_store);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_receive_data_exchange_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    text_box_reset(app->text_box);
+    rpc_system_app_set_data_exchange_callback(app->rpc, NULL, NULL);
+}

+ 57 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_start.c

@@ -0,0 +1,57 @@
+#include "../rpc_debug_app.h"
+
+enum SubmenuIndex {
+    SubmenuIndexTestAppError,
+    SubmenuIndexTestDataExchange,
+};
+
+static void rpc_debug_app_scene_start_submenu_callback(void* context, uint32_t index) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void rpc_debug_app_scene_start_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    Submenu* submenu = app->submenu;
+
+    submenu_add_item(
+        submenu,
+        "Test App Error",
+        SubmenuIndexTestAppError,
+        rpc_debug_app_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        "Test Data Exchange",
+        SubmenuIndexTestDataExchange,
+        rpc_debug_app_scene_start_submenu_callback,
+        app);
+
+    submenu_set_selected_item(submenu, SubmenuIndexTestAppError);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewSubmenu);
+}
+
+bool rpc_debug_app_scene_start_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    SceneManager* scene_manager = app->scene_manager;
+
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        const uint32_t submenu_index = event.event;
+        if(submenu_index == SubmenuIndexTestAppError) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneTestAppError);
+            consumed = true;
+        } else if(submenu_index == SubmenuIndexTestDataExchange) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneTestDataExchange);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_start_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    submenu_reset(app->submenu);
+}

+ 30 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_start_dummy.c

@@ -0,0 +1,30 @@
+#include "../rpc_debug_app.h"
+
+void rpc_debug_app_scene_start_dummy_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    widget_add_text_box_element(
+        app->widget,
+        0,
+        0,
+        128,
+        64,
+        AlignCenter,
+        AlignCenter,
+        "This application\nis meant to be run\nin \e#RPC\e# mode.",
+        false);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewWidget);
+}
+
+bool rpc_debug_app_scene_start_dummy_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    UNUSED(app);
+    UNUSED(event);
+
+    bool consumed = false;
+    return consumed;
+}
+
+void rpc_debug_app_scene_start_dummy_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    widget_reset(app->widget);
+}

+ 57 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_test_app_error.c

@@ -0,0 +1,57 @@
+#include "../rpc_debug_app.h"
+
+typedef enum {
+    SubmenuIndexSetErrorCode,
+    SubmenuIndexSetErrorText,
+} SubmenuIndex;
+
+static void rpc_debug_app_scene_test_app_error_submenu_callback(void* context, uint32_t index) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void rpc_debug_app_scene_test_app_error_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    Submenu* submenu = app->submenu;
+
+    submenu_add_item(
+        submenu,
+        "Set Error Code",
+        SubmenuIndexSetErrorCode,
+        rpc_debug_app_scene_test_app_error_submenu_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        "Set Error Text",
+        SubmenuIndexSetErrorText,
+        rpc_debug_app_scene_test_app_error_submenu_callback,
+        app);
+
+    submenu_set_selected_item(submenu, SubmenuIndexSetErrorCode);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewSubmenu);
+}
+
+bool rpc_debug_app_scene_test_app_error_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    SceneManager* scene_manager = app->scene_manager;
+
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        const uint32_t submenu_index = event.event;
+        if(submenu_index == SubmenuIndexSetErrorCode) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneInputErrorCode);
+            consumed = true;
+        } else if(submenu_index == SubmenuIndexSetErrorText) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneInputErrorText);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_test_app_error_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    submenu_reset(app->submenu);
+}

+ 58 - 0
applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_test_data_exchange.c

@@ -0,0 +1,58 @@
+#include "../rpc_debug_app.h"
+
+typedef enum {
+    SubmenuIndexSendData,
+    SubmenuIndexReceiveData,
+} SubmenuIndex;
+
+static void
+    rpc_debug_app_scene_test_data_exchange_submenu_callback(void* context, uint32_t index) {
+    RpcDebugApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void rpc_debug_app_scene_test_data_exchange_on_enter(void* context) {
+    RpcDebugApp* app = context;
+    Submenu* submenu = app->submenu;
+
+    submenu_add_item(
+        submenu,
+        "Send Data",
+        SubmenuIndexSendData,
+        rpc_debug_app_scene_test_data_exchange_submenu_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        "Receive Data",
+        SubmenuIndexReceiveData,
+        rpc_debug_app_scene_test_data_exchange_submenu_callback,
+        app);
+
+    submenu_set_selected_item(submenu, SubmenuIndexSendData);
+    view_dispatcher_switch_to_view(app->view_dispatcher, RpcDebugAppViewSubmenu);
+}
+
+bool rpc_debug_app_scene_test_data_exchange_on_event(void* context, SceneManagerEvent event) {
+    RpcDebugApp* app = context;
+    SceneManager* scene_manager = app->scene_manager;
+
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        const uint32_t submenu_index = event.event;
+        if(submenu_index == SubmenuIndexSendData) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneInputDataExchange);
+            consumed = true;
+        } else if(submenu_index == SubmenuIndexReceiveData) {
+            scene_manager_next_scene(scene_manager, RpcDebugAppSceneReceiveDataExchange);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void rpc_debug_app_scene_test_data_exchange_on_exit(void* context) {
+    RpcDebugApp* app = context;
+    submenu_reset(app->submenu);
+}

+ 1 - 1
applications/services/cli/cli_commands.c

@@ -25,7 +25,7 @@ void cli_command_device_info_callback(const char* key, const char* value, bool l
 void cli_command_device_info(Cli* cli, FuriString* args, void* context) {
     UNUSED(cli);
     UNUSED(args);
-    furi_hal_info_get(cli_command_device_info_callback, context);
+    furi_hal_info_get(cli_command_device_info_callback, '_', context);
 }
 
 void cli_command_help(Cli* cli, FuriString* args, void* context) {

+ 3 - 3
applications/services/power/power_cli.c

@@ -26,7 +26,7 @@ void power_cli_reboot2dfu(Cli* cli, FuriString* args) {
     power_reboot(PowerBootModeDfu);
 }
 
-static void power_cli_info_callback(const char* key, const char* value, bool last, void* context) {
+static void power_cli_callback(const char* key, const char* value, bool last, void* context) {
     UNUSED(last);
     UNUSED(context);
     printf("%-24s: %s\r\n", key, value);
@@ -35,13 +35,13 @@ static void power_cli_info_callback(const char* key, const char* value, bool las
 void power_cli_info(Cli* cli, FuriString* args) {
     UNUSED(cli);
     UNUSED(args);
-    furi_hal_power_info_get(power_cli_info_callback, NULL);
+    furi_hal_power_info_get(power_cli_callback, '_', NULL);
 }
 
 void power_cli_debug(Cli* cli, FuriString* args) {
     UNUSED(cli);
     UNUSED(args);
-    furi_hal_power_dump_state();
+    furi_hal_power_debug_get(power_cli_callback, NULL);
 }
 
 void power_cli_5v(Cli* cli, FuriString* args) {

+ 6 - 1
applications/services/rpc/rpc.c

@@ -52,7 +52,12 @@ static RpcSystemCallbacks rpc_systems[] = {
     {
         .alloc = rpc_system_gpio_alloc,
         .free = NULL,
-    }};
+    },
+    {
+        .alloc = rpc_system_property_alloc,
+        .free = NULL,
+    },
+};
 
 struct RpcSession {
     Rpc* rpc;

+ 120 - 0
applications/services/rpc/rpc_app.c

@@ -9,9 +9,15 @@
 
 struct RpcAppSystem {
     RpcSession* session;
+
     RpcAppSystemCallback app_callback;
     void* app_context;
+
+    RpcAppSystemDataExchangeCallback data_exchange_callback;
+    void* data_exchange_context;
+
     PB_Main* state_msg;
+    PB_Main* error_msg;
 
     uint32_t last_id;
     char* last_data;
@@ -195,6 +201,50 @@ static void rpc_system_app_button_release(const PB_Main* request, void* context)
     }
 }
 
+static void rpc_system_app_get_error_process(const PB_Main* request, void* context) {
+    furi_assert(request);
+    furi_assert(request->which_content == PB_Main_app_get_error_request_tag);
+    furi_assert(context);
+
+    RpcAppSystem* rpc_app = context;
+    RpcSession* session = rpc_app->session;
+    furi_assert(session);
+
+    rpc_app->error_msg->command_id = request->command_id;
+
+    FURI_LOG_D(TAG, "GetError");
+    rpc_send(session, rpc_app->error_msg);
+}
+
+static void rpc_system_app_data_exchange_process(const PB_Main* request, void* context) {
+    furi_assert(request);
+    furi_assert(request->which_content == PB_Main_app_data_exchange_request_tag);
+    furi_assert(context);
+
+    RpcAppSystem* rpc_app = context;
+    RpcSession* session = rpc_app->session;
+    furi_assert(session);
+
+    PB_CommandStatus command_status;
+    pb_bytes_array_t* data = request->content.app_data_exchange_request.data;
+
+    if(rpc_app->data_exchange_callback) {
+        uint8_t* data_bytes = NULL;
+        size_t data_size = 0;
+        if(data) {
+            data_bytes = data->bytes;
+            data_size = data->size;
+        }
+        rpc_app->data_exchange_callback(data_bytes, data_size, rpc_app->data_exchange_context);
+        command_status = PB_CommandStatus_OK;
+    } else {
+        command_status = PB_CommandStatus_ERROR_APP_CMD_ERROR;
+    }
+
+    FURI_LOG_D(TAG, "DataExchange");
+    rpc_send_and_release_empty(session, request->command_id, command_status);
+}
+
 void rpc_system_app_send_started(RpcAppSystem* rpc_app) {
     furi_assert(rpc_app);
     RpcSession* session = rpc_app->session;
@@ -259,6 +309,58 @@ void rpc_system_app_set_callback(RpcAppSystem* rpc_app, RpcAppSystemCallback cal
     rpc_app->app_context = ctx;
 }
 
+void rpc_system_app_set_error_code(RpcAppSystem* rpc_app, uint32_t error_code) {
+    furi_assert(rpc_app);
+    PB_App_GetErrorResponse* content = &rpc_app->error_msg->content.app_get_error_response;
+    content->code = error_code;
+}
+
+void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text) {
+    furi_assert(rpc_app);
+    PB_App_GetErrorResponse* content = &rpc_app->error_msg->content.app_get_error_response;
+
+    if(content->text) {
+        free(content->text);
+    }
+
+    content->text = error_text ? strdup(error_text) : NULL;
+}
+
+void rpc_system_app_set_data_exchange_callback(
+    RpcAppSystem* rpc_app,
+    RpcAppSystemDataExchangeCallback callback,
+    void* ctx) {
+    furi_assert(rpc_app);
+
+    rpc_app->data_exchange_callback = callback;
+    rpc_app->data_exchange_context = ctx;
+}
+
+void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size) {
+    furi_assert(rpc_app);
+    RpcSession* session = rpc_app->session;
+    furi_assert(session);
+
+    PB_Main message = {
+        .command_id = 0,
+        .command_status = PB_CommandStatus_OK,
+        .has_next = false,
+        .which_content = PB_Main_app_data_exchange_request_tag,
+    };
+
+    PB_App_DataExchangeRequest* content = &message.content.app_data_exchange_request;
+
+    if(data && data_size) {
+        content->data = malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(data_size));
+        content->data->size = data_size;
+        memcpy(content->data->bytes, data, data_size);
+    } else {
+        content->data = NULL;
+    }
+
+    rpc_send_and_release(session, &message);
+}
+
 void* rpc_system_app_alloc(RpcSession* session) {
     furi_assert(session);
 
@@ -270,6 +372,13 @@ void* rpc_system_app_alloc(RpcSession* session) {
     rpc_app->state_msg->which_content = PB_Main_app_state_response_tag;
     rpc_app->state_msg->command_status = PB_CommandStatus_OK;
 
+    // App error message
+    rpc_app->error_msg = malloc(sizeof(PB_Main));
+    rpc_app->error_msg->which_content = PB_Main_app_get_error_response_tag;
+    rpc_app->error_msg->command_status = PB_CommandStatus_OK;
+    rpc_app->error_msg->content.app_get_error_response.code = 0;
+    rpc_app->error_msg->content.app_get_error_response.text = NULL;
+
     RpcHandler rpc_handler = {
         .message_handler = NULL,
         .decode_submessage = NULL,
@@ -294,6 +403,12 @@ void* rpc_system_app_alloc(RpcSession* session) {
     rpc_handler.message_handler = rpc_system_app_button_release;
     rpc_add_handler(session, PB_Main_app_button_release_request_tag, &rpc_handler);
 
+    rpc_handler.message_handler = rpc_system_app_get_error_process;
+    rpc_add_handler(session, PB_Main_app_get_error_request_tag, &rpc_handler);
+
+    rpc_handler.message_handler = rpc_system_app_data_exchange_process;
+    rpc_add_handler(session, PB_Main_app_data_exchange_request_tag, &rpc_handler);
+
     return rpc_app;
 }
 
@@ -311,8 +426,13 @@ void rpc_system_app_free(void* context) {
         furi_delay_tick(1);
     }
 
+    furi_assert(!rpc_app->data_exchange_callback);
+
     if(rpc_app->last_data) free(rpc_app->last_data);
 
+    pb_release(&PB_Main_msg, rpc_app->error_msg);
+
+    free(rpc_app->error_msg);
     free(rpc_app->state_msg);
     free(rpc_app);
 }

+ 13 - 0
applications/services/rpc/rpc_app.h

@@ -14,6 +14,8 @@ typedef enum {
 } RpcAppSystemEvent;
 
 typedef void (*RpcAppSystemCallback)(RpcAppSystemEvent event, void* context);
+typedef void (
+    *RpcAppSystemDataExchangeCallback)(const uint8_t* data, size_t data_size, void* context);
 
 typedef struct RpcAppSystem RpcAppSystem;
 
@@ -27,6 +29,17 @@ const char* rpc_system_app_get_data(RpcAppSystem* rpc_app);
 
 void rpc_system_app_confirm(RpcAppSystem* rpc_app, RpcAppSystemEvent event, bool result);
 
+void rpc_system_app_set_error_code(RpcAppSystem* rpc_app, uint32_t error_code);
+
+void rpc_system_app_set_error_text(RpcAppSystem* rpc_app, const char* error_text);
+
+void rpc_system_app_set_data_exchange_callback(
+    RpcAppSystem* rpc_app,
+    RpcAppSystemDataExchangeCallback callback,
+    void* ctx);
+
+void rpc_system_app_exchange_data(RpcAppSystem* rpc_app, const uint8_t* data, size_t data_size);
+
 #ifdef __cplusplus
 }
 #endif

+ 1 - 0
applications/services/rpc/rpc_i.h

@@ -34,6 +34,7 @@ void* rpc_system_gui_alloc(RpcSession* session);
 void rpc_system_gui_free(void* ctx);
 void* rpc_system_gpio_alloc(RpcSession* session);
 void rpc_system_gpio_free(void* ctx);
+void* rpc_system_property_alloc(RpcSession* session);
 
 void rpc_debug_print_message(const PB_Main* message);
 void rpc_debug_print_data(const char* prefix, uint8_t* buffer, size_t size);

+ 107 - 0
applications/services/rpc/rpc_property.c

@@ -0,0 +1,107 @@
+#include <flipper.pb.h>
+#include <furi_hal.h>
+#include <furi_hal_info.h>
+#include <furi_hal_power.h>
+#include <core/core_defines.h>
+
+#include "rpc_i.h"
+
+#define TAG "RpcProperty"
+
+#define PROPERTY_CATEGORY_DEVICE_INFO "devinfo"
+#define PROPERTY_CATEGORY_POWER_INFO "pwrinfo"
+#define PROPERTY_CATEGORY_POWER_DEBUG "pwrdebug"
+
+typedef struct {
+    RpcSession* session;
+    PB_Main* response;
+    FuriString* subkey;
+} RpcPropertyContext;
+
+static void
+    rpc_system_property_get_callback(const char* key, const char* value, bool last, void* context) {
+    furi_assert(key);
+    furi_assert(value);
+    furi_assert(context);
+    furi_assert(key);
+    furi_assert(value);
+
+    RpcPropertyContext* ctx = context;
+    RpcSession* session = ctx->session;
+    PB_Main* response = ctx->response;
+
+    if(!strncmp(key, furi_string_get_cstr(ctx->subkey), furi_string_size(ctx->subkey))) {
+        response->content.system_device_info_response.key = strdup(key);
+        response->content.system_device_info_response.value = strdup(value);
+        rpc_send_and_release(session, response);
+    }
+
+    if(last) {
+        rpc_send_and_release_empty(session, response->command_id, PB_CommandStatus_OK);
+    }
+}
+
+static void rpc_system_property_get_process(const PB_Main* request, void* context) {
+    furi_assert(request);
+    furi_assert(request->which_content == PB_Main_property_get_request_tag);
+
+    FURI_LOG_D(TAG, "GetProperty");
+
+    RpcSession* session = (RpcSession*)context;
+    furi_assert(session);
+
+    FuriString* topkey = furi_string_alloc();
+    FuriString* subkey = furi_string_alloc_set_str(request->content.property_get_request.key);
+
+    const size_t sep_idx = furi_string_search_char(subkey, '.');
+
+    if(sep_idx == FURI_STRING_FAILURE) {
+        furi_string_swap(topkey, subkey);
+    } else {
+        furi_string_set_n(topkey, subkey, 0, sep_idx);
+        furi_string_right(subkey, sep_idx + 1);
+    }
+
+    PB_Main* response = malloc(sizeof(PB_Main));
+
+    response->command_id = request->command_id;
+    response->command_status = PB_CommandStatus_OK;
+    response->has_next = true;
+    response->which_content = PB_Main_property_get_response_tag;
+
+    RpcPropertyContext property_context = {
+        .session = session,
+        .response = response,
+        .subkey = subkey,
+    };
+
+    if(!furi_string_cmp(topkey, PROPERTY_CATEGORY_DEVICE_INFO)) {
+        furi_hal_info_get(rpc_system_property_get_callback, '.', &property_context);
+    } else if(!furi_string_cmp(topkey, PROPERTY_CATEGORY_POWER_INFO)) {
+        furi_hal_power_info_get(rpc_system_property_get_callback, '.', &property_context);
+    } else if(!furi_string_cmp(topkey, PROPERTY_CATEGORY_POWER_DEBUG)) {
+        furi_hal_power_debug_get(rpc_system_property_get_callback, &property_context);
+    } else {
+        rpc_send_and_release_empty(
+            session, request->command_id, PB_CommandStatus_ERROR_INVALID_PARAMETERS);
+    }
+
+    furi_string_free(subkey);
+    furi_string_free(topkey);
+
+    free(response);
+}
+
+void* rpc_system_property_alloc(RpcSession* session) {
+    furi_assert(session);
+
+    RpcHandler rpc_handler = {
+        .message_handler = NULL,
+        .decode_submessage = NULL,
+        .context = session,
+    };
+
+    rpc_handler.message_handler = rpc_system_property_get_process;
+    rpc_add_handler(session, PB_Main_property_get_request_tag, &rpc_handler);
+    return NULL;
+}

+ 2 - 2
applications/services/rpc/rpc_system.c

@@ -109,7 +109,7 @@ static void rpc_system_system_device_info_process(const PB_Main* request, void*
         .session = session,
         .response = response,
     };
-    furi_hal_info_get(rpc_system_system_device_info_callback, &device_info_context);
+    furi_hal_info_get(rpc_system_system_device_info_callback, '_', &device_info_context);
 
     free(response);
 }
@@ -266,7 +266,7 @@ static void rpc_system_system_get_power_info_process(const PB_Main* request, voi
         .session = session,
         .response = response,
     };
-    furi_hal_power_info_get(rpc_system_system_power_info_callback, &power_info_context);
+    furi_hal_power_info_get(rpc_system_system_power_info_callback, '_', &power_info_context);
 
     free(response);
 }

+ 1 - 1
assets/protobuf

@@ -1 +1 @@
-Subproject commit e5af96e08fea8351898f7b8c6d1e34ce5fd6cdef
+Subproject commit 6460660237005d02d5c223835659b40e373bade9

+ 9 - 4
firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,7.6,,
+Version,+,8.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1120,7 +1120,7 @@ Function,+,furi_hal_ibutton_start_drive_in_isr,void,
 Function,+,furi_hal_ibutton_start_interrupt,void,
 Function,+,furi_hal_ibutton_start_interrupt_in_isr,void,
 Function,+,furi_hal_ibutton_stop,void,
-Function,+,furi_hal_info_get,void,"FuriHalInfoValueCallback, void*"
+Function,+,furi_hal_info_get,void,"PropertyValueCallback, char, void*"
 Function,+,furi_hal_infrared_async_rx_set_capture_isr_callback,void,"FuriHalInfraredRxCaptureCallback, void*"
 Function,+,furi_hal_infrared_async_rx_set_timeout,void,uint32_t
 Function,+,furi_hal_infrared_async_rx_set_timeout_isr_callback,void,"FuriHalInfraredRxTimeoutCallback, void*"
@@ -1185,10 +1185,10 @@ Function,+,furi_hal_nfc_tx_rx_full,_Bool,FuriHalNfcTxRxContext*
 Function,-,furi_hal_os_init,void,
 Function,+,furi_hal_os_tick,void,
 Function,+,furi_hal_power_check_otg_status,void,
+Function,+,furi_hal_power_debug_get,void,"PropertyValueCallback, void*"
 Function,+,furi_hal_power_deep_sleep_available,_Bool,
 Function,+,furi_hal_power_disable_external_3_3v,void,
 Function,+,furi_hal_power_disable_otg,void,
-Function,+,furi_hal_power_dump_state,void,
 Function,+,furi_hal_power_enable_external_3_3v,void,
 Function,+,furi_hal_power_enable_otg,void,
 Function,+,furi_hal_power_gauge_is_ok,_Bool,
@@ -1201,7 +1201,7 @@ Function,+,furi_hal_power_get_battery_temperature,float,FuriHalPowerIC
 Function,+,furi_hal_power_get_battery_voltage,float,FuriHalPowerIC
 Function,+,furi_hal_power_get_pct,uint8_t,
 Function,+,furi_hal_power_get_usb_voltage,float,
-Function,+,furi_hal_power_info_get,void,"FuriHalPowerInfoCallback, void*"
+Function,+,furi_hal_power_info_get,void,"PropertyValueCallback, char, void*"
 Function,-,furi_hal_power_init,void,
 Function,+,furi_hal_power_insomnia_enter,void,
 Function,+,furi_hal_power_insomnia_exit,void,
@@ -2039,6 +2039,7 @@ Function,+,powf,float,"float, float"
 Function,-,powl,long double,"long double, long double"
 Function,-,printf,int,"const char*, ..."
 Function,-,prng_successor,uint32_t,"uint32_t, uint32_t"
+Function,+,property_value_out,void,"PropertyValueContext*, const char*, unsigned int, ..."
 Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t"
 Function,+,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t"
 Function,+,protocol_dict_decoders_feed_by_feature,ProtocolId,"ProtocolDict*, uint32_t, _Bool, uint32_t"
@@ -2284,10 +2285,14 @@ Function,+,rpc_session_set_context,void,"RpcSession*, void*"
 Function,+,rpc_session_set_send_bytes_callback,void,"RpcSession*, RpcSendBytesCallback"
 Function,+,rpc_session_set_terminated_callback,void,"RpcSession*, RpcSessionTerminatedCallback"
 Function,+,rpc_system_app_confirm,void,"RpcAppSystem*, RpcAppSystemEvent, _Bool"
+Function,+,rpc_system_app_exchange_data,void,"RpcAppSystem*, const uint8_t*, size_t"
 Function,+,rpc_system_app_get_data,const char*,RpcAppSystem*
 Function,+,rpc_system_app_send_exited,void,RpcAppSystem*
 Function,+,rpc_system_app_send_started,void,RpcAppSystem*
 Function,+,rpc_system_app_set_callback,void,"RpcAppSystem*, RpcAppSystemCallback, void*"
+Function,+,rpc_system_app_set_data_exchange_callback,void,"RpcAppSystem*, RpcAppSystemDataExchangeCallback, void*"
+Function,+,rpc_system_app_set_error_code,void,"RpcAppSystem*, uint32_t"
+Function,+,rpc_system_app_set_error_text,void,"RpcAppSystem*, const char*"
 Function,-,rpmatch,int,const char*
 Function,+,saved_struct_load,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"
 Function,+,saved_struct_save,_Bool,"const char*, void*, size_t, uint8_t, uint8_t"

+ 218 - 81
firmware/targets/f7/furi_hal/furi_hal_info.c

@@ -8,16 +8,25 @@
 #include <furi.h>
 #include <protobuf_version.h>
 
-void furi_hal_info_get(FuriHalInfoValueCallback out, void* context) {
-    FuriString* value;
-    value = furi_string_alloc();
+void furi_hal_info_get(PropertyValueCallback out, char sep, void* context) {
+    FuriString* key = furi_string_alloc();
+    FuriString* value = furi_string_alloc();
+
+    PropertyValueContext property_context = {
+        .key = key, .value = value, .out = out, .sep = sep, .last = false, .context = context};
 
     // Device Info version
-    out("device_info_major", "2", false, context);
-    out("device_info_minor", "0", false, context);
+    if(sep == '.') {
+        property_value_out(&property_context, NULL, 2, "format", "major", "3");
+        property_value_out(&property_context, NULL, 2, "format", "minor", "0");
+    } else {
+        property_value_out(&property_context, NULL, 3, "device", "info", "major", "2");
+        property_value_out(&property_context, NULL, 3, "device", "info", "minor", "0");
+    }
 
     // Model name
-    out("hardware_model", furi_hal_version_get_model_name(), false, context);
+    property_value_out(
+        &property_context, NULL, 2, "hardware", "model", furi_hal_version_get_model_name());
 
     // Unique ID
     furi_string_reset(value);
@@ -25,93 +34,211 @@ void furi_hal_info_get(FuriHalInfoValueCallback out, void* context) {
     for(size_t i = 0; i < furi_hal_version_uid_size(); i++) {
         furi_string_cat_printf(value, "%02X", uid[i]);
     }
-    out("hardware_uid", furi_string_get_cstr(value), false, context);
+    property_value_out(&property_context, NULL, 2, "hardware", "uid", furi_string_get_cstr(value));
 
     // OTP Revision
-    furi_string_printf(value, "%d", furi_hal_version_get_otp_version());
-    out("hardware_otp_ver", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%lu", furi_hal_version_get_hw_timestamp());
-    out("hardware_timestamp", furi_string_get_cstr(value), false, context);
+    property_value_out(
+        &property_context, "%d", 3, "hardware", "otp", "ver", furi_hal_version_get_otp_version());
+    property_value_out(
+        &property_context, "%lu", 2, "hardware", "timestamp", furi_hal_version_get_hw_timestamp());
 
     // Board Revision
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_version());
-    out("hardware_ver", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_target());
-    out("hardware_target", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_body());
-    out("hardware_body", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_connect());
-    out("hardware_connect", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_display());
-    out("hardware_display", furi_string_get_cstr(value), false, context);
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "ver", furi_hal_version_get_hw_version());
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "target", furi_hal_version_get_hw_target());
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "body", furi_hal_version_get_hw_body());
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "connect", furi_hal_version_get_hw_connect());
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "display", furi_hal_version_get_hw_display());
 
     // Board Personification
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_color());
-    out("hardware_color", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%d", furi_hal_version_get_hw_region());
-    out("hardware_region", furi_string_get_cstr(value), false, context);
-    out("hardware_region_provisioned", furi_hal_region_get_name(), false, context);
+    property_value_out(
+        &property_context, "%d", 2, "hardware", "color", furi_hal_version_get_hw_color());
+
+    if(sep == '.') {
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "hardware",
+            "region",
+            "builtin",
+            furi_hal_version_get_hw_region());
+    } else {
+        property_value_out(
+            &property_context, "%d", 2, "hardware", "region", furi_hal_version_get_hw_region());
+    }
+
+    property_value_out(
+        &property_context,
+        NULL,
+        3,
+        "hardware",
+        "region",
+        "provisioned",
+        furi_hal_region_get_name());
+
     const char* name = furi_hal_version_get_name_ptr();
     if(name) {
-        out("hardware_name", name, false, context);
+        property_value_out(&property_context, NULL, 2, "hardware", "name", name);
     }
 
     // Firmware version
     const Version* firmware_version = furi_hal_version_get_firmware_version();
     if(firmware_version) {
-        out("firmware_commit", version_get_githash(firmware_version), false, context);
-        out("firmware_commit_dirty",
-            version_get_dirty_flag(firmware_version) ? "true" : "false",
-            false,
-            context);
-        out("firmware_branch", version_get_gitbranch(firmware_version), false, context);
-        out("firmware_branch_num", version_get_gitbranchnum(firmware_version), false, context);
-        out("firmware_version", version_get_version(firmware_version), false, context);
-        out("firmware_build_date", version_get_builddate(firmware_version), false, context);
-        furi_string_printf(value, "%d", version_get_target(firmware_version));
-        out("firmware_target", furi_string_get_cstr(value), false, context);
+        if(sep == '.') {
+            property_value_out(
+                &property_context,
+                NULL,
+                3,
+                "firmware",
+                "commit",
+                "hash",
+                version_get_githash(firmware_version));
+        } else {
+            property_value_out(
+                &property_context,
+                NULL,
+                2,
+                "firmware",
+                "commit",
+                version_get_githash(firmware_version));
+        }
+
+        property_value_out(
+            &property_context,
+            NULL,
+            3,
+            "firmware",
+            "commit",
+            "dirty",
+            version_get_dirty_flag(firmware_version) ? "true" : "false");
+
+        if(sep == '.') {
+            property_value_out(
+                &property_context,
+                NULL,
+                3,
+                "firmware",
+                "branch",
+                "name",
+                version_get_gitbranch(firmware_version));
+        } else {
+            property_value_out(
+                &property_context,
+                NULL,
+                2,
+                "firmware",
+                "branch",
+                version_get_gitbranch(firmware_version));
+        }
+
+        property_value_out(
+            &property_context,
+            NULL,
+            3,
+            "firmware",
+            "branch",
+            "num",
+            version_get_gitbranchnum(firmware_version));
+        property_value_out(
+            &property_context,
+            NULL,
+            2,
+            "firmware",
+            "version",
+            version_get_version(firmware_version));
+        property_value_out(
+            &property_context,
+            NULL,
+            3,
+            "firmware",
+            "build",
+            "date",
+            version_get_builddate(firmware_version));
+        property_value_out(
+            &property_context, "%d", 2, "firmware", "target", version_get_target(firmware_version));
     }
 
     if(furi_hal_bt_is_alive()) {
         const BleGlueC2Info* ble_c2_info = ble_glue_get_c2_info();
-        out("radio_alive", "true", false, context);
-        out("radio_mode", ble_c2_info->mode == BleGlueC2ModeFUS ? "FUS" : "Stack", false, context);
+        property_value_out(&property_context, NULL, 2, "radio", "alive", "true");
+        property_value_out(
+            &property_context,
+            NULL,
+            2,
+            "radio",
+            "mode",
+            ble_c2_info->mode == BleGlueC2ModeFUS ? "FUS" : "Stack");
 
         // FUS Info
-        furi_string_printf(value, "%d", ble_c2_info->FusVersionMajor);
-        out("radio_fus_major", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->FusVersionMinor);
-        out("radio_fus_minor", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->FusVersionSub);
-        out("radio_fus_sub", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->FusMemorySizeSram2B);
-        out("radio_fus_sram2b", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->FusMemorySizeSram2A);
-        out("radio_fus_sram2a", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->FusMemorySizeFlash * 4);
-        out("radio_fus_flash", furi_string_get_cstr(value), false, context);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "fus", "major", ble_c2_info->FusVersionMajor);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "fus", "minor", ble_c2_info->FusVersionMinor);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "fus", "sub", ble_c2_info->FusVersionSub);
+        property_value_out(
+            &property_context,
+            "%dK",
+            3,
+            "radio",
+            "fus",
+            "sram2b",
+            ble_c2_info->FusMemorySizeSram2B);
+        property_value_out(
+            &property_context,
+            "%dK",
+            3,
+            "radio",
+            "fus",
+            "sram2a",
+            ble_c2_info->FusMemorySizeSram2A);
+        property_value_out(
+            &property_context,
+            "%dK",
+            3,
+            "radio",
+            "fus",
+            "flash",
+            ble_c2_info->FusMemorySizeFlash * 4);
 
         // Stack Info
-        furi_string_printf(value, "%d", ble_c2_info->StackType);
-        out("radio_stack_type", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->VersionMajor);
-        out("radio_stack_major", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->VersionMinor);
-        out("radio_stack_minor", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->VersionSub);
-        out("radio_stack_sub", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->VersionBranch);
-        out("radio_stack_branch", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%d", ble_c2_info->VersionReleaseType);
-        out("radio_stack_release", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->MemorySizeSram2B);
-        out("radio_stack_sram2b", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->MemorySizeSram2A);
-        out("radio_stack_sram2a", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->MemorySizeSram1);
-        out("radio_stack_sram1", furi_string_get_cstr(value), false, context);
-        furi_string_printf(value, "%dK", ble_c2_info->MemorySizeFlash * 4);
-        out("radio_stack_flash", furi_string_get_cstr(value), false, context);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "stack", "type", ble_c2_info->StackType);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "stack", "major", ble_c2_info->VersionMajor);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "stack", "minor", ble_c2_info->VersionMinor);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "stack", "sub", ble_c2_info->VersionSub);
+        property_value_out(
+            &property_context, "%d", 3, "radio", "stack", "branch", ble_c2_info->VersionBranch);
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "radio",
+            "stack",
+            "release",
+            ble_c2_info->VersionReleaseType);
+        property_value_out(
+            &property_context, "%dK", 3, "radio", "stack", "sram2b", ble_c2_info->MemorySizeSram2B);
+        property_value_out(
+            &property_context, "%dK", 3, "radio", "stack", "sram2a", ble_c2_info->MemorySizeSram2A);
+        property_value_out(
+            &property_context, "%dK", 3, "radio", "stack", "sram1", ble_c2_info->MemorySizeSram1);
+        property_value_out(
+            &property_context,
+            "%dK",
+            3,
+            "radio",
+            "stack",
+            "flash",
+            ble_c2_info->MemorySizeFlash * 4);
 
         // Mac address
         furi_string_reset(value);
@@ -119,23 +246,33 @@ void furi_hal_info_get(FuriHalInfoValueCallback out, void* context) {
         for(size_t i = 0; i < 6; i++) {
             furi_string_cat_printf(value, "%02X", ble_mac[i]);
         }
-        out("radio_ble_mac", furi_string_get_cstr(value), false, context);
+        property_value_out(
+            &property_context, NULL, 3, "radio", "ble", "mac", furi_string_get_cstr(value));
 
         // Signature verification
         uint8_t enclave_keys = 0;
         uint8_t enclave_valid_keys = 0;
         bool enclave_valid = furi_hal_crypto_verify_enclave(&enclave_keys, &enclave_valid_keys);
-        furi_string_printf(value, "%d", enclave_valid_keys);
-        out("enclave_valid_keys", furi_string_get_cstr(value), false, context);
-        out("enclave_valid", enclave_valid ? "true" : "false", false, context);
+        if(sep == '.') {
+            property_value_out(
+                &property_context, "%d", 3, "enclave", "keys", "valid", enclave_valid_keys);
+        } else {
+            property_value_out(
+                &property_context, "%d", 3, "enclave", "valid", "keys", enclave_valid_keys);
+        }
+
+        property_value_out(
+            &property_context, NULL, 2, "enclave", "valid", enclave_valid ? "true" : "false");
     } else {
-        out("radio_alive", "false", false, context);
+        property_value_out(&property_context, NULL, 2, "radio", "alive", "false");
     }
 
-    furi_string_printf(value, "%u", PROTOBUF_MAJOR_VERSION);
-    out("protobuf_version_major", furi_string_get_cstr(value), false, context);
-    furi_string_printf(value, "%u", PROTOBUF_MINOR_VERSION);
-    out("protobuf_version_minor", furi_string_get_cstr(value), true, context);
+    property_value_out(
+        &property_context, "%u", 3, "protobuf", "version", "major", PROTOBUF_MAJOR_VERSION);
+    property_context.last = true;
+    property_value_out(
+        &property_context, "%u", 3, "protobuf", "version", "minor", PROTOBUF_MINOR_VERSION);
 
+    furi_string_free(key);
     furi_string_free(value);
 }

+ 199 - 99
firmware/targets/f7/furi_hal/furi_hal_power.c

@@ -422,76 +422,6 @@ float furi_hal_power_get_usb_voltage() {
     return ret;
 }
 
-void furi_hal_power_dump_state() {
-    BatteryStatus battery_status;
-    OperationStatus operation_status;
-
-    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
-
-    if(bq27220_get_battery_status(&furi_hal_i2c_handle_power, &battery_status) == BQ27220_ERROR ||
-       bq27220_get_operation_status(&furi_hal_i2c_handle_power, &operation_status) ==
-           BQ27220_ERROR) {
-        printf("Failed to get bq27220 status. Communication error.\r\n");
-    } else {
-        // Operation status register
-        printf(
-            "bq27220: CALMD: %d, SEC: %d, EDV2: %d, VDQ: %d, INITCOMP: %d, SMTH: %d, BTPINT: %d, CFGUPDATE: %d\r\n",
-            operation_status.CALMD,
-            operation_status.SEC,
-            operation_status.EDV2,
-            operation_status.VDQ,
-            operation_status.INITCOMP,
-            operation_status.SMTH,
-            operation_status.BTPINT,
-            operation_status.CFGUPDATE);
-        // Battery status register, part 1
-        printf(
-            "bq27220: CHGINH: %d, FC: %d, OTD: %d, OTC: %d, SLEEP: %d, OCVFAIL: %d, OCVCOMP: %d, FD: %d\r\n",
-            battery_status.CHGINH,
-            battery_status.FC,
-            battery_status.OTD,
-            battery_status.OTC,
-            battery_status.SLEEP,
-            battery_status.OCVFAIL,
-            battery_status.OCVCOMP,
-            battery_status.FD);
-        // Battery status register, part 2
-        printf(
-            "bq27220: DSG: %d, SYSDWN: %d, TDA: %d, BATTPRES: %d, AUTH_GD: %d, OCVGD: %d, TCA: %d, RSVD: %d\r\n",
-            battery_status.DSG,
-            battery_status.SYSDWN,
-            battery_status.TDA,
-            battery_status.BATTPRES,
-            battery_status.AUTH_GD,
-            battery_status.OCVGD,
-            battery_status.TCA,
-            battery_status.RSVD);
-        // Voltage and current info
-        printf(
-            "bq27220: Full capacity: %dmAh, Design capacity: %dmAh, Remaining capacity: %dmAh, State of Charge: %d%%, State of health: %d%%\r\n",
-            bq27220_get_full_charge_capacity(&furi_hal_i2c_handle_power),
-            bq27220_get_design_capacity(&furi_hal_i2c_handle_power),
-            bq27220_get_remaining_capacity(&furi_hal_i2c_handle_power),
-            bq27220_get_state_of_charge(&furi_hal_i2c_handle_power),
-            bq27220_get_state_of_health(&furi_hal_i2c_handle_power));
-        printf(
-            "bq27220: Voltage: %dmV, Current: %dmA, Temperature: %dC\r\n",
-            bq27220_get_voltage(&furi_hal_i2c_handle_power),
-            bq27220_get_current(&furi_hal_i2c_handle_power),
-            (int)furi_hal_power_get_battery_temperature_internal(FuriHalPowerICFuelGauge));
-    }
-
-    printf(
-        "bq25896: VBUS: %d, VSYS: %d, VBAT: %d, Current: %d, NTC: %ldm%%\r\n",
-        bq25896_get_vbus_voltage(&furi_hal_i2c_handle_power),
-        bq25896_get_vsys_voltage(&furi_hal_i2c_handle_power),
-        bq25896_get_vbat_voltage(&furi_hal_i2c_handle_power),
-        bq25896_get_vbat_current(&furi_hal_i2c_handle_power),
-        bq25896_get_ntc_mpct(&furi_hal_i2c_handle_power));
-
-    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
-}
-
 void furi_hal_power_enable_external_3_3v() {
     furi_hal_gpio_write(&periph_power, 1);
 }
@@ -526,57 +456,227 @@ void furi_hal_power_suppress_charge_exit() {
     }
 }
 
-void furi_hal_power_info_get(FuriHalPowerInfoCallback out, void* context) {
+void furi_hal_power_info_get(PropertyValueCallback out, char sep, void* context) {
     furi_assert(out);
 
-    FuriString* value;
-    value = furi_string_alloc();
+    FuriString* value = furi_string_alloc();
+    FuriString* key = furi_string_alloc();
 
-    // Power Info version
-    out("power_info_major", "1", false, context);
-    out("power_info_minor", "0", false, context);
+    PropertyValueContext property_context = {
+        .key = key, .value = value, .out = out, .sep = sep, .last = false, .context = context};
 
-    uint8_t charge = furi_hal_power_get_pct();
+    if(sep == '.') {
+        property_value_out(&property_context, NULL, 2, "format", "major", "2");
+        property_value_out(&property_context, NULL, 2, "format", "minor", "0");
+    } else {
+        property_value_out(&property_context, NULL, 3, "power", "info", "major", "1");
+        property_value_out(&property_context, NULL, 3, "power", "info", "minor", "0");
+    }
 
-    furi_string_printf(value, "%u", charge);
-    out("charge_level", furi_string_get_cstr(value), false, context);
+    uint8_t charge = furi_hal_power_get_pct();
+    property_value_out(&property_context, "%u", 2, "charge", "level", charge);
 
+    const char* charge_state;
     if(furi_hal_power_is_charging()) {
         if(charge < 100) {
-            furi_string_printf(value, "charging");
+            charge_state = "charging";
         } else {
-            furi_string_printf(value, "charged");
+            charge_state = "charged";
         }
     } else {
-        furi_string_printf(value, "discharging");
+        charge_state = "discharging";
     }
-    out("charge_state", furi_string_get_cstr(value), false, context);
 
+    property_value_out(&property_context, NULL, 2, "charge", "state", charge_state);
     uint16_t voltage =
         (uint16_t)(furi_hal_power_get_battery_voltage(FuriHalPowerICFuelGauge) * 1000.f);
-    furi_string_printf(value, "%u", voltage);
-    out("battery_voltage", furi_string_get_cstr(value), false, context);
-
+    property_value_out(&property_context, "%u", 2, "battery", "voltage", voltage);
     int16_t current =
         (int16_t)(furi_hal_power_get_battery_current(FuriHalPowerICFuelGauge) * 1000.f);
-    furi_string_printf(value, "%d", current);
-    out("battery_current", furi_string_get_cstr(value), false, context);
-
+    property_value_out(&property_context, "%d", 2, "battery", "current", current);
     int16_t temperature = (int16_t)furi_hal_power_get_battery_temperature(FuriHalPowerICFuelGauge);
-    furi_string_printf(value, "%d", temperature);
-    out("gauge_temp", furi_string_get_cstr(value), false, context);
+    property_value_out(&property_context, "%d", 2, "battery", "temp", temperature);
+    property_value_out(
+        &property_context, "%u", 2, "battery", "health", furi_hal_power_get_bat_health_pct());
+    property_value_out(
+        &property_context,
+        "%lu",
+        2,
+        "capacity",
+        "remain",
+        furi_hal_power_get_battery_remaining_capacity());
+    property_value_out(
+        &property_context,
+        "%lu",
+        2,
+        "capacity",
+        "full",
+        furi_hal_power_get_battery_full_capacity());
+    property_context.last = true;
+    property_value_out(
+        &property_context,
+        "%lu",
+        2,
+        "capacity",
+        "design",
+        furi_hal_power_get_battery_design_capacity());
+
+    furi_string_free(key);
+    furi_string_free(value);
+}
+
+void furi_hal_power_debug_get(PropertyValueCallback out, void* context) {
+    furi_assert(out);
+
+    FuriString* value = furi_string_alloc();
+    FuriString* key = furi_string_alloc();
+
+    PropertyValueContext property_context = {
+        .key = key, .value = value, .out = out, .sep = '.', .last = false, .context = context};
+
+    BatteryStatus battery_status;
+    OperationStatus operation_status;
 
-    furi_string_printf(value, "%u", furi_hal_power_get_bat_health_pct());
-    out("battery_health", furi_string_get_cstr(value), false, context);
+    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
 
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_remaining_capacity());
-    out("capacity_remain", furi_string_get_cstr(value), false, context);
+    // Power Debug version
+    property_value_out(&property_context, NULL, 2, "format", "major", "1");
+    property_value_out(&property_context, NULL, 2, "format", "minor", "0");
+
+    property_value_out(
+        &property_context,
+        "%d",
+        2,
+        "charger",
+        "vbus",
+        bq25896_get_vbus_voltage(&furi_hal_i2c_handle_power));
+    property_value_out(
+        &property_context,
+        "%d",
+        2,
+        "charger",
+        "vsys",
+        bq25896_get_vsys_voltage(&furi_hal_i2c_handle_power));
+    property_value_out(
+        &property_context,
+        "%d",
+        2,
+        "charger",
+        "vbat",
+        bq25896_get_vbat_voltage(&furi_hal_i2c_handle_power));
+    property_value_out(
+        &property_context,
+        "%d",
+        2,
+        "charger",
+        "current",
+        bq25896_get_vbat_current(&furi_hal_i2c_handle_power));
+
+    const uint32_t ntc_mpct = bq25896_get_ntc_mpct(&furi_hal_i2c_handle_power);
+
+    if(bq27220_get_battery_status(&furi_hal_i2c_handle_power, &battery_status) != BQ27220_ERROR &&
+       bq27220_get_operation_status(&furi_hal_i2c_handle_power, &operation_status) !=
+           BQ27220_ERROR) {
+        property_value_out(&property_context, "%lu", 2, "charger", "ntc", ntc_mpct);
+        property_value_out(&property_context, "%d", 2, "gauge", "calmd", operation_status.CALMD);
+        property_value_out(&property_context, "%d", 2, "gauge", "sec", operation_status.SEC);
+        property_value_out(&property_context, "%d", 2, "gauge", "edv2", operation_status.EDV2);
+        property_value_out(&property_context, "%d", 2, "gauge", "vdq", operation_status.VDQ);
+        property_value_out(
+            &property_context, "%d", 2, "gauge", "initcomp", operation_status.INITCOMP);
+        property_value_out(&property_context, "%d", 2, "gauge", "smth", operation_status.SMTH);
+        property_value_out(&property_context, "%d", 2, "gauge", "btpint", operation_status.BTPINT);
+        property_value_out(
+            &property_context, "%d", 2, "gauge", "cfgupdate", operation_status.CFGUPDATE);
 
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_full_capacity());
-    out("capacity_full", furi_string_get_cstr(value), false, context);
+        // Battery status register, part 1
+        property_value_out(&property_context, "%d", 2, "gauge", "chginh", battery_status.CHGINH);
+        property_value_out(&property_context, "%d", 2, "gauge", "fc", battery_status.FC);
+        property_value_out(&property_context, "%d", 2, "gauge", "otd", battery_status.OTD);
+        property_value_out(&property_context, "%d", 2, "gauge", "otc", battery_status.OTC);
+        property_value_out(&property_context, "%d", 2, "gauge", "sleep", battery_status.SLEEP);
+        property_value_out(&property_context, "%d", 2, "gauge", "ocvfail", battery_status.OCVFAIL);
+        property_value_out(&property_context, "%d", 2, "gauge", "ocvcomp", battery_status.OCVCOMP);
+        property_value_out(&property_context, "%d", 2, "gauge", "fd", battery_status.FD);
 
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_design_capacity());
-    out("capacity_design", furi_string_get_cstr(value), true, context);
+        // Battery status register, part 2
+        property_value_out(&property_context, "%d", 2, "gauge", "dsg", battery_status.DSG);
+        property_value_out(&property_context, "%d", 2, "gauge", "sysdwn", battery_status.SYSDWN);
+        property_value_out(&property_context, "%d", 2, "gauge", "tda", battery_status.TDA);
+        property_value_out(
+            &property_context, "%d", 2, "gauge", "battpres", battery_status.BATTPRES);
+        property_value_out(&property_context, "%d", 2, "gauge", "authgd", battery_status.AUTH_GD);
+        property_value_out(&property_context, "%d", 2, "gauge", "ocvgd", battery_status.OCVGD);
+        property_value_out(&property_context, "%d", 2, "gauge", "tca", battery_status.TCA);
+        property_value_out(&property_context, "%d", 2, "gauge", "rsvd", battery_status.RSVD);
 
+        // Voltage and current info
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "gauge",
+            "capacity",
+            "full",
+            bq27220_get_full_charge_capacity(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "gauge",
+            "capacity",
+            "design",
+            bq27220_get_design_capacity(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "gauge",
+            "capacity",
+            "remain",
+            bq27220_get_remaining_capacity(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "gauge",
+            "state",
+            "charge",
+            bq27220_get_state_of_charge(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            3,
+            "gauge",
+            "state",
+            "health",
+            bq27220_get_state_of_health(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            2,
+            "gauge",
+            "voltage",
+            bq27220_get_voltage(&furi_hal_i2c_handle_power));
+        property_value_out(
+            &property_context,
+            "%d",
+            2,
+            "gauge",
+            "current",
+            bq27220_get_current(&furi_hal_i2c_handle_power));
+
+        property_context.last = true;
+        const int battery_temp =
+            (int)furi_hal_power_get_battery_temperature_internal(FuriHalPowerICFuelGauge);
+        property_value_out(&property_context, "%d", 2, "gauge", "temperature", battery_temp);
+    } else {
+        property_context.last = true;
+        property_value_out(&property_context, "%lu", 2, "charger", "ntc", ntc_mpct);
+    }
+
+    furi_string_free(key);
     furi_string_free(value);
+
+    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
 }

+ 4 - 11
firmware/targets/furi_hal_include/furi_hal_info.h

@@ -7,27 +7,20 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <core/string.h>
+#include <toolbox/property.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** Callback type called every time another key-value pair of device information is ready
- *
- * @param      key[in]      device information type identifier
- * @param      value[in]    device information value
- * @param      last[in]     whether the passed key-value pair is the last one
- * @param      context[in]  to pass to callback
- */
-typedef void (
-    *FuriHalInfoValueCallback)(const char* key, const char* value, bool last, void* context);
-
 /** Get device information
  *
  * @param[in]  callback     callback to provide with new data
+ * @param[in]  sep          category separator character
  * @param[in]  context      context to pass to callback
  */
-void furi_hal_info_get(FuriHalInfoValueCallback callback, void* context);
+void furi_hal_info_get(PropertyValueCallback callback, char sep, void* context);
 
 #ifdef __cplusplus
 }

+ 9 - 13
firmware/targets/furi_hal_include/furi_hal_power.h

@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <core/string.h>
+#include <toolbox/property.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -167,10 +169,6 @@ float furi_hal_power_get_battery_temperature(FuriHalPowerIC ic);
  */
 float furi_hal_power_get_usb_voltage();
 
-/** Get power system component state
- */
-void furi_hal_power_dump_state();
-
 /** Enable 3.3v on external gpio and sd card
  */
 void furi_hal_power_enable_external_3_3v();
@@ -189,22 +187,20 @@ void furi_hal_power_suppress_charge_enter();
  */
 void furi_hal_power_suppress_charge_exit();
 
-/** Callback type called by furi_hal_power_info_get every time another key-value pair of information is ready
+/** Get power information
  *
- * @param      key[in]      power information type identifier
- * @param      value[in]    power information value
- * @param      last[in]     whether the passed key-value pair is the last one
- * @param      context[in]  to pass to callback
+ * @param[in]  callback     callback to provide with new data
+ * @param[in]  sep          category separator character
+ * @param[in]  context      context to pass to callback
  */
-typedef void (
-    *FuriHalPowerInfoCallback)(const char* key, const char* value, bool last, void* context);
+void furi_hal_power_info_get(PropertyValueCallback callback, char sep, void* context);
 
-/** Get power information
+/** Get power debug information
  *
  * @param[in]  callback     callback to provide with new data
  * @param[in]  context      context to pass to callback
  */
-void furi_hal_power_info_get(FuriHalPowerInfoCallback callback, void* context);
+void furi_hal_power_debug_get(PropertyValueCallback callback, void* context);
 
 #ifdef __cplusplus
 }

+ 33 - 0
lib/toolbox/property.c

@@ -0,0 +1,33 @@
+#include "property.h"
+
+#include <core/check.h>
+
+void property_value_out(PropertyValueContext* ctx, const char* fmt, unsigned int nparts, ...) {
+    furi_assert(ctx);
+    furi_string_reset(ctx->key);
+
+    va_list args;
+    va_start(args, nparts);
+
+    for(size_t i = 0; i < nparts; ++i) {
+        const char* keypart = va_arg(args, const char*);
+        furi_string_cat(ctx->key, keypart);
+        if(i < nparts - 1) {
+            furi_string_push_back(ctx->key, ctx->sep);
+        }
+    }
+
+    const char* value_str;
+
+    if(fmt) {
+        furi_string_vprintf(ctx->value, fmt, args);
+        value_str = furi_string_get_cstr(ctx->value);
+    } else {
+        // C string passthrough (no formatting)
+        value_str = va_arg(args, const char*);
+    }
+
+    va_end(args);
+
+    ctx->out(furi_string_get_cstr(ctx->key), value_str, ctx->last, ctx->context);
+}

+ 39 - 0
lib/toolbox/property.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <core/string.h>
+
+/** Callback type called every time another key-value pair of device information is ready
+ *
+ * @param      key[in]      device information type identifier
+ * @param      value[in]    device information value
+ * @param      last[in]     whether the passed key-value pair is the last one
+ * @param      context[in]  to pass to callback
+ */
+typedef void (*PropertyValueCallback)(const char* key, const char* value, bool last, void* context);
+
+typedef struct {
+    FuriString* key; /**< key string buffer, must be initialised before use */
+    FuriString* value; /**< value string buffer, must be initialised before use */
+    PropertyValueCallback out; /**< output callback function */
+    char sep; /**< separator character between key parts */
+    bool last; /**< flag to indicate last element */
+    void* context; /**< user-defined context, passed through to out callback */
+} PropertyValueContext;
+
+/** Builds key and value strings and outputs them via a callback function
+ *
+ * @param       ctx[in]     local property context
+ * @param       fmt[in]     value format, set to NULL to bypass formatting
+ * @param       nparts[in]  number of key parts (separated by character)
+ * @param       ...[in]     list of key parts followed by value
+ */
+void property_value_out(PropertyValueContext* ctx, const char* fmt, unsigned int nparts, ...);
+
+#ifdef __cplusplus
+}
+#endif