change text locations

node.lua

@@ -20,7 +20,13 @@ gl.setup(NATIVE_WIDTH, NATIVE_HEIGHT)
 card = resource.load_image("testcard.png")
 font = resource.load_font("vera.ttf")
 
-local v = {}
+local v = {
+    network = "<unkown>",
+    online = "<unkown>",
+    ethip = "<unkown>",
+    wlanip = "<unkown>",
+    gw = "<unkown>"
+}
 
 util.data_mapper{
     ["update/(.*)"] = function(key, val)
@@ -50,48 +56,42 @@ 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
+    -- draw text on left and right dark grey area
+    local fontsize = 30
+    local offset = fontsize+10
+    local x_left = 90
+    local x_right = 1400
+    local y_start = 500
 
+    -- left side: network config, online status
+    local y = y_start
     if v.network then
-        key "Network config"
-        val(v.network)
-    end
-
-    if v.ethip then
-        key "Ethernet IPv4"
-        val(v.ethip)
-    end
-
-    if v.wlanip then
-        key "WiFi IPv4"
-        val(v.wlanip)
+        font:write(x_left, y, "Mode: " .. v.network, fontsize, 1,1,1,1)
     end
 
+    y = y + offset
     if v.gw then
-        key "Gateway"
-        val(v.gw)
+        font:write(x_left, y, "GW: " .. v.gw, fontsize, 1,1,1,1)
     end
 
+    y = y + offset
     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(x_left, y, v.online, fontsize, unpack(col))
     end
+    
+    -- right side: IP address
+    y = y_start
+    if v.ethip then
+        font:write(x_right, y, "Eth:  " .. v.ethip, fontsize, 1,1,1,1)
+    end
+    
+    y = y + offset
+    if v.wlanip then
+        font:write(x_right, y, "WiFi: " .. v.wlanip, fontsize, 1,1,1,1)
+    end
+
 end

service

@@ -111,8 +111,8 @@ if __name__ == "__main__":
         try:
             fetch_info()
             if not run_next_test():
-                time.sleep(0.2)
+                time.sleep(5)
         except:
             traceback.print_exc()
-        finally:
-            time.sleep(15)
+        # finally:
+        #     time.sleep(1)