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

Call GV_IS_GV_VALUE() without offset applied

Browse Source
This commit is contained in:
Peter Feerick
2021-09-15 09:37:41 +10:00
parent 5c787f62c7
commit be9bdfd585
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/channel_bar.h
+6 -6
View File
@@ -152,13 +152,13 @@ class OutputChannelBar : public ChannelBar
int32_t ldMax;
int32_t ldMin;
if (GV_IS_GV_VALUE(ld->min - LIMIT_STD_MAX, -limit, 0)) {
if (GV_IS_GV_VALUE(ld->min, -limit, 0)) {
ldMin = limMin;
} else {
ldMin = ld->min;
}
if (GV_IS_GV_VALUE(ld->max + LIMIT_STD_MAX, 0, limit)) {
if (GV_IS_GV_VALUE(ld->max, 0, limit)) {
ldMax = limMax;
} else {
ldMax = ld->max;
@@ -200,16 +200,16 @@ class OutputChannelBar : public ChannelBar
int limit = CHANNELS_LIMIT;
LimitData* lim = limitAddress(channel);
if (GV_IS_GV_VALUE(lim->min - LIMIT_STD_MAX, -limit, 0)) {
if (GV_IS_GV_VALUE(lim->min, -limit, 0)) {
int ldMin =
GET_GVAR_PREC1(lim->min - LIMIT_STD_MAX, -limit, 0, mixerCurrentFlightMode)
GET_GVAR_PREC1(lim->min, -limit, 0, mixerCurrentFlightMode)
+ LIMIT_STD_MAX;
if (limMin != ldMin) invalidate();
limMin = ldMin;
}
if (GV_IS_GV_VALUE(lim->max + LIMIT_STD_MAX, 0, limit)) {
if (GV_IS_GV_VALUE(lim->max, 0, limit)) {
int ldMax =
GET_GVAR_PREC1(lim->max + LIMIT_STD_MAX, 0, limit, mixerCurrentFlightMode)
GET_GVAR_PREC1(lim->max, 0, limit, mixerCurrentFlightMode)
- LIMIT_STD_MAX;
if (limMax != ldMax) invalidate();
limMax = ldMax;