#545 coordinator type annotation updates

coordinator/ui/components/process_ctl.lua

@@ -177,7 +177,7 @@ local function new_view(root, x, y)
         local cur_lu    = style.theme.disabled
 
         if i <= facility.num_units then
-            unit = units[i]   ---@type ioctl_unit
+            unit = units[i]
             tag_fg_bg = cpair(colors.black, colors.lightBlue)
             lim_fg_bg = s_hi_box
             label_fg  = style.theme.label_fg
@@ -234,7 +234,7 @@ local function new_view(root, x, y)
         local degraded = IndicatorLight{parent=lights,x=2,y=3,label="Degraded",colors=cpair(ind_red.fgd,ind_off),flash=true,period=period.BLINK_250_MS}
 
         if i <= facility.num_units then
-            local unit = units[i]   ---@type ioctl_unit
+            local unit = units[i]
 
             ready.register(unit.unit_ps, "U_AutoReady", ready.update)
             degraded.register(unit.unit_ps, "U_AutoDegraded", degraded.update)
@@ -323,7 +323,7 @@ local function new_view(root, x, y)
     local waste_status = Div{parent=proc,width=24,height=4,x=57,y=1,}
 
     for i = 1, facility.num_units do
-        local unit = units[i]   ---@type ioctl_unit
+        local unit = units[i]
 
         TextBox{parent=waste_status,y=i,text="U"..i.." Waste",width=8}
         local a_waste = IndicatorLight{parent=waste_status,x=10,y=i,label="Auto",colors=ind_wht}

coordinator/ui/components/unit_detail.lua

@@ -62,7 +62,7 @@ local function init(parent, id)
     local ind_wht = style.ind_wht
 
     local db = iocontrol.get_db()
-    local unit = db.units[id]   ---@type ioctl_unit
+    local unit = db.units[id]
     local f_ps = db.facility.ps
 
     local main = Div{parent=parent,x=1,y=1}

coordinator/ui/layout/flow_view.lua

@@ -84,8 +84,7 @@ local function init(main)
                 table.insert(water_pipes, pipe(2, y, 2, y + 3, colors.blue, true))
                 table.insert(water_pipes, pipe(2, y, 21, y, colors.blue, true))
 
-                local u = units[i]  ---@type ioctl_unit
-                local x = util.trinary(u.num_boilers == 0, 45, 84)
+                local x = util.trinary(units[i].num_boilers == 0, 45, 84)
                 table.insert(water_pipes, pipe(21, y, x, y + 2, colors.blue, true, true))
             end
         end
@@ -102,8 +101,7 @@ local function init(main)
                     table.insert(water_pipes, pipe(2, y, 21, y, colors.blue, true))
                 end
 
-                local u = units[i]  ---@type ioctl_unit
-                local x = util.trinary(u.num_boilers == 0, 45, 84)
+                local x = util.trinary(units[i].num_boilers == 0, 45, 84)
                 table.insert(water_pipes, pipe(21, y, x, y + 2, colors.blue, true, true))
             end
         end

coordinator/ui/layout/main_view.lua

@@ -37,7 +37,8 @@ local function init(main)
     ping.register(facility.ps, "sv_ping", ping.update)
     datetime.register(facility.ps, "date_time", datetime.set_value)
 
-    local uo_1, uo_2, uo_3, uo_4    ---@type graphics_element
+    ---@type graphics_element, graphics_element, graphics_element, graphics_element
+    local uo_1, uo_2, uo_3, uo_4
 
     local cnc_y_start = 3
     local row_1_height = 0

coordinator/ui/pgi.lua

@@ -8,10 +8,12 @@ local util = require("scada-common.util")
 local pgi = {}
 
 local data = {
-    pkt_list = nil,     ---@type nil|graphics_element
-    pkt_entry = nil,    ---@type function
+    pkt_list = nil,  ---@type nil|graphics_element
+    pkt_entry = nil, ---@type function
     -- session entries
-    s_entries = { pkt = {} }
+    s_entries = {
+        pkt = {}     ---@type graphics_element[]
+    }
 }
 
 -- link list boxes