Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied

2022-01-19 11:52:06 +01:00
parent 77d8f2fc54 cf92707ee3
commit a50f852b9d
11 changed files with 569 additions and 164 deletions
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@ -29,7 +29,7 @@ int obsw::obsw() {
  if (std::filesystem::exists(watchdog::RUNNING_FILE_NAME)) {
    sif::warning << "File " << watchdog::RUNNING_FILE_NAME
                 << " exists so the software might "
-                    "already be running. Aborting.."
+                    "already be running. Check if obsw systemd service has been stopped."
                 << std::endl;
    return OBSW_ALREADY_RUNNING;
  }