From 95c300e4501ebfee62cf15f12d0b37b174e9de4d Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Tue, 22 Aug 2023 21:46:34 -0400 Subject: [PATCH] #321 fixed boiler flow indicators on flow monitor --- coordinator/startup.lua | 2 +- coordinator/ui/components/unit_flow.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 97af3ebb..826c2563 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder") local apisessions = require("coordinator.session.apisessions") -local COORDINATOR_VERSION = "v1.0.1" +local COORDINATOR_VERSION = "v1.0.2" local println = util.println local println_ts = util.println_ts diff --git a/coordinator/ui/components/unit_flow.lua b/coordinator/ui/components/unit_flow.lua index ffee6523..dbac0256 100644 --- a/coordinator/ui/components/unit_flow.lua +++ b/coordinator/ui/components/unit_flow.lua @@ -104,10 +104,10 @@ local function make(parent, x, y, wide, unit) PipeNetwork{parent=root,x=20,y=1,pipes=rc_pipes,bg=colors.lightGray} if unit.num_boilers > 0 then - local cc_rate = DataIndicator{parent=root,x=_wide(25,22),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} - local hc_rate = DataIndicator{parent=root,x=_wide(25,22),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} + local cc_rate = DataIndicator{parent=root,x=_wide(25,22),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} + local hc_rate = DataIndicator{parent=root,x=_wide(25,22),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} - cc_rate.register(unit.unit_ps, "boil_sum", cc_rate.update) + cc_rate.register(unit.unit_ps, "boiler_boil_sum", function (sum) cc_rate.update(sum * 10) end) hc_rate.register(unit.unit_ps, "heating_rate", hc_rate.update) local boiler = Rectangle{parent=root,x=_wide(47,40),y=1,border=border(1, colors.gray, true),width=19,height=5,fg_bg=wh_gray} @@ -120,7 +120,7 @@ local function make(parent, x, y, wide, unit) local st_rate = DataIndicator{parent=root,x=_wide(71,61),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} wt_rate.register(unit.unit_ps, "turbine_flow_sum", wt_rate.update) - st_rate.register(unit.unit_ps, "boil_sum", st_rate.update) + st_rate.register(unit.unit_ps, "boiler_boil_sum", st_rate.update) else local wt_rate = DataIndicator{parent=root,x=28,y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg} local st_rate = DataIndicator{parent=root,x=28,y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}