diff options
Diffstat (limited to 'fw')
| -rw-r--r-- | fw/app/Kconfig | 4 | ||||
| -rw-r--r-- | fw/app/src/syslog.c | 8 | ||||
| -rw-r--r-- | fw/app/src/update.c | 18 |
3 files changed, 29 insertions, 1 deletions
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 <zephyr/logging/log_ctrl.h> #include <zephyr/logging/log_core.h> #include <zephyr/net/conn_mgr_connectivity.h> + +#ifdef CONFIG_IOT_CONTACT_NETWORK_HACK #include <zephyr/sys/reboot.h> +#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(); diff --git a/fw/app/src/update.c b/fw/app/src/update.c index ff4ce6a..5e119eb 100644 --- a/fw/app/src/update.c +++ b/fw/app/src/update.c @@ -8,11 +8,14 @@ #include <stdint.h> #include <zephyr/dfu/flash_img.h> +#include <zephyr/dfu/mcuboot.h> #include <zephyr/logging/log.h> +#include <zephyr/logging/log_ctrl.h> #include <zephyr/net/http/server.h> #include <zephyr/net/http/service.h> #include <zephyr/net/http/status.h> #include <zephyr/storage/flash_map.h> +#include <zephyr/sys/reboot.h> LOG_MODULE_REGISTER(update); @@ -74,8 +77,21 @@ static int update_handler( LOG_ERR("Processed %zd octets but wrote %zd", processed, written); return ret; } - LOG_INF("Handled update request receiving %zd octets.", processed); + LOG_DBG("Received %zd octets.", processed); processed = 0; + + const bool permanent = true; + ret = boot_request_upgrade((int)permanent); + if (ret < 0) { + LOG_ERR("Failed to mark uploaded image for update (%d)", ret); + return ret; + } + + LOG_INF("New application firmware uploaded and marked for update"); + + LOG_INF("Rebooting to complete remote update"); + log_flush(); + sys_reboot(SYS_REBOOT_COLD); } return 0; |