From 39ceda51ef76e724d5c8a3d47086d988a30601e1 Mon Sep 17 00:00:00 2001 From: Ruddy Date: Mon, 5 Apr 2021 12:02:24 -0400 Subject: [PATCH] Resolve two sets of repeated warnings when built with VS2019 (#8358) --- radio/src/gui/480x272/layouts/layout4+2.cpp | 10 +++++----- radio/src/opentx.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/480x272/layouts/layout4+2.cpp b/radio/src/gui/480x272/layouts/layout4+2.cpp index c9846ec04..d41a5f902 100644 --- a/radio/src/gui/480x272/layouts/layout4+2.cpp +++ b/radio/src/gui/480x272/layouts/layout4+2.cpp @@ -20,11 +20,11 @@ #include "opentx.h" -#define HAS_TOPBAR() (persistentData->options[0].boolValue == true) -#define HAS_FM() (persistentData->options[1].boolValue == true) -#define HAS_SLIDERS() (persistentData->options[2].boolValue == true) -#define HAS_TRIMS() (persistentData->options[3].boolValue == true) -#define IS_MIRRORED() (persistentData->options[4].boolValue == true) +#define HAS_TOPBAR() (OPTION_VALUE_BOOL(persistentData->options[0].boolValue) == true) +#define HAS_FM() (OPTION_VALUE_BOOL(persistentData->options[1].boolValue) == true) +#define HAS_SLIDERS() (OPTION_VALUE_BOOL(persistentData->options[2].boolValue) == true) +#define HAS_TRIMS() (OPTION_VALUE_BOOL(persistentData->options[3].boolValue) == true) +#define IS_MIRRORED() (OPTION_VALUE_BOOL(persistentData->options[4].boolValue) == true) const uint8_t LBM_LAYOUT_4P2[] = { #include "mask_layout4+2.lbm" diff --git a/radio/src/opentx.h b/radio/src/opentx.h index ddfcb9830..2a6409376 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -320,7 +320,7 @@ void memswap(void * a, void * b, uint8_t size); #define MASK_CFN_TYPE uint64_t // current max = 64 function switches #define MASK_FUNC_TYPE uint32_t // current max = 32 functions -typedef struct { +typedef struct _CustomFunctionsContext { MASK_FUNC_TYPE activeFunctions; MASK_CFN_TYPE activeSwitches; tmr10ms_t lastFunctionTime[MAX_SPECIAL_FUNCTIONS];