Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SD info: Add dynamic units and free % #1634

Closed
wants to merge 3 commits into from
Closed

SD info: Add dynamic units and free % #1634

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0054453
SD info: Add dynamic units and free %
non-bin Aug 22, 2022
d25d75d
SD Info: Fix errors and change to 2 decimal precision
non-bin Aug 22, 2022
eb71665
Merge branch 'dev' into SDinfo
skotopes Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions applications/storage_settings/scenes/storage_settings_scene_sd_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,44 @@ void storage_settings_scene_sd_info_on_enter(void* context) {
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
dialog_ex_set_center_button_text(dialog_ex, "Ok");
} else {
char unit_kb[] = "KB";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to put it in ram, use const.

char unit_mb[] = "MB";
char unit_gb[] = "GB";

double sd_total_val = (double)sd_info.kb_total;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using float point math here is kinda overkill.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Especially using double. Float should be more than enough, use cast at the last moment when passing it to string_printf.

char* sd_total_unit = unit_kb;
double sd_free_val = (double)sd_info.kb_free;
char* sd_free_unit = unit_kb;

if(sd_total_val > 1024) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better solution will be to implement formatting function that takes double* and const char**

sd_total_val /= 1024;
sd_total_unit = unit_mb;
}
if(sd_total_val > 1024) {
sd_total_val /= 1024;
sd_total_unit = unit_gb;
}

if(sd_free_val > 1024) {
sd_free_val /= 1024;
sd_free_unit = unit_mb;
}
if(sd_free_val > 1024) {
sd_free_val /= 1024;
sd_free_unit = unit_gb;
}

string_printf(
app->text_string,
"Label: %s\nType: %s\n%lu KB total\n%lu KB free",
"Label: %s\nType: %s\n%.2f %s total\n%.2f %s free\n%lu%% free",
sd_info.label,
sd_api_get_fs_type_text(sd_info.fs_type),
sd_info.kb_total,
sd_info.kb_free);
sd_total_val,
sd_total_unit,
sd_free_val,
sd_free_unit,
(sd_info.kb_free * 100) / sd_info.kb_total);

dialog_ex_set_text(
dialog_ex, string_get_cstr(app->text_string), 4, 4, AlignLeft, AlignTop);
}
Expand Down