mirror of
https://github.com/ALLFATHER-BV/wadamesh.git
synced 2026-10-15 10:29:58 +00:00
Kaj SchittecatandClaude Opus 5
eb439c8baa
pisti87 reported a long list of text that stays English whatever the language, and said the strings were in his language file and still did not appear (#257). Both halves are true, and the reason is the audit. The extractor only ever recognised TR("literal"). Three very common shapes were therefore invisible: mk_row_btn("Reload tiles in view", cb) // helper TR()s its parameter for (auto& r : rows) TR(r.label) // literal lives in a local table TR(contactsSortOptName(m)) // helper returns one of several All three translate correctly at runtime, so the source looks properly wrapped. But the literal at the call site was never emitted as a key, so it never entered a .lang file, so no translator could ever supply it -- and adding it by hand did nothing, because the audit's key list is what the files are checked against. That is 51 strings across the map options sheet, the sort sheets, the contacts filters and the home launcher. The audit now understands all three, plus tr("...") in the Lua apps, and the newly visible keys are in all thirteen files as placeholders so translators can see them. 1017 keys, up from 966. Four strings were genuinely raw and are now wrapped: the reader's idle status, the Discover empty feed, the crash-report export button and Paste (move/copy). Lua apps had no way to translate anything at all, so every built-in was hard English regardless of the device language. wada.sys.tr() gives them the same table the interface uses; airtime 1.4 is the first to use it, with the `sys.tr or identity` fallback so it still runs on older firmware. Two more instances of the drift this issue is really about: - gen-lua-builtin.py read out/firmware/apps/, which nothing writes -- the deploy rsyncs deploy/apps/ straight to the VPS. So the mirror was stale and the two apps added in beta_68 were never baked in: boards that cannot reach the Store shipped without them. It reads the canonical directory now, and regenerates from the same pre-build hook as the language table. - Baking a row whose translation equals its key does nothing, since TR() returns the key on a miss. Skipping them takes the header from 1.11 MB to 939 KB and gives the V4 back 16 KB of flash, which matters at 89%. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
96 lines
3.2 KiB
Lua
96 lines
3.2 KiB
Lua
-- Airtime (Lua) — channel utilization over time: live + average bars with a %
|
|
-- axis, rx/tx air split, duty ceiling, tx budget and packet counters.
|
|
local ui, sys, mesh, timer = wada.ui, wada.sys, wada.mesh, wada.timer
|
|
-- Translate through the device's language table (wada.sys.tr, added for #257).
|
|
-- Older firmware has no sys.tr, so fall back to the English string rather than error.
|
|
local tr = sys.tr or function(x) return x end
|
|
local C = ui.colors
|
|
local app = {}
|
|
|
|
local W, narrow
|
|
local head, sub, legend, detail, chart
|
|
local base, t0, last
|
|
local peak_pct = 0
|
|
|
|
local function restart_window()
|
|
local st = mesh.stats()
|
|
base = { rx = st.rx_air_s, tx = st.tx_air_s }
|
|
t0 = sys.millis()
|
|
last = { ms = t0, rx = st.rx_air_s, tx = st.tx_air_s }
|
|
peak_pct = 0
|
|
chart:fill(1, 0)
|
|
chart:fill(2, 0)
|
|
head:set(tr("sampling..."))
|
|
head:color(C.accent)
|
|
sys.toast(tr("window restarted"), 900)
|
|
end
|
|
|
|
local function refresh()
|
|
local st = mesh.stats()
|
|
local now = sys.millis()
|
|
local wall = (now - t0) / 1000
|
|
if wall < 0.5 then return end
|
|
|
|
local rx_air, tx_air = st.rx_air_s - base.rx, st.tx_air_s - base.tx
|
|
local avg = math.min(100, (rx_air + tx_air) * 100 / wall)
|
|
|
|
local dw = (now - last.ms) / 1000
|
|
local live = 0
|
|
if dw > 0 then
|
|
live = math.min(100, ((st.rx_air_s - last.rx) + (st.tx_air_s - last.tx)) * 100 / dw)
|
|
end
|
|
last = { ms = now, rx = st.rx_air_s, tx = st.tx_air_s }
|
|
if live > peak_pct then peak_pct = live end
|
|
|
|
chart:push(1, math.floor(live))
|
|
chart:push(2, math.floor(avg))
|
|
|
|
head:set(string.format(tr("channel busy %.1f%%"), live))
|
|
head:color(live > 50 and C.bad or live > 20 and 0xE8A33D or C.good)
|
|
sub:set(string.format(tr("avg %.1f%% peak %.1f%% over %ds"), avg, peak_pct, math.floor(wall)))
|
|
if narrow then
|
|
detail:set(string.format("air rx %ds / tx %ds\nduty %d%% budget %dms\ntx %d rx %d err %d",
|
|
rx_air, tx_air, st.duty_pct, st.tx_budget_ms, st.tx_pkts, st.rx_pkts, st.rx_err))
|
|
else
|
|
detail:set(string.format("air rx %ds / tx %ds duty %d%% budget %dms\ntx %d rx %d err %d drop %d SF%d",
|
|
rx_air, tx_air, st.duty_pct, st.tx_budget_ms, st.tx_pkts, st.rx_pkts, st.rx_err, st.rx_dropped, st.sf))
|
|
end
|
|
end
|
|
|
|
function app.on_open(w, h)
|
|
W, narrow = w, w < 280
|
|
local LH12, LH16 = ui.text_h(12), ui.text_h(16)
|
|
|
|
local y = 2
|
|
head = ui.label(tr("sampling..."), 4, y, 16, C.accent); head:width(w - 86)
|
|
ui.button(tr("Reset"), w - 76, y, 70, 30, function() restart_window() end) -- top-right
|
|
y = y + LH16 + 4
|
|
sub = ui.label("", 4, y, 12, C.sub); sub:width(w - 10)
|
|
y = y + LH12 + 5
|
|
|
|
local AX = 34
|
|
local det_lines = narrow and 3 or 2
|
|
local ch_h = h - y - (det_lines * LH12) - LH12 - 14
|
|
if ch_h < 48 then ch_h = 48 end
|
|
if ch_h > 110 then ch_h = 110 end
|
|
chart = ui.chart(w - AX - 8, ch_h, 60, C.accent, 0x4F9DF7, true)
|
|
chart:pos(AX, y)
|
|
chart:range(0, 100)
|
|
chart:axis(3, AX)
|
|
y = y + ch_h + 4
|
|
|
|
legend = ui.label(tr("teal = now blue = average"), 4, y, 12, C.sub); legend:width(w - 10)
|
|
y = y + LH12 + 2
|
|
detail = ui.label("", 4, y, 12, C.text); detail:width(w - 10)
|
|
|
|
local st = mesh.stats()
|
|
base = { rx = st.rx_air_s, tx = st.tx_air_s }
|
|
t0 = sys.millis()
|
|
last = { ms = t0, rx = st.rx_air_s, tx = st.tx_air_s }
|
|
timer.every(1000)
|
|
end
|
|
|
|
function app.on_tick(dt) refresh() end
|
|
|
|
return app
|