mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

Merge branch 'ofw_dev' into dev

Browse Source
This commit is contained in:
MX
2024-01-11 17:10:11 +03:00
parent c85e1305c0 34539cda17
commit b757544ede
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/plugins/supported_cards/washcity.c
View File

@@ -161,7 +161,7 @@ static bool washcity_parse(const NfcDevice* device, FuriString* parsed_data) {
furi_string_printf(
parsed_data,
"\e#WashCity\nCard number: %0*llX\nBalance: %lu.%02u USD",
"\e#WashCity\nCard number: %0*llX\nBalance: %lu.%02u EUR",
uid_len * 2,
card_number,
balance_usd,

5
applications/main/nfc/scenes/nfc_scene_mf_ultralight_write_success.c
View File

@@ -28,8 +28,11 @@ bool nfc_scene_mf_ultralight_write_success_on_event(void* context, SceneManagerE
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == NfcCustomEventViewExit) {
bool was_saved =
scene_manager_has_previous_scene(instance->scene_manager, NfcSceneSavedMenu);
consumed = scene_manager_search_and_switch_to_previous_scene(
instance->scene_manager, NfcSceneSavedMenu);
instance->scene_manager, was_saved ? NfcSceneSavedMenu : NfcSceneReadSuccess);
}
}
return consumed;

2
scripts/ufbt/SConstruct
View File

@@ -365,7 +365,7 @@ for template_file in project_template_dir.Dir(".vscode").glob("*"):
"@UFBT_TOOLCHAIN_OPENOCD@": _path_as_posix(dist_env.WhereIs("openocd")),
"@UFBT_APP_DIR@": _path_as_posix(original_app_dir.abspath),
"@UFBT_ROOT_DIR@": _path_as_posix(Dir("#").abspath),
"@UFBT_DEBUG_DIR@": dist_env["FBT_DEBUG_DIR"],
"@UFBT_DEBUG_DIR@": _path_as_posix(dist_env["FBT_DEBUG_DIR"].abspath),
"@UFBT_DEBUG_ELF_DIR@": _path_as_posix(
dist_env["FBT_FAP_DEBUG_ELF_ROOT"].abspath
),

2
scripts/ufbt/project_template/.vscode/c_cpp_properties.json vendored
View File

@@ -8,7 +8,7 @@
"configurationProvider": "ms-vscode.cpptools",
"cStandard": "gnu17",
"cppStandard": "c++17"
},
}
],
"version": 4
}

4
scripts/ufbt/project_template/.vscode/extensions.json vendored
View File

@@ -1,3 +1,7 @@
// This file is autogeneated by the ufbt.
// You can modify it, and it will not be overwritten if exists.
// Some paths are absolute, and will need to be updated if you move the project.
// To regenerate the file, delete it and run `ufbt vscode_dist` again.
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

4
scripts/ufbt/project_template/.vscode/launch.json vendored
View File

@@ -1,3 +1,7 @@
// This file is autogeneated by the ufbt.
// You can modify it, and it will not be overwritten if exists.
// Some paths are absolute, and will need to be updated if you move the project.
// To regenerate the file, delete it and run `ufbt vscode_dist` again.
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",

4
scripts/ufbt/project_template/.vscode/settings.json vendored
View File

@@ -1,3 +1,7 @@
// This file is autogeneated by the ufbt.
// You can modify it, and it will not be overwritten if exists.
// Some paths are absolute, and will need to be updated if you move the project.
// To regenerate the file, delete it and run `ufbt vscode_dist` again.
{
"cortex-debug.enableTelemetry": false,
"cortex-debug.variableUseNaturalFormat": false,

4
scripts/ufbt/project_template/.vscode/tasks.json vendored
View File

@@ -1,3 +1,7 @@
// This file is autogeneated by the ufbt.
// You can modify it, and it will not be overwritten if exists.
// Some paths are absolute, and will need to be updated if you move the project.
// To regenerate the file, delete it and run `ufbt vscode_dist` again.
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format