Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

dTE min/max wrong in Logical Switches (Companion). GVARS min/max wrong

Browse source 
in Logical Switches (Firmware and Companion)
This commit is contained in:
bsongis 2014-06-21 11:06:58 +02:00
parent 88c4c11b56
commit 40a391d778
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
companion/src/eeprominterface.cpp
View file

@ -150,6 +150,8 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
break; break;
} }
case TELEMETRY_SOURCE_ALT: case TELEMETRY_SOURCE_ALT:
case TELEMETRY_SOURCE_ALT_MIN:
case TELEMETRY_SOURCE_ALT_MAX:
case TELEMETRY_SOURCE_GPS_ALT: case TELEMETRY_SOURCE_GPS_ALT:
result.step = singleprec ? 8 : 1; result.step = singleprec ? 8 : 1;
result.min = -500; result.min = -500;
@ -211,6 +213,9 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
result.decimals = 1; result.decimals = 1;
result.unit = QObject::tr("m/s"); result.unit = QObject::tr("m/s");
break; break;
case TELEMETRY_SOURCE_DTE:
result.max = 30000;
break;
case TELEMETRY_SOURCE_DIST: case TELEMETRY_SOURCE_DIST:
case TELEMETRY_SOURCE_DIST_MAX: case TELEMETRY_SOURCE_DIST_MAX:
result.step = singleprec ? 8 : 1; result.step = singleprec ? 8 : 1;
@ -280,6 +285,11 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
} }
break; break;
case SOURCE_TYPE_GVAR:
result.max = 1024;
result.min = -result.max;
break;
default: default:
result.max = (model.extendedLimits ? 125 : 100); result.max = (model.extendedLimits ? 125 : 100);
result.min = -result.max; result.min = -result.max;

10
radio/src/gui/menu_model.cpp
View file

@ -4716,7 +4716,15 @@ void menuModelLogicalSwitches(uint8_t event)
} }
else { else {
lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2); lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
v2_min = -125; v2_max = 125; #if defined(CPUARM) && defined(GVARS)
if (v1_val >= MIXSRC_GVAR1) {
v2_min = -1024; v2_max = +1024;
}
else
#endif
{
v2_min = -125; v2_max = +125;
}
} }
#else #else
if (v1_val >= MIXSRC_FIRST_TELEM) { if (v1_val >= MIXSRC_FIRST_TELEM) {