From fd7c2b4adf3844e8fc15b6b371cedf33438bbc22 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Thu, 6 May 2021 11:58:35 +0200 Subject: [PATCH] Fixes after ifdef clenaup (#20842) --- selfdrive/common/params.cc | 5 +++-- selfdrive/modeld/models/dmonitoring.cc | 3 +-- selfdrive/ui/qt/api.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/selfdrive/common/params.cc b/selfdrive/common/params.cc index b603b076..12ee35dc 100644 --- a/selfdrive/common/params.cc +++ b/selfdrive/common/params.cc @@ -30,8 +30,9 @@ namespace { -const std::string default_params_path = !Hardware::PC() ? "/data/params" : util::getenv_default("HOME", "/.comma/params", "/data/params"); -const std::string persistent_params_path = !Hardware::PC() ? "/persist/comma/params" : default_params_path; +const std::string default_params_path = Hardware::PC() ? util::getenv_default("HOME", "/.comma/params", "/data/params") + : "/data/params"; +const std::string persistent_params_path = Hardware::PC() ? default_params_path : "/persist/comma/params"; volatile sig_atomic_t params_do_exit = 0; void params_sig_handler(int signal) { diff --git a/selfdrive/modeld/models/dmonitoring.cc b/selfdrive/modeld/models/dmonitoring.cc index 1071ad0b..3491f393 100644 --- a/selfdrive/modeld/models/dmonitoring.cc +++ b/selfdrive/modeld/models/dmonitoring.cc @@ -18,8 +18,7 @@ #endif void dmonitoring_init(DMonitoringModelState* s) { - const char *model_path = Hardware::PC() ? "../../models/dmonitoring_model.dlc" - : "../../models/dmonitoring_model_q.dlc"; + const char *model_path = "../../models/dmonitoring_model_q.dlc"; int runtime = USE_DSP_RUNTIME; s->m = new DefaultRunModel(model_path, &s->output[0], OUTPUT_SIZE, runtime); s->is_rhd = Params().getBool("IsRHD"); diff --git a/selfdrive/ui/qt/api.cc b/selfdrive/ui/qt/api.cc index 74abc2f7..586d0e3c 100644 --- a/selfdrive/ui/qt/api.cc +++ b/selfdrive/ui/qt/api.cc @@ -16,8 +16,8 @@ #include "selfdrive/hardware/hw.h" const std::string private_key_path = - !Hardware::PC() ? util::getenv_default("HOME", "/.comma/persist/comma/id_rsa", "/persist/comma/id_rsa") - : "/persist/comma/id_rsa"; + Hardware::PC() ? util::getenv_default("HOME", "/.comma/persist/comma/id_rsa", "/persist/comma/id_rsa") + : "/persist/comma/id_rsa"; QByteArray CommaApi::rsa_sign(const QByteArray &data) { auto file = QFile(private_key_path.c_str());