Merge pull request #502 from ClaraCrazy/dev

Add furi_hal_version_uid_default (Fix TOTP)
DarkFlippers · Jun 4, 2023 · a7a51b7 · a7a51b7
2 parents 75ee4ef + a12f563
commit a7a51b7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,28.2,,
+Version,+,28.3,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1481,6 +1481,7 @@ Function,+,furi_hal_version_get_otp_version,FuriHalVersionOtpVersion,
 Function,-,furi_hal_version_init,void,
 Function,-,furi_hal_version_set_name,void,const char*
 Function,+,furi_hal_version_uid,const uint8_t*,
+Function,+,furi_hal_version_uid_default,const uint8_t*,
 Function,+,furi_hal_version_uid_size,size_t,
 Function,-,furi_hal_vibro_init,void,
 Function,+,furi_hal_vibro_on,void,_Bool

diff --git a/firmware/targets/f7/furi_hal/furi_hal_version.c b/firmware/targets/f7/furi_hal/furi_hal_version.c
@@ -314,6 +314,10 @@ size_t furi_hal_version_uid_size() {
     return 64 / 8;
 }
 
+const uint8_t* furi_hal_version_uid_default() {
+    return (const uint8_t*)UID64_BASE;
+}
+
 const uint8_t* furi_hal_version_uid() {
     if(version_get_custom_name(NULL) != NULL) {
         return (const uint8_t*)&(*((uint32_t*)version_get_custom_name(NULL)));

diff --git a/firmware/targets/furi_hal_include/furi_hal_version.h b/firmware/targets/furi_hal_include/furi_hal_version.h
@@ -204,6 +204,8 @@ size_t furi_hal_version_uid_size();
  */
 const uint8_t* furi_hal_version_uid();
 
+const uint8_t* furi_hal_version_uid_default();
+
 #ifdef __cplusplus
 }
 #endif