From 61d7ef381d2898f0977d6d9dbbcdff9219f1b3d3 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <code@jannikbeyerstedt.de>
Date: Mon, 17 Apr 2023 21:30:21 +0200
Subject: [PATCH] change text locations

---
 node.lua | 61 +++++++++++++++++++++++---------------------------------
 service  |  2 +-
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/node.lua b/node.lua
index 3c112ee..9552390 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
+    -- available space y: 450 to 700
+    local fontsize = 40
+    local x_left = 90
+    local x_right = 1400
+    local y_start = 500
 
-    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
-
-    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)
-    end
-
-    if v.gw then
-        key "Gateway"
-        val(v.gw)
-    end
+    -- left side: network config, online status
+    -- if v.network then
+    --     font:write(x_left, y_start, "Mode: " .. v.network, fontsize, 1,1,1,1)
+    -- end
 
+    font:write(x_left, y_start+50, "online", fontsize, col)
     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_start+50, v.online, fontsize, col)
     end
+
+    -- right side: IP address
+    if v.ethip then
+        font:write(x_right, y_start, "Eth:  " .. v.ethip, fontsize, 1,1,1,1)
+    end
+
+    if v.wlanip then
+        font:write(x_right, y_start+50, "WiFi: " .. v.wlanip, fontsize, 1,1,1,1)
+    end
+
+    if v.gw then
+        font:write(x_right, y_start+100, "GW:   " .. v.gw, fontsize, 1,1,1,1)
+    end
+
 end
diff --git a/service b/service
index 50b6230..e1feeb2 100644
--- a/service
+++ b/service
@@ -115,4 +115,4 @@ if __name__ == "__main__":
         except:
             traceback.print_exc()
         finally:
-            time.sleep(15)
+            time.sleep(1)