diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c index cd2bd9cd7..e0e5dbe60 100644 --- a/applications/services/dolphin/helpers/dolphin_state.c +++ b/applications/services/dolphin/helpers/dolphin_state.c @@ -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]; } } diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index 6de7c3502..914f7ef0e 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -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); } diff --git a/firmware/targets/f7/furi_hal/furi_hal_version.c b/firmware/targets/f7/furi_hal/furi_hal_version.c index e59cbd040..418dda10a 100644 --- a/firmware/targets/f7/furi_hal/furi_hal_version.c +++ b/firmware/targets/f7/furi_hal/furi_hal_version.c @@ -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"); diff --git a/lib/subghz/subghz_worker.h b/lib/subghz/subghz_worker.h index 220c6aeb5..657278f50 100644 --- a/lib/subghz/subghz_worker.h +++ b/lib/subghz/subghz_worker.h @@ -75,7 +75,6 @@ bool subghz_worker_is_running(SubGhzWorker* instance); */ void subghz_worker_set_filter(SubGhzWorker* instance, uint16_t timeout); - #ifdef __cplusplus } #endif