Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-01 10:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): keys pages counted as they are printed

Browse Source 
A page break counted a space before every key, printing put none before
the first, so the skipped pages broke one key early and the next page
began with the previous page's last key.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-11 10:41:05 +02:00
co-authored by Claude Opus 5.5
parent 2820c36b1c
commit beef9edf5a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-core/SettingsCli.h
+4 -3
View File
@@ -98,14 +98,15 @@ static bool handle(UiCore& core, const char* cmd, char* reply, int n) {
reply[0] = 0;
for (int k = 0; k < KEY_COUNT; k++) {
if (row(KEYS[k]) < 0) continue;
int len = (int)strlen(KEYS[k].key) + 1;
int len = (o ? 1 : 0) + (int)strlen(KEYS[k].key); // as printed: a space before all but the first
if (o + len > n - 20) { // room left for " (more: keys N)"
if (pg == page) { more = true; break; }
pg++;
o = 0;
len--; // first on its page: no space
}
if (pg == page) o += snprintf(reply + o, n - o, "%s%s", o ? " " : "", KEYS[k].key);
else o += len;
if (pg == page) snprintf(reply + o, n - o, "%s%s", o ? " " : "", KEYS[k].key);
o += len;
}
if (more) snprintf(reply + o, n - o, " (more: keys %d)", page + 1);
else if (pg < page || page < 1) snprintf(reply, n, "No more keys");