From bdab298fb5a98d7a334d5fff7e92129cfa7c843a Mon Sep 17 00:00:00 2001 From: mxmxmx Date: Mon, 7 Oct 2019 09:31:59 +0200 Subject: [PATCH] [VOR] ifdef --- software/o_c_REV/OC_ui.cpp | 3 +++ software/o_c_REV/VBiasManager.h | 5 +++++ software/o_c_REV/o_c_REV.ino | 9 ++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/software/o_c_REV/OC_ui.cpp b/software/o_c_REV/OC_ui.cpp index ad314501..b8b6ea08 100644 --- a/software/o_c_REV/OC_ui.cpp +++ b/software/o_c_REV/OC_ui.cpp @@ -13,8 +13,11 @@ #include "OC_version.h" #include "OC_options.h" #include "src/drivers/display.h" + +#ifdef VOR #include "VBiasManager.h" VBiasManager *VBiasManager::instance = 0; +#endif extern uint_fast8_t MENU_REDRAW; diff --git a/software/o_c_REV/VBiasManager.h b/software/o_c_REV/VBiasManager.h index c2bcab56..9505f584 100644 --- a/software/o_c_REV/VBiasManager.h +++ b/software/o_c_REV/VBiasManager.h @@ -28,6 +28,10 @@ #ifndef VBIAS_MANAGER_H #define VBIAS_MANAGER_H +#include "OC_options.h" + +#ifdef VOR + #define BIAS_EDITOR_TIMEOUT 16666 class VBiasManager { @@ -131,3 +135,4 @@ class VBiasManager { }; #endif // VBIAS_MANAGER_H +#endif diff --git a/software/o_c_REV/o_c_REV.ino b/software/o_c_REV/o_c_REV.ino index 42d79610..098bc866 100644 --- a/software/o_c_REV/o_c_REV.ino +++ b/software/o_c_REV/o_c_REV.ino @@ -168,9 +168,12 @@ void FASTRUN loop() { OC::apps::current_app->DrawMenu(); ++menu_redraws; - // JEJ:On app screens, show the bias popup, if necessary - VBiasManager *vbias_m = vbias_m->get(); - vbias_m->DrawPopupPerhaps(); + #ifdef VOR + // JEJ:On app screens, show the bias popup, if necessary + VBiasManager *vbias_m = vbias_m->get(); + vbias_m->DrawPopupPerhaps(); + #endif + } else { OC::apps::current_app->DrawScreensaver(); }