Procházet zdrojové kódy

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

Co-authored-by: hedger <hedger@users.noreply.github.com>
あく před 3 roky
rodič
revize
6ee2c15854

+ 3 - 1
applications/about/about.c

@@ -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");

+ 2 - 1
applications/desktop/views/desktop_view_debug.c

@@ -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 - 0
firmware/targets/f7/furi_hal/furi_hal_version.c

@@ -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 - 0
firmware/targets/furi_hal_include/furi_hal_version.h

@@ -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 */