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

fix(lua): getFieldInfo not returning sensor name if one defined (#6422)

Browse Source
This commit is contained in:
philmoz
2025-07-07 18:46:17 +10:00
committed by GitHub
parent da68170b7d
commit 94e73bef48
1 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_general.cpp
+21 -31
View File
@@ -564,51 +564,41 @@ bool luaFindFieldById(int id, LuaField & field, unsigned int flags)
if (_searchSingleFieldsById(id, field, flags, luaSingleFields, DIM(luaSingleFields))) if (_searchSingleFieldsById(id, field, flags, luaSingleFields, DIM(luaSingleFields)))
return true; return true;
// search in telemetry for configured sensor
if (id >= MIXSRC_FIRST_TELEM && id <= MIXSRC_LAST_TELEM) {
int i = (id - MIXSRC_FIRST_TELEM) / 3;
if (isTelemetryFieldAvailable(i)) {
char* s = strAppend(field.name, g_model.telemetrySensors[i].label, TELEM_LABEL_LEN);
int index = (id - MIXSRC_FIRST_TELEM) % 3;
if (index == 1)
strAppend(s, "-");
else if (index == 2)
strAppend(s, "+");
return true;
}
}
// search in multiples // search in multiples
for (unsigned int n = 0; n < DIM(luaMultipleFields); ++n) { for (unsigned int n = 0; n < DIM(luaMultipleFields); ++n) {
int index = id - luaMultipleFields[n].id; int index = id - luaMultipleFields[n].id;
if (0 <= index && index < luaMultipleFields[n].count) { if (0 <= index && index < luaMultipleFields[n].count) {
int index2 = 0; int index2 = 0;
if(luaMultipleFields[n].id == MIXSRC_FIRST_TELEM) { if (luaMultipleFields[n].id == MIXSRC_FIRST_TELEM) {
index2 = index % 3; index2 = index % 3;
index /= 3; index /= 3;
} }
switch (index2) { char* s = strAppend(field.name, luaMultipleFields[n].name);
case 0: s = strAppendUnsigned(s, index + 1);
snprintf(field.name, sizeof(field.name), "%s%i", luaMultipleFields[n].name, index + 1); if (index2 == 1)
break; strAppend(s, "-");
case 1: else if (index2 == 2)
snprintf(field.name, sizeof(field.name), "%s%i-", luaMultipleFields[n].name, index + 1); strAppend(s, "+");
break;
case 2:
snprintf(field.name, sizeof(field.name), "%s%i+", luaMultipleFields[n].name, index + 1);
}
if (flags & FIND_FIELD_DESC) if (flags & FIND_FIELD_DESC)
snprintf(field.desc, sizeof(field.desc), luaMultipleFields[n].desc, index + 1); snprintf(field.desc, sizeof(field.desc), luaMultipleFields[n].desc, index + 1);
return true; return true;
} }
} }
// search in telemetry
for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) {
if (isTelemetryFieldAvailable(i)) {
int index = id - (MIXSRC_FIRST_TELEM + 3 * i);
if (0 <= index && index < 3) {
const char* sensorName = g_model.telemetrySensors[i].label;
switch (index) {
case 0:
snprintf(field.name, sizeof(field.name), "%s", sensorName);
break;
case 1:
snprintf(field.name, sizeof(field.name), "%s-", sensorName);
break;
case 2:
snprintf(field.name, sizeof(field.name), "%s+", sensorName);
}
}
}
}
return false; // not found return false; // not found
} }