Merge pull request #322 from MikaylaFischler/devel

2023.08.22 Hotfix 2
MikaylaFischler · Aug 23, 2023 · 56377ef · 56377ef
2 parents 2985898 + 95c300e
commit 56377ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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}