Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Resolve two sets of repeated warnings when built with VS2019 (#8358)

Browse source
This commit is contained in:
Ruddy 2021-04-05 12:02:24 -04:00 • committed by GitHub
parent 978772b168
commit 39ceda51ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/gui/480x272/layouts/layout4+2.cpp
View file

@ -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"

2
radio/src/opentx.h
View file

@ -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];