Module17: reorganized the "info" menu entry, removed the unused fields
This commit is contained in:
parent
694181df92
commit
5c3e8fed80
|
|
@ -123,13 +123,7 @@ const char *settings_gps_items[] =
|
||||||
const char *info_items[] =
|
const char *info_items[] =
|
||||||
{
|
{
|
||||||
"",
|
"",
|
||||||
"Bat. Voltage",
|
|
||||||
"Bat. Charge",
|
|
||||||
"RSSI",
|
|
||||||
"Used heap",
|
"Used heap",
|
||||||
"Band",
|
|
||||||
"VHF",
|
|
||||||
"UHF",
|
|
||||||
"Hw Version"
|
"Hw Version"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,12 @@ const char *phase_values[] =
|
||||||
"Inverted"
|
"Inverted"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const char *hwVersions[] =
|
||||||
|
{
|
||||||
|
"0.1d",
|
||||||
|
"0.1e"
|
||||||
|
};
|
||||||
|
|
||||||
void _ui_drawMenuList(uint8_t selected, int (*getCurrentEntry)(char *buf, uint8_t max_len, uint8_t index))
|
void _ui_drawMenuList(uint8_t selected, int (*getCurrentEntry)(char *buf, uint8_t max_len, uint8_t index))
|
||||||
{
|
{
|
||||||
point_t pos = layout.line1_pos;
|
point_t pos = layout.line1_pos;
|
||||||
|
|
@ -285,31 +291,11 @@ int _ui_getInfoValueName(char *buf, uint8_t max_len, uint8_t index)
|
||||||
case 0: // Git Version
|
case 0: // Git Version
|
||||||
snprintf(buf, max_len, "%s", GIT_VERSION);
|
snprintf(buf, max_len, "%s", GIT_VERSION);
|
||||||
break;
|
break;
|
||||||
case 1: // Battery voltage
|
case 1: // Heap usage
|
||||||
{
|
|
||||||
snprintf(buf, max_len, "-.-V");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 2: // Battery charge
|
|
||||||
snprintf(buf, max_len, "No batt");
|
|
||||||
break;
|
|
||||||
case 3: // RSSI
|
|
||||||
snprintf(buf, max_len, "N/A");
|
|
||||||
break;
|
|
||||||
case 4: // Heap usage
|
|
||||||
snprintf(buf, max_len, "%dB", getHeapSize() - getCurrentFreeHeap());
|
snprintf(buf, max_len, "%dB", getHeapSize() - getCurrentFreeHeap());
|
||||||
break;
|
break;
|
||||||
case 5: // Band
|
case 2: // LCD Type
|
||||||
snprintf(buf, max_len, "N/A");
|
snprintf(buf, max_len, "%s", hwVersions[hwinfo->hw_version]);
|
||||||
break;
|
|
||||||
case 6: // VHF
|
|
||||||
snprintf(buf, max_len, "N/A");
|
|
||||||
break;
|
|
||||||
case 7: // UHF
|
|
||||||
snprintf(buf, max_len, "N/A");
|
|
||||||
break;
|
|
||||||
case 8: // LCD Type
|
|
||||||
snprintf(buf, max_len, "%d", hwinfo->hw_version);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue