Merge branch 'UNLEASHED' into 420

2026-07-23 01:18:12 -07:00 · 2022-11-29 12:38:01 -05:00
parent eb0358f843 eec21b073b
commit b4656d801b
47 changed files with 1870 additions and 450 deletions
@@ -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,,
@@ -1147,7 +1147,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*"
@@ -1212,10 +1212,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,
@@ -1228,7 +1228,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,
@@ -2113,6 +2113,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"
@@ -2366,10 +2367,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"
@@ -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);
 }
@@ -81,6 +81,10 @@ void furi_hal_memory_init() {
 }

 void* furi_hal_memory_alloc(size_t size) {
+    if(FURI_IS_IRQ_MODE()) {
+        furi_crash("memmgt in ISR");
+    }
+
    if(furi_hal_memory == NULL) {
        return NULL;
    }
@@ -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};
+
+    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");
+    }

    uint8_t charge = furi_hal_power_get_pct();
+    property_value_out(&property_context, "%u", 2, "charge", "level", charge);

-    furi_string_printf(value, "%u", charge);
-    out("charge_level", furi_string_get_cstr(value), false, context);
-
+    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);
-
-    furi_string_printf(value, "%u", furi_hal_power_get_bat_health_pct());
-    out("battery_health", furi_string_get_cstr(value), false, context);
-
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_remaining_capacity());
-    out("capacity_remain", furi_string_get_cstr(value), false, context);
-
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_full_capacity());
-    out("capacity_full", furi_string_get_cstr(value), false, context);
-
-    furi_string_printf(value, "%lu", furi_hal_power_get_battery_design_capacity());
-    out("capacity_design", furi_string_get_cstr(value), true, 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_hal_i2c_acquire(&furi_hal_i2c_handle_power);
+
+    // 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);
+
+        // 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);
+
+        // 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,6 +4,7 @@
 #include <furi_hal_power.h>
 #include <stm32wbxx_ll_pwr.h>
 #include <furi.h>
+#include <toolbox/api_lock.h>

 #include "usb.h"

@@ -11,35 +12,67 @@

 #define USB_RECONNECT_DELAY 500

+typedef enum {
+    UsbApiEventTypeSetConfig,
+    UsbApiEventTypeGetConfig,
+    UsbApiEventTypeLock,
+    UsbApiEventTypeUnlock,
+    UsbApiEventTypeIsLocked,
+    UsbApiEventTypeEnable,
+    UsbApiEventTypeDisable,
+    UsbApiEventTypeReinit,
+    UsbApiEventTypeSetStateCallback,
+} UsbApiEventType;
+
+typedef struct {
+    FuriHalUsbStateCallback callback;
+    void* context;
+} UsbApiEventDataStateCallback;
+
+typedef struct {
+    FuriHalUsbInterface* interface;
+    void* context;
+} UsbApiEventDataInterface;
+
+typedef union {
+    UsbApiEventDataStateCallback state_callback;
+    UsbApiEventDataInterface interface;
+} UsbApiEventData;
+
+typedef union {
+    bool bool_value;
+    void* void_value;
+} UsbApiEventReturnData;
+
+typedef struct {
+    FuriApiLock lock;
+    UsbApiEventType type;
+    UsbApiEventData data;
+    UsbApiEventReturnData* return_data;
+} UsbApiEventMessage;
+
 typedef struct {
    FuriThread* thread;
+    FuriMessageQueue* queue;
    bool enabled;
    bool connected;
    bool mode_lock;
-    FuriHalUsbInterface* if_cur;
-    FuriHalUsbInterface* if_next;
-    void* if_ctx;
+    bool request_pending;
+    FuriHalUsbInterface* interface;
+    void* interface_context;
    FuriHalUsbStateCallback callback;
-    void* cb_ctx;
+    void* callback_context;
 } UsbSrv;

 typedef enum {
-    EventModeChange = (1 << 0),
-    EventEnable = (1 << 1),
-    EventDisable = (1 << 2),
-    EventReinit = (1 << 3),
-
-    EventReset = (1 << 4),
-    EventRequest = (1 << 5),
-
-    EventModeChangeStart = (1 << 6),
+    UsbEventReset = (1 << 0),
+    UsbEventRequest = (1 << 1),
+    UsbEventMessage = (1 << 2),
 } UsbEvent;

-#define USB_SRV_ALL_EVENTS                                                                    \
-    (EventModeChange | EventEnable | EventDisable | EventReinit | EventReset | EventRequest | \
-     EventModeChangeStart)
+#define USB_SRV_ALL_EVENTS (UsbEventReset | UsbEventRequest | UsbEventMessage)

-static UsbSrv usb;
+PLACE_IN_SECTION("MB_MEM2") static UsbSrv usb = {0};

 static const struct usb_string_descriptor dev_lang_desc = USB_ARRAY_DESC(USB_LANGID_ENG_US);

@@ -74,12 +107,13 @@ void furi_hal_usb_init(void) {
    // Reset callback will be enabled after first mode change to avoid getting false reset events

    usb.enabled = false;
-    usb.if_cur = NULL;
+    usb.interface = NULL;
    NVIC_SetPriority(USB_LP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 5, 0));
    NVIC_SetPriority(USB_HP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 15, 0));
    NVIC_EnableIRQ(USB_LP_IRQn);
    NVIC_EnableIRQ(USB_HP_IRQn);

+    usb.queue = furi_message_queue_alloc(1, sizeof(UsbApiEventMessage));
    usb.thread = furi_thread_alloc_ex("UsbDriver", 1024, furi_hal_usb_thread, NULL);
    furi_thread_mark_as_service(usb.thread);
    furi_thread_start(usb.thread);
@@ -87,53 +121,119 @@ void furi_hal_usb_init(void) {
    FURI_LOG_I(TAG, "Init OK");
 }

-bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
-    if(usb.mode_lock) {
-        return false;
-    }
+static void furi_hal_usb_send_message(UsbApiEventMessage* message) {
+    furi_message_queue_put(usb.queue, message, FuriWaitForever);
+    furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
+    api_lock_wait_unlock_and_free(message->lock);
+}

-    usb.if_next = new_if;
-    usb.if_ctx = ctx;
-    if(usb.thread == NULL) {
-        // Service thread hasn't started yet, so just save interface mode
-        return true;
-    }
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventModeChange);
-    return true;
+bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
+    UsbApiEventReturnData return_data = {
+        .bool_value = false,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeSetConfig,
+        .data.interface =
+            {
+                .interface = new_if,
+                .context = ctx,
+            },
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.bool_value;
 }

 FuriHalUsbInterface* furi_hal_usb_get_config() {
-    return usb.if_cur;
+    UsbApiEventReturnData return_data = {
+        .void_value = NULL,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeGetConfig,
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.void_value;
 }

 void furi_hal_usb_lock() {
-    FURI_LOG_I(TAG, "Mode lock");
-    usb.mode_lock = true;
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeLock,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }

 void furi_hal_usb_unlock() {
-    FURI_LOG_I(TAG, "Mode unlock");
-    usb.mode_lock = false;
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeUnlock,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }

 bool furi_hal_usb_is_locked() {
-    return usb.mode_lock;
+    UsbApiEventReturnData return_data = {
+        .bool_value = false,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeIsLocked,
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.bool_value;
 }

 void furi_hal_usb_disable() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventDisable);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeDisable,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }

 void furi_hal_usb_enable() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventEnable);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeEnable,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }

 void furi_hal_usb_reinit() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventReinit);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeReinit,
+    };
+
+    furi_hal_usb_send_message(&msg);
+}
+
+void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeSetStateCallback,
+        .data.state_callback =
+            {
+                .callback = cb,
+                .context = ctx,
+            },
+    };
+
+    furi_hal_usb_send_message(&msg);
 }

 /* Get device / configuration descriptors */
@@ -142,29 +242,29 @@ static usbd_respond usb_descriptor_get(usbd_ctlreq* req, void** address, uint16_
    const uint8_t dnumber = req->wValue & 0xFF;
    const void* desc;
    uint16_t len = 0;
-    if(usb.if_cur == NULL) return usbd_fail;
+    if(usb.interface == NULL) return usbd_fail;

    switch(dtype) {
    case USB_DTYPE_DEVICE:
-        furi_thread_flags_set(furi_thread_get_id(usb.thread), EventRequest);
+        furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventRequest);
        if(usb.callback != NULL) {
-            usb.callback(FuriHalUsbStateEventDescriptorRequest, usb.cb_ctx);
+            usb.callback(FuriHalUsbStateEventDescriptorRequest, usb.callback_context);
        }
-        desc = usb.if_cur->dev_descr;
+        desc = usb.interface->dev_descr;
        break;
    case USB_DTYPE_CONFIGURATION:
-        desc = usb.if_cur->cfg_descr;
-        len = ((struct usb_string_descriptor*)(usb.if_cur->cfg_descr))->wString[0];
+        desc = usb.interface->cfg_descr;
+        len = ((struct usb_string_descriptor*)(usb.interface->cfg_descr))->wString[0];
        break;
    case USB_DTYPE_STRING:
        if(dnumber == UsbDevLang) {
            desc = &dev_lang_desc;
-        } else if((dnumber == UsbDevManuf) && (usb.if_cur->str_manuf_descr != NULL)) {
-            desc = usb.if_cur->str_manuf_descr;
-        } else if((dnumber == UsbDevProduct) && (usb.if_cur->str_prod_descr != NULL)) {
-            desc = usb.if_cur->str_prod_descr;
-        } else if((dnumber == UsbDevSerial) && (usb.if_cur->str_serial_descr != NULL)) {
-            desc = usb.if_cur->str_serial_descr;
+        } else if((dnumber == UsbDevManuf) && (usb.interface->str_manuf_descr != NULL)) {
+            desc = usb.interface->str_manuf_descr;
+        } else if((dnumber == UsbDevProduct) && (usb.interface->str_prod_descr != NULL)) {
+            desc = usb.interface->str_prod_descr;
+        } else if((dnumber == UsbDevSerial) && (usb.interface->str_serial_descr != NULL)) {
+            desc = usb.interface->str_serial_descr;
        } else
            return usbd_fail;
        break;
@@ -181,18 +281,13 @@ static usbd_respond usb_descriptor_get(usbd_ctlreq* req, void** address, uint16_
    return usbd_ack;
 }

-void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
-    usb.callback = cb;
-    usb.cb_ctx = ctx;
-}
-
 static void reset_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
    UNUSED(dev);
    UNUSED(event);
    UNUSED(ep);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventReset);
+    furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventReset);
    if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventReset, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventReset, usb.callback_context);
    }
 }

@@ -200,14 +295,14 @@ static void susp_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
    UNUSED(dev);
    UNUSED(event);
    UNUSED(ep);
-    if((usb.if_cur != NULL) && (usb.connected == true)) {
+    if((usb.interface != NULL) && (usb.connected == true)) {
        usb.connected = false;
-        usb.if_cur->suspend(&udev);
+        usb.interface->suspend(&udev);

        furi_hal_power_insomnia_exit();
    }
    if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventSuspend, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventSuspend, usb.callback_context);
    }
 }

@@ -215,101 +310,161 @@ static void wkup_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
    UNUSED(dev);
    UNUSED(event);
    UNUSED(ep);
-    if((usb.if_cur != NULL) && (usb.connected == false)) {
+    if((usb.interface != NULL) && (usb.connected == false)) {
        usb.connected = true;
-        usb.if_cur->wakeup(&udev);
+        usb.interface->wakeup(&udev);

        furi_hal_power_insomnia_enter();
    }
    if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventWakeup, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventWakeup, usb.callback_context);
    }
 }

+static void usb_process_mode_start(FuriHalUsbInterface* interface, void* context) {
+    if(usb.interface != NULL) {
+        usb.interface->deinit(&udev);
+    }
+
+    __disable_irq();
+    usb.interface = interface;
+    usb.interface_context = context;
+    __enable_irq();
+
+    if(interface != NULL) {
+        interface->init(&udev, interface, context);
+        usbd_reg_event(&udev, usbd_evt_reset, reset_evt);
+        FURI_LOG_I(TAG, "USB Mode change done");
+        usb.enabled = true;
+    }
+}
+
+static void usb_process_mode_change(FuriHalUsbInterface* interface, void* context) {
+    if(interface != usb.interface) {
+        if(usb.enabled) {
+            // Disable current interface
+            susp_evt(&udev, 0, 0);
+            usbd_connect(&udev, false);
+            usb.enabled = false;
+            furi_delay_ms(USB_RECONNECT_DELAY);
+        }
+        usb_process_mode_start(interface, context);
+    }
+}
+
+static void usb_process_mode_reinit() {
+    // Temporary disable callback to avoid getting false reset events
+    usbd_reg_event(&udev, usbd_evt_reset, NULL);
+    FURI_LOG_I(TAG, "USB Reinit");
+    susp_evt(&udev, 0, 0);
+    usbd_connect(&udev, false);
+    usb.enabled = false;
+
+    usbd_enable(&udev, false);
+    usbd_enable(&udev, true);
+
+    furi_delay_ms(USB_RECONNECT_DELAY);
+    usb_process_mode_start(usb.interface, usb.interface_context);
+}
+
+static bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) {
+    if(usb.mode_lock) {
+        return false;
+    } else {
+        usb_process_mode_change(interface, context);
+        return true;
+    }
+}
+
+static void usb_process_enable(bool enable) {
+    if(enable) {
+        if((!usb.enabled) && (usb.interface != NULL)) {
+            usbd_connect(&udev, true);
+            usb.enabled = true;
+            FURI_LOG_I(TAG, "USB Enable");
+        }
+    } else {
+        if(usb.enabled) {
+            susp_evt(&udev, 0, 0);
+            usbd_connect(&udev, false);
+            usb.enabled = false;
+            usb.request_pending = false;
+            FURI_LOG_I(TAG, "USB Disable");
+        }
+    }
+}
+
+static void usb_process_message(UsbApiEventMessage* message) {
+    switch(message->type) {
+    case UsbApiEventTypeSetConfig:
+        message->return_data->bool_value = usb_process_set_config(
+            message->data.interface.interface, message->data.interface.context);
+        break;
+    case UsbApiEventTypeGetConfig:
+        message->return_data->void_value = usb.interface;
+        break;
+    case UsbApiEventTypeLock:
+        FURI_LOG_I(TAG, "Mode lock");
+        usb.mode_lock = true;
+        break;
+    case UsbApiEventTypeUnlock:
+        FURI_LOG_I(TAG, "Mode unlock");
+        usb.mode_lock = false;
+        break;
+    case UsbApiEventTypeIsLocked:
+        message->return_data->bool_value = usb.mode_lock;
+        break;
+    case UsbApiEventTypeDisable:
+        usb_process_enable(false);
+        break;
+    case UsbApiEventTypeEnable:
+        usb_process_enable(true);
+        break;
+    case UsbApiEventTypeReinit:
+        usb_process_mode_reinit();
+        break;
+    case UsbApiEventTypeSetStateCallback:
+        usb.callback = message->data.state_callback.callback;
+        usb.callback_context = message->data.state_callback.context;
+        break;
+    }
+
+    api_lock_unlock(message->lock);
+}
+
 static int32_t furi_hal_usb_thread(void* context) {
    UNUSED(context);
-    bool usb_request_pending = false;
    uint8_t usb_wait_time = 0;
-    FuriHalUsbInterface* if_new = NULL;
-    FuriHalUsbInterface* if_ctx_new = NULL;

-    if(usb.if_next != NULL) {
-        furi_thread_flags_set(furi_thread_get_id(usb.thread), EventModeChange);
+    if(furi_message_queue_get_count(usb.queue) > 0) {
+        furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
    }

    while(true) {
        uint32_t flags = furi_thread_flags_wait(USB_SRV_ALL_EVENTS, FuriFlagWaitAny, 500);
+
+        {
+            UsbApiEventMessage message;
+            if(furi_message_queue_get(usb.queue, &message, 0) == FuriStatusOk) {
+                usb_process_message(&message);
+            }
+        }
+
        if((flags & FuriFlagError) == 0) {
-            if(flags & EventModeChange) {
-                if(usb.if_next != usb.if_cur) {
-                    if_new = usb.if_next;
-                    if_ctx_new = usb.if_ctx;
-                    if(usb.enabled) { // Disable current interface
-                        susp_evt(&udev, 0, 0);
-                        usbd_connect(&udev, false);
-                        usb.enabled = false;
-                        furi_delay_ms(USB_RECONNECT_DELAY);
-                    }
-                    flags |= EventModeChangeStart;
-                }
-            }
-            if(flags & EventReinit) {
-                // Temporary disable callback to avoid getting false reset events
-                usbd_reg_event(&udev, usbd_evt_reset, NULL);
-                FURI_LOG_I(TAG, "USB Reinit");
-                susp_evt(&udev, 0, 0);
-                usbd_connect(&udev, false);
-                usb.enabled = false;
-
-                usbd_enable(&udev, false);
-                usbd_enable(&udev, true);
-
-                if_new = usb.if_cur;
-                furi_delay_ms(USB_RECONNECT_DELAY);
-                flags |= EventModeChangeStart;
-            }
-            if(flags & EventModeChangeStart) { // Second stage of mode change process
-                if(usb.if_cur != NULL) {
-                    usb.if_cur->deinit(&udev);
-                }
-                if(if_new != NULL) {
-                    if_new->init(&udev, if_new, if_ctx_new);
-                    usbd_reg_event(&udev, usbd_evt_reset, reset_evt);
-                    FURI_LOG_I(TAG, "USB Mode change done");
-                    usb.enabled = true;
-                }
-                usb.if_cur = if_new;
-            }
-            if(flags & EventEnable) {
-                if((!usb.enabled) && (usb.if_cur != NULL)) {
-                    usbd_connect(&udev, true);
-                    usb.enabled = true;
-                    FURI_LOG_I(TAG, "USB Enable");
-                }
-            }
-            if(flags & EventDisable) {
+            if(flags & UsbEventReset) {
                if(usb.enabled) {
-                    susp_evt(&udev, 0, 0);
-                    usbd_connect(&udev, false);
-                    usb.enabled = false;
-                    usb_request_pending = false;
-                    FURI_LOG_I(TAG, "USB Disable");
-                }
-            }
-            if(flags & EventReset) {
-                if(usb.enabled) {
-                    usb_request_pending = true;
+                    usb.request_pending = true;
                    usb_wait_time = 0;
                }
            }
-            if(flags & EventRequest) {
-                usb_request_pending = false;
+            if(flags & UsbEventRequest) {
+                usb.request_pending = false;
            }
-        } else if(usb_request_pending) {
+        } else if(usb.request_pending) {
            usb_wait_time++;
            if(usb_wait_time > 4) {
-                furi_hal_usb_reinit();
-                usb_request_pending = false;
+                usb_process_mode_reinit();
+                usb.request_pending = false;
            }
        }
    }
@@ -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
 }
@@ -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
- *
- * @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
- */
-typedef void (
-    *FuriHalPowerInfoCallback)(const char* key, const char* value, bool last, void* context);
-
 /** Get power 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_power_info_get(PropertyValueCallback callback, char sep, void* context);
+
+/** 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
 }