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

[all] Now 5 Global Variables available on all boards

Browse Source
This commit is contained in:
bsongis
2012-10-15 20:13:06 +00:00
parent cd995aa975
commit bca4660742
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/open9x.cpp
+5 -5
View File
@@ -934,8 +934,8 @@ void incRotaryEncoder(uint8_t idx, int8_t inc)
int8_t REG(int8_t x, int8_t min, int8_t max)
{
int8_t result = x;
if (x >= 126) {
x -= 126;
if (x >= 126 || x <= -126) {
x = (uint8_t)x - 126;
result = REG_VALUE(x);
if (result < min) {
REG_VALUE(x) = result = min;
@@ -2112,12 +2112,12 @@ void evalFunctions()
#endif
#if defined(GVARS)
else if (sd->func >= FUNC_GVAR_X1) {
else if (sd->func >= FUNC_ADJUST_GV1) {
if (FSW_PARAM(sd) >= MIXSRC_TrimRud-1 && FSW_PARAM(sd) <= MIXSRC_TrimAil-1) {
trimPtr[FSW_PARAM(sd)-MIXSRC_TrimRud+1] = &REG_VALUE(sd->func-FUNC_GVAR_X1);
trimPtr[FSW_PARAM(sd)-MIXSRC_TrimRud+1] = &REG_VALUE(sd->func-FUNC_ADJUST_GV1);
}
else {
REG_VALUE(sd->func-FUNC_GVAR_X1) = limit((int16_t)-1250, getValue(FSW_PARAM(sd)), (int16_t)1250) / 10;
REG_VALUE(sd->func-FUNC_ADJUST_GV1) = limit((int16_t)-1250, getValue(FSW_PARAM(sd)), (int16_t)1250) / 10;
}
}
#endif