From d19fc7e34f783b343e77b757c4f37aaadb5b66ca Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 2 Apr 2025 20:43:29 +0200 Subject: fw: app: Fix native_sim build To reduce the number of Kconfig options the network hack was added two both boards - the native_sim and nucleo_f767zi one. It reboots the device if the network connection cannot be established since this is a known bug of the nucleo board. Nevertheless it seems that for the native_sim board this command is not defined. Since it is a Linux application this makes somehow sense. This commit introduces the boolean Kconfig option `IOT_CONTACT_NETWORK_HACK` which is only enabled for the nucleo board fixing the native_sim build. --- fw/app/Kconfig | 4 ++++ fw/app/src/syslog.c | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'fw/app') diff --git a/fw/app/Kconfig b/fw/app/Kconfig index 5393e05..3481340 100644 --- a/fw/app/Kconfig +++ b/fw/app/Kconfig @@ -2,4 +2,8 @@ config IOT_CONTACT_REMOTE_UPDATE bool "Enable the remote update system" default n +config IOT_CONTACT_NETWORK_HACK + bool "Reboots after a fixed timeout if network connection cannot be established" + default n + source "Kconfig.zephyr" diff --git a/fw/app/src/syslog.c b/fw/app/src/syslog.c index edc2839..e19a196 100644 --- a/fw/app/src/syslog.c +++ b/fw/app/src/syslog.c @@ -14,7 +14,10 @@ #include #include #include + +#ifdef CONFIG_IOT_CONTACT_NETWORK_HACK #include +#endif // CONFIG_IOT_CONTACT_NETWORK_HACK LOG_MODULE_REGISTER(syslog); @@ -58,12 +61,17 @@ int init_syslog(void) LOG_DBG("Initializing syslog logging backend"); LOG_INF("Waiting for network ..."); + +#ifdef CONFIG_IOT_CONTACT_NETWORK_HACK int ret = k_sem_take(&network_connected, NETWORK_BUG_DELAY); if (ret == -EAGAIN) { LOG_ERR("Could not connect to network - rebooting system"); log_flush(); sys_reboot(SYS_REBOOT_COLD); } +#else + k_sem_take(&network_connected, K_FOREVER); +#endif // CONFIG_IOT_CONTACT_NETWORK_HACK LOG_INF("Enabling syslog backend"); const struct log_backend *backend = log_backend_net_get(); -- cgit v1.2.3-70-g09d2