piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[X7D] Logical switches screen bugs

Browse Source
This commit is contained in:
Bertrand Songis
2016-12-01 18:26:34 +01:00
parent c5ae06c163
commit a0ee52bb44
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/gui.h
+3 -3
View File
@@ -93,7 +93,7 @@ extern int8_t s_editMode; // global editmode
#define NO_DBLKEYS 0x80
#if defined(CPUARM)
#define INCDEC_DECLARE_VARS(f) uint8_t incdecFlag = (f); IsValueAvailable isValueAvailable = NULL
#define INCDEC_DECLARE_VARS(f) uint8_t incdecFlag = (f); IsValueAvailable isValueAvailable = NULL
#define INCDEC_SET_FLAG(f) incdecFlag = (f)
#define INCDEC_ENABLE_CHECK(fn) isValueAvailable = fn
#define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
@@ -163,10 +163,10 @@ int8_t checkIncDecGen(event_t event, int8_t i_val, int8_t i_min, int8_t i_max);
#endif
#define CHECK_INCDEC_MODELVAR(event, var, min, max) \
var = checkIncDecModel(event,var,min,max)
var = checkIncDecModel(event, var, min, max)
#define CHECK_INCDEC_MODELVAR_ZERO(event, var, max) \
var = checkIncDecModelZero(event,var,max)
var = checkIncDecModelZero(event, var, max)
#if defined(CPUARM)
#define CHECK_INCDEC_MODELVAR_CHECK(event, var, min, max, check) \
radio/src/gui/128x64/model_logical_switches.cpp
+3 -4
View File
@@ -73,8 +73,6 @@ void menuModelLogicalSwitchOne(event_t event)
int8_t sub = menuVerticalPosition;
INCDEC_DECLARE_VARS(EE_MODEL);
int v1_val = cs->v1;
for (uint8_t k=0; k<LCD_LINES-1; k++) {
@@ -105,6 +103,7 @@ void menuModelLogicalSwitchOne(event_t event)
case LS_FIELD_V1:
{
INCDEC_DECLARE_VARS(EE_MODEL);
lcdDrawTextAlignedLeft(y, STR_V1);
int v1_min=0, v1_max=MIXSRC_LAST_TELEM;
if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_EDGE) {
@@ -132,6 +131,7 @@ void menuModelLogicalSwitchOne(event_t event)
case LS_FIELD_V2:
{
INCDEC_DECLARE_VARS(EE_MODEL);
lcdDrawTextAlignedLeft(y, STR_V2);
int v2_min=0, v2_max=MIXSRC_LAST_TELEM;
if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
@@ -146,7 +146,7 @@ void menuModelLogicalSwitchOne(event_t event)
v2_max = 122;
}
else if (cstate == LS_FAMILY_EDGE) {
putsEdgeDelayParam(CSWONE_2ND_COLUMN, y, cs, menuHorizontalPosition==0 ? attr : 0, menuHorizontalPosition==1 ? attr : 0);
putsEdgeDelayParam(CSWONE_2ND_COLUMN+5, y, cs, menuHorizontalPosition==0 ? attr : 0, menuHorizontalPosition==1 ? attr : 0);
if (s_editMode <= 0) continue;
if (attr && menuHorizontalPosition==1) {
CHECK_INCDEC_MODELVAR(event, cs->v3, -1, 222 - cs->v2);
@@ -504,7 +504,6 @@ void menuModelLogicalSwitches(event_t event)
break;
case LS_FIELD_V2:
cs->v2 = CHECK_INCDEC_PARAM(event, cs->v2, v2_min, v2_max);
if (checkIncDec_Ret) TRACE("v2=%d", cs->v2);
break;
#if defined(CPUARM)
case LS_FIELD_V3: