liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FuriHal,About,Desktop: show provisioned region (#1589)

Browse Source 
Co-authored-by: hedger <hedger@users.noreply.github.com>
This commit is contained in:
あく 2022-08-12 19:19:29 +09:00 committed by GitHub
parent 1db7632041
commit 6ee2c15854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/about/about.c
View File

@ -5,6 +5,7 @@
#include <gui/modules/empty_screen.h> #include <gui/modules/empty_screen.h>
#include <m-string.h> #include <m-string.h>
#include <furi_hal_version.h> #include <furi_hal_version.h>
#include <furi_hal_region.h>
#include <furi_hal_bt.h> #include <furi_hal_bt.h>
typedef DialogMessageButton (*AboutDialogScreen)(DialogsApp* dialogs, DialogMessage* message); typedef DialogMessageButton (*AboutDialogScreen)(DialogsApp* dialogs, DialogMessage* message);
@ -83,12 +84,13 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
string_cat_printf( string_cat_printf(
buffer, buffer,
"%d.F%dB%dC%d %s %s\n", "%d.F%dB%dC%d %s:%s %s\n",
furi_hal_version_get_hw_version(), furi_hal_version_get_hw_version(),
furi_hal_version_get_hw_target(), furi_hal_version_get_hw_target(),
furi_hal_version_get_hw_body(), furi_hal_version_get_hw_body(),
furi_hal_version_get_hw_connect(), furi_hal_version_get_hw_connect(),
furi_hal_version_get_hw_region_name(), furi_hal_version_get_hw_region_name(),
furi_hal_region_get_name(),
my_name ? my_name : "Unknown"); my_name ? my_name : "Unknown");
string_cat_printf(buffer, "Serial Number:\n"); string_cat_printf(buffer, "Serial Number:\n");

3
applications/desktop/views/desktop_view_debug.c
View File

@ -36,12 +36,13 @@ void desktop_debug_render(Canvas* canvas, void* model) {
snprintf( snprintf(
buffer, buffer,
sizeof(buffer), sizeof(buffer),
"%d.F%dB%dC%d %s %s", "%d.F%dB%dC%d %s:%s %s",
furi_hal_version_get_hw_version(), furi_hal_version_get_hw_version(),
furi_hal_version_get_hw_target(), furi_hal_version_get_hw_target(),
furi_hal_version_get_hw_body(), furi_hal_version_get_hw_body(),
furi_hal_version_get_hw_connect(), furi_hal_version_get_hw_connect(),
furi_hal_version_get_hw_region_name(), furi_hal_version_get_hw_region_name(),
furi_hal_region_get_name(),
my_name ? my_name : "Unknown"); my_name ? my_name : "Unknown");
canvas_draw_str(canvas, 5, 19 + STATUS_BAR_Y_SHIFT, buffer); canvas_draw_str(canvas, 5, 19 + STATUS_BAR_Y_SHIFT, buffer);

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

@ -262,6 +262,8 @@ const char* furi_hal_version_get_hw_region_name() {
return "R02"; return "R02";
case FuriHalVersionRegionJp: case FuriHalVersionRegionJp:
return "R03"; return "R03";
case FuriHalVersionRegionWorld:
return "R04";
} }
return "R??"; return "R??";
} }

1
firmware/targets/furi_hal_include/furi_hal_version.h
View File

@ -41,6 +41,7 @@ typedef enum {
FuriHalVersionRegionEuRu = 0x01, FuriHalVersionRegionEuRu = 0x01,
FuriHalVersionRegionUsCaAu = 0x02, FuriHalVersionRegionUsCaAu = 0x02,
FuriHalVersionRegionJp = 0x03, FuriHalVersionRegionJp = 0x03,
FuriHalVersionRegionWorld = 0x04,
} FuriHalVersionRegion; } FuriHalVersionRegion;
/** Device Display */ /** Device Display */