Bump edgehog and zephyr

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

Author: sorru94

app/prj.conf

@@ -149,7 +149,6 @@ CONFIG_ZVFS_OPEN_MAX=16
 
 CONFIG_POSIX_TIMERS=y
 CONFIG_SNTP=y
-CONFIG_POSIX_CLOCK=y # deprecated but needed for the config below
 CONFIG_NET_CONFIG_CLOCK_SNTP_INIT=y
 CONFIG_NET_CONFIG_SNTP_INIT_SERVER="0.pool.ntp.org"
 CONFIG_NET_CONFIG_SNTP_INIT_TIMEOUT=3000

app/src/eth.c

@@ -7,9 +7,11 @@
 #include "eth.h"
 
 #include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/ethernet_mgmt.h>
+#include <zephyr/version.h>
+
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eth, CONFIG_APP_LOG_LEVEL); // NOLINT
 
 /************************************************
@@ -30,8 +32,13 @@ static K_SEM_DEFINE(ipv4_address_obtained, 0, 1);
  *       Callbacks declaration/definition       *
  ***********************************************/
 
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+static void eth_mgmt_event_handler(
+    struct net_mgmt_event_callback *event_cb, uint64_t mgmt_event, struct net_if *iface)
+#else
 static void eth_mgmt_event_handler(
     struct net_mgmt_event_callback *event_cb, uint32_t mgmt_event, struct net_if *iface)
+#endif
 {
     (void) event_cb;
     (void) iface;
@@ -55,14 +62,23 @@ static void eth_mgmt_event_handler(
             break;
 
         default:
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+            LOG_DBG("Status network event: %lld.", mgmt_event); // NOLINT
+#else
             LOG_DBG("Status network event: %d.", mgmt_event); // NOLINT
+#endif
             break;
     }
     // NOLINTEND(hicpp-signed-bitwise)
 }
 
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+static void status_mgmt_event_handler(
+    struct net_mgmt_event_callback *event_cb, uint64_t mgmt_event, struct net_if *iface)
+#else
 static void status_mgmt_event_handler(
     struct net_mgmt_event_callback *event_cb, uint32_t mgmt_event, struct net_if *iface)
+#endif
 {
     (void) event_cb;
     (void) iface;
@@ -86,20 +102,30 @@ static void status_mgmt_event_handler(
             break;
 
         default:
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+            LOG_DBG("Status network event: %lld.", mgmt_event); // NOLINT
+#else
             LOG_DBG("Status network event: %d.", mgmt_event); // NOLINT
+#endif
             break;
     }
     // NOLINTEND(hicpp-signed-bitwise)
 }
 
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+static void ipv6_mgmt_event_handler(
+    struct net_mgmt_event_callback *event_cb, uint64_t mgmt_event, struct net_if *iface)
+#else
 static void ipv6_mgmt_event_handler(
     struct net_mgmt_event_callback *event_cb, uint32_t mgmt_event, struct net_if *iface)
+#endif
 {
     (void) event_cb;
     (void) iface;
 
     // NOLINTBEGIN(hicpp-signed-bitwise)
     switch (mgmt_event) {
+
         case NET_EVENT_IPV6_ADDR_ADD:
             LOG_DBG("IPv6 network event: NET_EVENT_IPV6_ADDR_ADD."); // NOLINT
             break;
@@ -177,20 +203,30 @@ static void ipv6_mgmt_event_handler(
             break;
 
         default:
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+            LOG_DBG("IPv6 network event: %lld.", mgmt_event); // NOLINT
+#else
             LOG_DBG("IPv6 network event: %d.", mgmt_event); // NOLINT
+#endif
             break;
     }
     // NOLINTEND(hicpp-signed-bitwise)
 }
 
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+static void ipv4_mgmt_event_handler(
+    struct net_mgmt_event_callback *event_cb, uint64_t mgmt_event, struct net_if *iface)
+#else
 static void ipv4_mgmt_event_handler(
     struct net_mgmt_event_callback *event_cb, uint32_t mgmt_event, struct net_if *iface)
+#endif
 {
     (void) event_cb;
     (void) iface;
 
     // NOLINTBEGIN(hicpp-signed-bitwise)
     switch (mgmt_event) {
+
         case NET_EVENT_IPV4_ADDR_ADD:
             LOG_DBG("Network event: NET_EVENT_IPV4_ADDR_ADD."); // NOLINT
             k_sem_give(&ipv4_address_obtained);
@@ -238,20 +274,30 @@ static void ipv4_mgmt_event_handler(
             break;
 
         default:
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+            LOG_DBG("Network event: %lld.", mgmt_event); // NOLINT
+#else
             LOG_DBG("Network event: %d.", mgmt_event); // NOLINT
+#endif
             break;
     }
     // NOLINTEND(hicpp-signed-bitwise)
 }
 
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+static void l4_mgmt_event_handler(
+    struct net_mgmt_event_callback *event_cb, uint64_t mgmt_event, struct net_if *iface)
+#else
 static void l4_mgmt_event_handler(
     struct net_mgmt_event_callback *event_cb, uint32_t mgmt_event, struct net_if *iface)
+#endif
 {
     (void) event_cb;
     (void) iface;
 
     // NOLINTBEGIN(hicpp-signed-bitwise)
     switch (mgmt_event) {
+
         case NET_EVENT_L4_CONNECTED:
             LOG_DBG("Network event: NET_EVENT_L4_CONNECTED."); // NOLINT
             break;
@@ -273,7 +319,11 @@ static void l4_mgmt_event_handler(
             break;
 
         default:
+#if (KERNEL_VERSION_MAJOR >= 4) && (KERNEL_VERSION_MINOR >= 2)
+            LOG_DBG("Network event: %lld.", mgmt_event); // NOLINT
+#else
             LOG_DBG("Network event: %d.", mgmt_event); // NOLINT
+#endif
             break;
     }
     // NOLINTEND(hicpp-signed-bitwise)

app/src/main.c

@@ -27,7 +27,6 @@ LOG_MODULE_REGISTER(cpu_metrics_app, CONFIG_APP_LOG_LEVEL);
 #endif
 #include <edgehog_device/device.h>
 #include <edgehog_device/telemetry.h>
-#include <edgehog_device/wifi_scan.h>
 
 #include "eth.h"
 #include "generated_interfaces.h"

west.yml

@@ -11,10 +11,10 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: v4.1.0
+      revision: v4.2.1
       import: true
     - name: edgehog-device-manager
       remote: edgehog-device-manager
       repo-path: edgehog-zephyr-device.git
-      revision: v0.8.0
+      revision: v0.9.0
       import: true