From 0195f8bf0044ec913e07b8ad34e449fd3e0f73cb Mon Sep 17 00:00:00 2001
From: Astra <93453568+Astrrra@users.noreply.github.com>
Date: Mon, 10 Jul 2023 09:48:00 +0300
Subject: [PATCH] [FL-3350] Device Info update (#2840)

* Update F18 version info
* Certification info for F18

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
---
 applications/settings/about/about.c              |   4 +++-
 assets/icons/About/Certification2_46x33.png      | Bin 0 -> 229 bytes
 assets/icons/About/Certification2_98x33.png      | Bin 2495 -> 0 bytes
 firmware/targets/f18/api_symbols.csv             |   3 ++-
 .../f18/furi_hal/furi_hal_version_device.c       |  12 ++++++++----
 firmware/targets/f7/api_symbols.csv              |   3 ++-
 .../f7/furi_hal/furi_hal_version_device.c        |   4 ++++
 .../targets/furi_hal_include/furi_hal_version.h  |   6 ++++++
 8 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 assets/icons/About/Certification2_46x33.png
 delete mode 100644 assets/icons/About/Certification2_98x33.png

diff --git a/applications/settings/about/about.c b/applications/settings/about/about.c
index 688103306..55bd43e5c 100644
--- a/applications/settings/about/about.c
+++ b/applications/settings/about/about.c
@@ -82,7 +82,9 @@ static DialogMessageButton icon1_screen(DialogsApp* dialogs, DialogMessage* mess
 static DialogMessageButton icon2_screen(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_Certification2_98x33, 15, 10);
+    dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10);
+    dialog_message_set_text(
+        message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter);
     result = dialog_message_show(dialogs, message);
     dialog_message_set_icon(message, NULL, 0, 0);
 
diff --git a/assets/icons/About/Certification2_46x33.png b/assets/icons/About/Certification2_46x33.png
new file mode 100644
index 0000000000000000000000000000000000000000..d421b829149518d4d379b03d76881f88706c3e87
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^dO)nm!3-oP8fIPqQfvV}A+G=b{|7Qd4_&SUQnNf=
z978H@t(g+YcR+!|`Qg9maYoZ4y+u8qcz^6{V@k`gJEQe1Lp5T}_AiC!OOBS>-1;=T
zdEV~dE9_2v2<2Pid?=n_o3MCO-A5)qmHYo@Jp3jwB`^7eym+fxoxz8QtS6Qam1Y|!
zr_NbyeOvU-CA$l&z7_nH6v>?!`zVuf^AS(s0M|6%%_#=?UdNv<wY)qx>8|9>xd*oX
c{KsLyP+HH}pmOhIG0>F^p00i_>zopr08YJL$p8QV

literal 0
HcmV?d00001

diff --git a/assets/icons/About/Certification2_98x33.png b/assets/icons/About/Certification2_98x33.png
deleted file mode 100644
index 49c5581c7523f2956fda218cfa9c048cf1998ef5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2495
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
HuWa}qA-#%F

diff --git a/firmware/targets/f18/api_symbols.csv b/firmware/targets/f18/api_symbols.csv
index 62b237a51..5704870c9 100644
--- a/firmware/targets/f18/api_symbols.csv
+++ b/firmware/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,33.1,,
+Version,+,33.2,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1263,6 +1263,7 @@ Function,+,furi_hal_version_get_hw_target,uint8_t,
 Function,+,furi_hal_version_get_hw_timestamp,uint32_t,
 Function,+,furi_hal_version_get_hw_version,uint8_t,
 Function,+,furi_hal_version_get_ic_id,const char*,
+Function,+,furi_hal_version_get_mic_id,const char*,
 Function,+,furi_hal_version_get_model_code,const char*,
 Function,+,furi_hal_version_get_model_name,const char*,
 Function,+,furi_hal_version_get_name_ptr,const char*,
diff --git a/firmware/targets/f18/furi_hal/furi_hal_version_device.c b/firmware/targets/f18/furi_hal/furi_hal_version_device.c
index 1b5090b93..e038b98d7 100644
--- a/firmware/targets/f18/furi_hal/furi_hal_version_device.c
+++ b/firmware/targets/f18/furi_hal/furi_hal_version_device.c
@@ -5,17 +5,21 @@ bool furi_hal_version_do_i_belong_here() {
 }
 
 const char* furi_hal_version_get_model_name() {
-    return "Komi";
+    return "Flipper Nano";
 }
 
 const char* furi_hal_version_get_model_code() {
-    return "N/A";
+    return "FN.1";
 }
 
 const char* furi_hal_version_get_fcc_id() {
-    return "N/A";
+    return "Pending";
 }
 
 const char* furi_hal_version_get_ic_id() {
-    return "N/A";
+    return "Pending";
+}
+
+const char* furi_hal_version_get_mic_id() {
+    return "Pending";
 }
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index ffbc0104b..29739abb5 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,33.1,,
+Version,+,33.2,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1427,6 +1427,7 @@ Function,+,furi_hal_version_get_hw_target,uint8_t,
 Function,+,furi_hal_version_get_hw_timestamp,uint32_t,
 Function,+,furi_hal_version_get_hw_version,uint8_t,
 Function,+,furi_hal_version_get_ic_id,const char*,
+Function,+,furi_hal_version_get_mic_id,const char*,
 Function,+,furi_hal_version_get_model_code,const char*,
 Function,+,furi_hal_version_get_model_name,const char*,
 Function,+,furi_hal_version_get_name_ptr,const char*,
diff --git a/firmware/targets/f7/furi_hal/furi_hal_version_device.c b/firmware/targets/f7/furi_hal/furi_hal_version_device.c
index c059c2cbe..be3f4bf3f 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_version_device.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_version_device.c
@@ -19,3 +19,7 @@ const char* furi_hal_version_get_fcc_id() {
 const char* furi_hal_version_get_ic_id() {
     return "27624-FZ";
 }
+
+const char* furi_hal_version_get_mic_id() {
+    return "210-175991";
+}
diff --git a/firmware/targets/furi_hal_include/furi_hal_version.h b/firmware/targets/furi_hal_include/furi_hal_version.h
index aec4fc787..a9339a6c0 100644
--- a/firmware/targets/furi_hal_include/furi_hal_version.h
+++ b/firmware/targets/furi_hal_include/furi_hal_version.h
@@ -85,6 +85,12 @@ const char* furi_hal_version_get_fcc_id();
  */
 const char* furi_hal_version_get_ic_id();
 
+/** Get MIC id
+ *
+ * @return     MIC id as C-string
+ */
+const char* furi_hal_version_get_mic_id();
+
 /** Get OTP version
  *
  * @return     OTP Version