Use Zephyr UUID

Signed-off-by: Simone Orru <simone.orru@secomind.com>

Author: sorru94

e2e/prj.conf

@@ -187,3 +187,9 @@ CONFIG_THREAD_NAME=y
 # Enable File System and LittleFS
 CONFIG_FILE_SYSTEM=y
 CONFIG_FILE_SYSTEM_LITTLEFS=y
+
+# Enable UUID
+CONFIG_UUID=y
+CONFIG_UUID_V4=y
+CONFIG_UUID_V5=y
+CONFIG_UUID_BASE64=y

lib/edgehog_device/device.c

@@ -22,13 +22,13 @@
 #include "storage_usage.h"
 #include "system_info.h"
 #include "system_status.h"
-#include "uuid.h"
 #include "wifi_scan.h"
 
 #include <stdlib.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/uuid.h>
 
 #include <astarte_device_sdk/device.h>
 #include <astarte_device_sdk/interface.h>
@@ -292,10 +292,16 @@ edgehog_result_t edgehog_device_new(
     }
 
     // Step 5: Initialize the Edgehog device boot ID
-    char boot_id[UUID_STR_LEN + 1] = { 0 };
-    eres = uuid_generate_v4_string(boot_id);
-    if (eres != EDGEHOG_RESULT_OK) {
-        EDGEHOG_LOG_ERR("Unable to generate edgehog boot id");
+    struct uuid boot_id = { 0 };
+    char boot_id_str[UUID_STR_LEN] = { 0 };
+    int res = uuid_generate_v4(&boot_id);
+    if (res != 0) {
+        EDGEHOG_LOG_ERR("Unable to generate Edgehog boot ID");
+        goto failure;
+    }
+    res = uuid_to_string(&boot_id, boot_id_str);
+    if (res != 0) {
+        EDGEHOG_LOG_ERR("Unable to generate Edgehog boot ID");
         goto failure;
     }
 
@@ -338,7 +344,7 @@ edgehog_result_t edgehog_device_new(
 
     k_sem_init(&edgehog_device->sync_ota_ft_sem, 1, 1);
 
-    memcpy(edgehog_device->boot_id, boot_id, UUID_STR_LEN + 1);
+    memcpy(edgehog_device->boot_id, boot_id_str, UUID_STR_LEN);
     *edgehog_handle = edgehog_device;
 
     // Step 8: Initialize the WiFi scan driver

lib/edgehog_device/include/edgehog_private.h

@@ -16,14 +16,15 @@
 #include "led.h"
 #include "ota.h"
 #include "telemetry_private.h"
-#include "uuid.h"
 
 #ifdef CONFIG_WIFI
 #include "wifi_scan.h"
 #endif
 
 #include <astarte_device_sdk/device.h>
 
+#include <zephyr/sys/uuid.h>
+
 /** @brief Possible states for the Edgehog device. */
 enum device_states
 {
@@ -65,7 +66,7 @@ struct edgehog_device
     /** @brief Original user data for the callbacks provided by the user, might be NULL. */
     void *user_cbk_user_data;
     /** @brief UUID representing the Boot Id. */
-    char boot_id[UUID_STR_LEN + 1];
+    char boot_id[UUID_STR_LEN];
     /** @brief OTA thread data used during the OTA Update operation. */
     ota_thread_t ota_thread;
     /** @brief LED thread data used during the LED blink. */

lib/edgehog_device/include/uuid.h

@@ -174,3 +174,9 @@ CONFIG_THREAD_NAME=y
 # Zephyr Kernel & Filesystem Additions
 CONFIG_EVENTS=y
 CONFIG_FILE_SYSTEM=y
+
+# Enable UUID
+CONFIG_UUID=y
+CONFIG_UUID_V4=y
+CONFIG_UUID_V5=y
+CONFIG_UUID_BASE64=y

lib/edgehog_device/uuid.c

@@ -156,3 +156,9 @@ CONFIG_SETTINGS=y
 
 # Activate Zbus
 CONFIG_ZBUS=y
+
+# Enable UUID
+CONFIG_UUID=y
+CONFIG_UUID_V4=y
+CONFIG_UUID_V5=y
+CONFIG_UUID_BASE64=y