Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove "Flipper" from BT name + formatting

Browse Source
This commit is contained in:
VerstreuteSeele
2023-01-16 04:29:26 +01:00
parent 948b952308
commit 35befd07c4
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/services/dolphin/helpers/dolphin_state.c
View File

@@ -101,7 +101,7 @@ uint8_t dolphin_get_level(int icounter) {
uint32_t dolphin_state_xp_above_last_levelup(int icounter) {
for(int i = 1; i < 29; ++i) {
if (icounter <= level_array[i]) {
if(icounter <= level_array[i]) {
return icounter - level_array[i - 1];
}
}

7
applications/settings/dolphin_passport/passport.c
View File

@@ -100,7 +100,7 @@ static void render_callback(Canvas* canvas, void* _ctx) {
if(stats->level == 30) {
xp_progress = 0;
} else {
if (ctx->progress_total) {
if(ctx->progress_total) {
xp_progress = stats->icounter * 64 / xp_next_level;
} else {
xp_progress = xp_to_levelup * 64 / xp_for_current_level;
@@ -125,7 +125,7 @@ static void render_callback(Canvas* canvas, void* _ctx) {
const char* my_name = furi_hal_version_get_name_ptr();
snprintf(level_str, 12, "Level: %hu", stats->level);
if (ctx->progress_total) {
if(ctx->progress_total) {
snprintf(xp_str, 12, "%lu/%lu", stats->icounter, xp_next_level);
} else {
snprintf(xp_str, 12, "%lu/%lu", xp_above_last_levelup, xp_for_current_level);
@@ -145,7 +145,8 @@ static void render_callback(Canvas* canvas, void* _ctx) {
canvas_set_color(canvas, ColorBlack);
canvas_draw_icon(canvas, 52, 51, &I_Ok_btn_9x9);
canvas_draw_str(canvas, ctx->progress_total ? 37 : 36, 59, ctx->progress_total ? "Lvl" : "Tot");
canvas_draw_str(
canvas, ctx->progress_total ? 37 : 36, 59, ctx->progress_total ? "Lvl" : "Tot");
free(settings);
}

7
firmware/targets/f7/furi_hal/furi_hal_version.c
View File

@@ -94,7 +94,10 @@ void furi_hal_version_set_custom_name(const char* name) {
if((name != NULL) && ((strlen(name) >= 1) && (strlen(name) <= 8))) {
strlcpy(furi_hal_version.name, name, FURI_HAL_VERSION_ARRAY_NAME_LENGTH);
snprintf(
furi_hal_version.device_name, FURI_HAL_VERSION_DEVICE_NAME_LENGTH, "xFlipper %s", name);
furi_hal_version.device_name,
FURI_HAL_VERSION_DEVICE_NAME_LENGTH,
"x%s", // Someone tell me why that X is needed
name);
furi_hal_version.device_name[0] = AD_TYPE_COMPLETE_LOCAL_NAME;
}
@@ -106,7 +109,7 @@ static void furi_hal_version_set_name(const char* name) {
snprintf(
furi_hal_version.device_name,
FURI_HAL_VERSION_DEVICE_NAME_LENGTH,
"xFlipper %s",
"x%s", // Someone tell me why that X is needed
furi_hal_version.name);
} else {
snprintf(furi_hal_version.device_name, FURI_HAL_VERSION_DEVICE_NAME_LENGTH, "xFlipper");

1
lib/subghz/subghz_worker.h
View File

@@ -75,7 +75,6 @@ bool subghz_worker_is_running(SubGhzWorker* instance);
*/
void subghz_worker_set_filter(SubGhzWorker* instance, uint16_t timeout);
#ifdef __cplusplus
}
#endif