ich finde das eindeutiger, wenn beide Auto Eingänge den Faktor berücksichtigen.
Ich hab jetzt mal deine Version bei mir ins repo übernommen und noch paar Änderungen eingepflegt:
Code: Alles auswählen
/**
* File: Irrigation_CircuitControl.twl V1.1 RC 1
* Logic for Garden irrigation. This module is the Circuit Control which controls one single irrigation circuit
* Author: - Hans Martin
* - Robert
* Der Schöpfer dieser Custom Logik überträgt die Nutzungsrechte gemäß der TOLL ("Timberwolf Open Logikblock License") die unter https://wrgt.news/TOLL zum Download zur Verfügung steht.
*/
{
"Input": [
["Trigger Automatic 1", "(RISING) Trigger to start an automatic irrigation cycle", "$TriggerInpAutomaticIn1", "c"],
["Trigger Automatic 2", "(RISING) Trigger to start an automatic irrigation cycle", "$TriggerInpAutomaticIn2", "c"],
["Trigger Start 1", "(RISING) Activation of irrigation circuit", "$TriggerInpStartIn1", "c"],
["Trigger Start 2", "(RISING) Activation of irrigation circuit", "$TriggerInpStartIn2", "c"],
["Trigger Stop 1", "(RISING) Stops any active cycle", "$TriggerInpStopIn1", "c"],
["Trigger Stop 2", "(RISING) Stops any active cycle", "$TriggerInpStopIn2", "c"],
["Automatic Time [min]", "(T_s) Time of one irrigation cycle", "$AutoTime_min", "u"],
["Global Factor", "Factor to scale circuit timer", "$GlobalFactor", "c"],
["System OK Feedback", "(0/1) Loopback of SystemControl", "$SystemOk", "a"],
["Send interval on [s]", "Send outputs with ct periodically during circuit on", "$SendIntervalOn", "u"],
["Send interval off [s]", "Send outputs with ct periodically during circuit off", "$SendIntervalOff", "u"],
["Inhibit", "", "$VAR<Inhibit?>", "c"]
],
"Output": [
["Valve", "(0/1) Output for the valve", "$ValveOut", "c"],
["System Request", "(0/1) Request for the SystemControl", "$SystemRequest", "c"],
["Circuit State", "(0/1) State indicating whether the circuit is running", "$CircuitState", "c"],
["Circuit finished", "(0/1) Flag indicating that the circuit is finished", "$CircuitFinished", "c"],
["Runtime [s]", "Time passed since valve opened", "$Time_sec_actual?", "ct"],
["Runtime [min]", "Time passed since valve opened", "$Time_min_actual?", "a"],
["Time left [s]", "Time left for this cycle", "$Time_sec_remaining?", "ct"],
["Time left [min]", "Time left for this cycle", "$Time_min_remaining?", "ct"],
["State", "Current state 0=off/1=request systemOK/2=circuit on/3=finishing", "$State?", "c"]
],
"Level": [
// Inputs
["$VAR<Inhibit?>","bool",false],
["$TriggerInpAutomaticIn1", "bool", false],
["$TriggerInpAutomaticIn2", "bool", false],
["$TriggerInpStartIn1", "bool", false],
["$TriggerInpStartIn2", "bool", false],
["$TriggerInpStopIn1", "bool", false],
["$TriggerInpStopIn2", "bool", false],
["$AutoTime", "float", 0],
["$SystemOk", "bool", false],
// Output
["$ValveOut", "bool", false],
["$SystemRequest", "bool", false],
["$CircuitState", "bool", false],
["$CircuitFinished", "bool", false],
// Constants
["$Konst1", "int", 1],
["$Konst2", "int", 2],
["$KonstFalse", "bool", false],
["$KonstTrue", "bool", true],
// Internals
["$State","integer",0],
["$Inhibit","bool",false],
["$Cancel","bool",false],
["$ShouldRun", "bool", false],
["$LastShouldRun", "bool", false],
["$LastShouldRunOrAutoRising", "bool", false],
["$ShouldRunAndSysOk", "bool", false],
["$TimerActive", "bool", false],
["$AutoTime_min", "float", 0.0],
["$AutoTime_sec", "float", 0.0],
["$AutoTime_global", "float", 0.0],
["$LastTimerActive", "bool", false],
["$Timeout", "float", 5.0],
["$Time_sec_actual", "float", 0.0],
["$Time_min_actual", "float", 0.0],
["$Time_sec_remaining", "float", 0.0],
["$Time_min_remaining", "float", 0.0],
["$Konst0", "float", 0.0],
["$Konst60", "float", 60.0],
["$Konst005", "float", 0.05],
["$SendIntervalOn", "float", 5.0],
["$SendIntervalOff", "float", 60.0],
["$SendInterval", "float", 5.0],
["$Clk", "bool", false],
["$GlobalFactor", "float", 1.0], // Global factor on circuit time, used if triggered manually or by auto2
["$GlobalFactorLim", "float", 1.0],
["$GlobalFactorValid", "bool", false],
["$TriggerNoFactor", "bool", false],
["$TriggerWithFactor", "bool", false],
["$TriggerAutomaticSaved", "bool", false],
["$TimerShouldRun", "bool", false],
["$CancelFinished", "bool", false],
["$TriggerInpStartRising","bool",false],
["$TriggerInpStopRising","bool",false],
["$TriggerInpAutomaticRising","bool",false],
["$ManualOn","bool",false],
["$SetOutputs","bool",false],
["$AutomaticModeActive","bool",false],
["$AutomaticModeActiveOrRequested","bool",false],
["$CancelAndAutoActive","bool",false]
],
"Module": [
// calculate time in seconds
["Polynomial", "$Konst60", "$AutoTime_sec",["$Konst0", "$AutoTime_min"]],
// Limit factor
["Limiter","$GlobalFactor","$GlobalFactorLim","$GlobalFactorValid",["$Konst005", "$Konst2"]],
// calculate time with global factor
["Polynomial", "$GlobalFactorLim", "$AutoTime_global",["$Konst0", "$AutoTime_sec"]],
// take over current circuit time
["Or", ["$TriggerInpStartIn1","$TriggerInpStartIn2"], "$TriggerNoFactor"],
["And", ["$TriggerNoFactor","-$State"], "$TriggerNoFactor"],
["Latch","$AutoTime_sec","$AutoTime","$TriggerNoFactor",1],
["Or", ["$TriggerInpAutomaticIn1", "$TriggerInpAutomaticIn2"],"$TriggerWithFactor"],
["And", ["$TriggerWithFactor","-$State"], "$TriggerWithFactor"],
["Latch","$AutoTime_global","$AutoTime","$TriggerWithFactor",1],
// calculate inputs
["Or", ["$TriggerInpAutomaticIn1","$TriggerInpAutomaticIn2"], "$TriggerInpAutomaticRising"],
["Or", ["$TriggerInpStartIn1","$TriggerInpStartIn2"], "$TriggerInpStartRising"],
["Or", ["$TriggerInpStopIn1","$TriggerInpStopIn2"], "$TriggerInpStopRising"],
// calculate cancel state
["Or", ["$VAR<Inhibit?>"], "$Inhibit"],
["Or", ["$Inhibit", "$TriggerInpStopRising", "-$GlobalFactorValid"], "$Cancel"],
// calculate manual state
["Or",["$TriggerInpStartRising", "$ManualOn"],"$ManualOn"],
["And", ["$ManualOn", "-$TimerActive", "-$Cancel"], "$ManualOn"], // if automatic mode was triggered, cancel manual mode
// calculate start of system
["Or", ["$TriggerAutomaticSaved", "$TriggerInpAutomaticRising"], "$TriggerAutomaticSaved"], // save trigger
["And", ["$TriggerAutomaticSaved", "-$TimerActive", "-$Cancel"], "$TriggerAutomaticSaved"], // reset trigger if timer has taken over control or cancel was issued
// Store last status of timer to detect
["And", ["$TimerActive"], "$LastTimerActive"],
// Set timer if automatic mode was triggered
["And", ["$TriggerAutomaticSaved", "$SystemOk"], "$TimerShouldRun"], // start timer only if also system ok was announced
["Monoflop", "$TimerShouldRun", "$Cancel", "$TimerActive", "$AutoTime", 2], // not retriggerable, rising-edge controlled, reset on cancel
// build target state (run or not)
["Or", ["$TriggerAutomaticSaved", "$TimerActive"], "$AutomaticModeActive"],
// $LastTimerActive added to detect cancel properly
["Or", ["$AutomaticModeActive", "$TriggerInpAutomaticRising", "$LastTimerActive"], "$AutomaticModeActiveOrRequested"],
["Or", ["$ManualOn", "$AutomaticModeActive"], "$ShouldRun"],
// build state
["And", ["$ShouldRun", "$SystemOk"], "$ShouldRunAndSysOk"], //bypass to skip state 1
["And", ["$AutomaticModeActiveOrRequested", "$Cancel"], "$CancelAndAutoActive"], // bypass to only announce finished on cancel from state 0, 1 or 2 when automatic mode was active
["Statemachine",
// 0: Circuit Off
// 1: Requesting for SystemOK
// 2: Circuit On
// 3: Finishing
[
// [condition , current state, next state, timeout]
// cancel state transitions
["$CancelAndAutoActive", 0, 3, "$Timeout"],
["$CancelAndAutoActive", 1, 3, "$Timeout"],
["$CancelAndAutoActive", 2, 3, "$Timeout"],
["$Cancel", 1, 3, "$Timeout"], // state 1 calls state 3 with timeout when cancel in manual mode is called to handle inhibit during request properly
["$Cancel", 2, 3, "$Timeout"], // state 2 calls state 3 with timeout when cancel in manual mode is called.
// normal operation state transitions
["$ShouldRunAndSysOk", 0, 2, 0], // bypass to skip state 1
["$ShouldRun", 0, 1, 0], // new request
["-$ShouldRun", 1, 0, 0], // cancel request
["$SystemOk", 1, 2, 0], // system reported ok
["$ShouldRun", 2, 2, 0], // running
["-$ShouldRun", 2, 3, "$Timeout"], // finishing
[0, 3, 0, 0] // end
],
"$State"
],
// set some outputs only if system should run now or was running in last tick
["Or", ["$ShouldRun", "$LastShouldRun"], "$SetOutputs"],
// Map state to outputs
["Comparator", "$State", "$CircuitFinished", "$Konst2"], // Finished (only 1 when state > 2)
["Comparator", "$State", "$CircuitState", 0], // Circuit State (only 1 when state > 0)
["Comparator", "$State", "$SystemRequest", 0], // SystemRequest (only 1 when state > 0)
["Multiplexer", [0, 0, "$Konst1", 0], "$ValveOut", "$State"], // Valve (1 only in state 2)
["And", ["$SetOutputs", "$CircuitState"], "$CircuitState"],
["And", ["$SetOutputs", "$SystemRequest"], "$SystemRequest"],
// announce finished when canceld or automatic finished
["Or", ["$LastShouldRun", "$TriggerInpAutomaticRising"], "$LastShouldRunOrAutoRising"], // announce also when auto was triggered
["And", ["$Cancel", "$LastShouldRunOrAutoRising"], "$CancelFinished"],
["Or", ["$CancelFinished", "$CircuitFinished"], "$CircuitFinished"],
// Cyclic trigger with different intervall for on/off-phase
["Multiplexer", ["$SendIntervalOff", "$SendIntervalOn"], "$SendInterval", "$ValveOut"], // Select Interval
["Clocksignal","$KonstTrue","$Clk","$SendInterval"],
// Start stopwatch to provide runtime and remaining time of circuit
["Stopwatch", "$ValveOut", "$Time_sec_actual"],
["Polynomial", "$Konst1", "$Time_sec_remaining",["$AutoTime", "-$Time_sec_actual"]],
["Multiplexer", [0,"$Time_sec_remaining"], "$Time_sec_remaining", "$AutomaticModeActive"], // set to remaining to zero to not irritate user when running manual
// Set remaining time to automatic time, when off.
["Latch","$AutoTime_global","$Time_sec_remaining","-$CircuitState",0],
// convert to minutes
["Ratio", "$Time_sec_actual", "$Time_min_actual", "$Konst60"],
["Ratio", "$Time_sec_remaining", "$Time_min_remaining", "$Konst60"],
// Reset Trigger
["Multiplexer", [0, "$TriggerAutomaticSaved", "$TriggerAutomaticSaved", "$TriggerAutomaticSaved"], "$TriggerAutomaticSaved", "$State"],
// set last variables
["And", ["$ShouldRun"], "$LastShouldRun"],
// Reset Inputs
["Latch", "$KonstFalse", "$TriggerInpAutomaticIn1", "$KonstTrue", 0],
["Latch", "$KonstFalse", "$TriggerInpAutomaticIn2", "$KonstTrue", 0],
["Latch", "$KonstFalse", "$TriggerInpStartIn1", "$KonstTrue", 0],
["Latch", "$KonstFalse", "$TriggerInpStartIn2", "$KonstTrue", 0],
["Latch", "$KonstFalse", "$TriggerInpStopIn1", "$KonstTrue", 0],
["Latch", "$KonstFalse", "$TriggerInpStopIn2", "$KonstTrue", 0]
]
}
Code: Alles auswählen
Index: Irrigation_CircuitControl.twl
===================================================================
--- Irrigation_CircuitControl.twl (revision 78)
+++ Irrigation_CircuitControl.twl (revision 79)
@@ -15,7 +15,7 @@
["Trigger Stop 1", "(RISING) Stops any active cycle", "$TriggerInpStopIn1", "c"],
["Trigger Stop 2", "(RISING) Stops any active cycle", "$TriggerInpStopIn2", "c"],
["Automatic Time [min]", "(T_s) Time of one irrigation cycle", "$AutoTime_min", "u"],
- ["Global Factor", "Factor to scale circuit timer", "$GlobalFactor", "u"],
+ ["Global Factor", "Factor to scale circuit timer", "$GlobalFactor", "c"],
["System OK Feedback", "(0/1) Loopback of SystemControl", "$SystemOk", "a"],
["Send interval on [s]", "Send outputs with ct periodically during circuit on", "$SendIntervalOn", "u"],
["Send interval off [s]", "Send outputs with ct periodically during circuit off", "$SendIntervalOff", "u"],
@@ -83,6 +83,7 @@
["$Clk", "bool", false],
["$GlobalFactor", "float", 1.0], // Global factor on circuit time, used if triggered manually or by auto2
["$GlobalFactorLim", "float", 1.0],
+ ["$GlobalFactorValid", "bool", false],
["$TriggerNoFactor", "bool", false],
["$TriggerWithFactor", "bool", false],
["$TriggerAutomaticSaved", "bool", false],
@@ -101,15 +102,17 @@
// calculate time in seconds
["Polynomial", "$Konst60", "$AutoTime_sec",["$Konst0", "$AutoTime_min"]],
// Limit factor
- ["Limiter","$GlobalFactor","$GlobalFactorLim",0,["$Konst005", "$Konst2"]],
+ ["Limiter","$GlobalFactor","$GlobalFactorLim","$GlobalFactorValid",["$Konst005", "$Konst2"]],
// calculate time with global factor
["Polynomial", "$GlobalFactorLim", "$AutoTime_global",["$Konst0", "$AutoTime_sec"]],
// take over current circuit time
- ["Or", ["$TriggerInpStartIn1","$TriggerInpStartIn2","$TriggerInpAutomaticIn2"], "$TriggerNoFactor"],
+ ["Or", ["$TriggerInpStartIn1","$TriggerInpStartIn2"], "$TriggerNoFactor"],
["And", ["$TriggerNoFactor","-$State"], "$TriggerNoFactor"],
["Latch","$AutoTime_sec","$AutoTime","$TriggerNoFactor",1],
- ["And", ["$TriggerInpAutomaticIn1","-$State"], "$TriggerWithFactor"],
+
+ ["Or", ["$TriggerInpAutomaticIn1", "$TriggerInpAutomaticIn2"],"$TriggerWithFactor"],
+ ["And", ["$TriggerWithFactor","-$State"], "$TriggerWithFactor"],
["Latch","$AutoTime_global","$AutoTime","$TriggerWithFactor",1],
// calculate inputs
@@ -119,7 +122,7 @@
// calculate cancel state
["Or", ["$VAR<Inhibit?>"], "$Inhibit"],
- ["Or", ["$Inhibit", "$TriggerInpStopRising"], "$Cancel"],
+ ["Or", ["$Inhibit", "$TriggerInpStopRising", "-$GlobalFactorValid"], "$Cancel"],
// calculate manual state
["Or",["$TriggerInpStartRising", "$ManualOn"],"$ManualOn"],
@@ -135,13 +138,6 @@
// Set timer if automatic mode was triggered
["And", ["$TriggerAutomaticSaved", "$SystemOk"], "$TimerShouldRun"], // start timer only if also system ok was announced
["Monoflop", "$TimerShouldRun", "$Cancel", "$TimerActive", "$AutoTime", 2], // not retriggerable, rising-edge controlled, reset on cancel
-
- // Start stopwatch to provide runtime and remaining time of circuit
- ["Stopwatch", "$TimerActive", "$Time_sec_actual"],
- ["Polynomial", "$Konst1", "$Time_sec_remaining",["$AutoTime", "-$Time_sec_actual"]],
- // convert to minutes
- ["Ratio", "$Time_sec_actual", "$Time_min_actual", "$Konst60"],
- ["Ratio", "$Time_sec_remaining", "$Time_min_remaining", "$Konst60"],
// build target state (run or not)
["Or", ["$TriggerAutomaticSaved", "$TimerActive"], "$AutomaticModeActive"],
@@ -201,10 +197,18 @@
["Multiplexer", ["$SendIntervalOff", "$SendIntervalOn"], "$SendInterval", "$ValveOut"], // Select Interval
["Clocksignal","$KonstTrue","$Clk","$SendInterval"],
- // Set remaining time zero, when off.
- ["Latch","$Konst0","$Time_sec_remaining","-$CircuitState",0],
- ["Latch","$Konst0","$Time_min_remaining","-$CircuitState",0],
+ // Start stopwatch to provide runtime and remaining time of circuit
+ ["Stopwatch", "$ValveOut", "$Time_sec_actual"],
+ ["Polynomial", "$Konst1", "$Time_sec_remaining",["$AutoTime", "-$Time_sec_actual"]],
+ ["Multiplexer", [0,"$Time_sec_remaining"], "$Time_sec_remaining", "$AutomaticModeActive"], // set to remaining to zero to not irritate user when running manual
+ // Set remaining time to automatic time, when off.
+ ["Latch","$AutoTime_global","$Time_sec_remaining","-$CircuitState",0],
+
+ // convert to minutes
+ ["Ratio", "$Time_sec_actual", "$Time_min_actual", "$Konst60"],
+ ["Ratio", "$Time_sec_remaining", "$Time_min_remaining", "$Konst60"],
+
// Reset Trigger
["Multiplexer", [0, "$TriggerAutomaticSaved", "$TriggerAutomaticSaved", "$TriggerAutomaticSaved"], "$TriggerAutomaticSaved", "$State"],
Ich erwarte da halt was anderes und es passiert "Magie". 
