Skip to content

Ensure rounding and digits show correctly #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komacke merged 1 commit into from
Jun 12, 2026
Merged

Ensure rounding and digits show correctly #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ESPHamClock/dashboard-html.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ const char dashboard_html[] = R"HCDB(
function renderBands(rows){
const wanted = preferredBands.map(b => rows.find(r => r.band === b)).filter(Boolean);
const show = wanted.length ? wanted : rows.slice(0,8);
$('bands').innerHTML = show.map(r => `<div class="band"><div class="bandname">${r.band}</div><div class="bar"><div class="fill" style="width:${Math.max(0,Math.min(100,r.now))}%"></div></div><div class="pct">${r.now}%</div></div>`).join('') || '<span class="sub">No VOACAP matrix</span>';
$('bands').innerHTML = show.map(r => {
const p = Math.max(0, Math.min(100, Math.round(r.now) || 0));
return `<div class="band"><div class="bandname">${r.band}</div><div class="bar"><div class="fill" style="width:${p}%"></div></div><div class="pct">${p}%</div></div>`;
}).join('') || '<span class="sub">No VOACAP matrix</span>';
}
function parseSpots(txt, limit){
const rows=[];
Expand Down
8 changes: 4 additions & 4 deletions ESPHamClock/webserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ static bool getWiFiVOACAP (WiFiClient &client, char *line, size_t line_len)
int hr_now = bc_utc_tl ? utc_hour_now : de_hour_now;

// display matrix -- rotated with same layout as plotBandConditions()
char buf[100];
char buf[128];
int buf_l = 0;
for (int p_row = 0; p_row < BMTRX_COLS; p_row++) { // print 1 row for each matrix column
int m_col = BMTRX_COLS - 1 - p_row; // convert to bm col with 10 (last col) on top
Expand All @@ -1726,7 +1726,7 @@ static bool getWiFiVOACAP (WiFiClient &client, char *line, size_t line_len)
// bc_matrix is a matrix of 24 rows of UTC 0 .. 23, 8 columns of bands 80-40-30-20-17-15-12-10.
uint8_t rel = bc_matrix.m[m_row][m_col];

buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, "%3d", rel);
buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, "%4d", rel);
}

// finish with band freq
Expand All @@ -1743,9 +1743,9 @@ static bool getWiFiVOACAP (WiFiClient &client, char *line, size_t line_len)
for (int p_col = 0; p_col < BMTRX_ROWS; p_col++) {
int hr = (hr_now + p_col) % 24;
if ((hr%4) != 0)
buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, " ");
buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, " ");
else
buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, "%3d", hr);
buf_l += snprintf (buf+buf_l, sizeof(buf)-buf_l, "%4d", hr);
}
client.println (buf);

Expand Down