[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>
This commit is contained in:
Georgii Surkov
GitHub
@@ -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"
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user