diff --git a/node.lua b/node.lua index 3c112ee..b1d5c11 100644 --- a/node.lua +++ b/node.lua @@ -50,48 +50,37 @@ function node.render() lower_width = font:width(lower_text, 20) font:write(960-(lower_width/2), 679, lower_text, 20, 1,1,1,1) - -- TODO - local size, k_x, v_x, y - - size = math.floor(HEIGHT/20) - y = 30+size*6 - k_x, v_x = 30, 30+font:width("XXXXXXXXXXXXXXXX", size) - - local function key(str) - font:write(k_x, y, str, size, 1,1,1,.5) - end - local function val(str, col) - col = col or {1,1,1,.5} - font:write(v_x, y, str, size, unpack(col)) - y = y + size*1.1 - end + -- available space y: 400 to 700 + -- left x: 50 + -- right x: TODO + local size = 40 + local x_left = 50 + local x_right = 1000 + -- left side: network config, online status if v.network then - key "Network config" - val(v.network) + font:write(50, 400, "Mode: " .. v.network, size, 1,1,1,1) end - - if v.ethip then - key "Ethernet IPv4" - val(v.ethip) - end - - if v.wlanip then - key "WiFi IPv4" - val(v.wlanip) - end - - if v.gw then - key "Gateway" - val(v.gw) - end - + if v.online then - key "Online status" local col = {1,0,0,1} if v.online == "online" then col = {0,1,0,1} end - val(v.online, col) + font:write(50, 450, v.online, size, col) end + + -- right side: IP address + if v.ethip then + font:write(1000, 400, "Eth IPv4: " .. v.ethip, size, 1,1,1,1) + end + + if v.wlanip then + font:write(1000, 450, "WiFi IPv4: " .. v.wlanip, size, 1,1,1,1) + end + + if v.gw then + font:write(1000, 500, "Gateway: " .. v.gw, size, 1,1,1,1) + end + end