GitHub/cc-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #560 from MikaylaFischler/pocket-alpha-dev

Browse Source 
Pocket Process Control
This commit is contained in:
Mikayla
2024-10-14 13:24:45 -04:00
committed by GitHub
parent 48e5c50f0a 0639870410
commit 620fa362f6
22 changed files with 827 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
supervisor/facility.lua
View File

@@ -425,9 +425,9 @@ function facility.new(config)
ready = self.mode_set > 0
if (self.mode_set == PROCESS.CHARGE) and (self.charge_setpoint <= 0) or
(self.mode_set == PROCESS.GEN_RATE) and (self.gen_rate_setpoint <= 0) or
(self.mode_set == PROCESS.BURN_RATE) and (self.burn_target < 0.1) then
if ((self.mode_set == PROCESS.CHARGE) and (self.charge_setpoint <= 0)) or
((self.mode_set == PROCESS.GEN_RATE) and (self.gen_rate_setpoint <= 0)) or
((self.mode_set == PROCESS.BURN_RATE) and (self.burn_target < 0.1)) then
ready = false
end
@@ -436,6 +436,8 @@ function facility.new(config)
if ready then self.mode = self.mode_set end
end
log.debug(util.c("FAC: process start ", util.trinary(ready, "accepted", "rejected")))
return {
ready,
self.mode_set,

2
supervisor/startup.lua
View File

@@ -22,7 +22,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v1.5.8"
local SUPERVISOR_VERSION = "v1.5.9"
local println = util.println
local println_ts = util.println_ts