diff --git a/OvenLine2/Nodes/DataStores/DataStores.yaml b/OvenLine2/Nodes/DataStores/DataStores.yaml index 9c73eef..744d4e2 100644 --- a/OvenLine2/Nodes/DataStores/DataStores.yaml +++ b/OvenLine2/Nodes/DataStores/DataStores.yaml @@ -80,6 +80,9 @@ Children: - Name: Z4_Avg Type: StoreColumn DataType: Float + - Name: Z5_Avg + Type: StoreColumn + DataType: Float - Name: RecordLimit Type: BaseDataVariableType DataType: UInt32 @@ -133,6 +136,12 @@ Children: - Name: Z4_SP Type: StoreColumn DataType: Float + - Name: Z5_PV + Type: StoreColumn + DataType: Float + - Name: Z5_SP + Type: StoreColumn + DataType: Float - Name: RecordLimit Type: BaseDataVariableType DataType: UInt32 diff --git a/OvenLine2/Nodes/Loggers/Loggers.yaml b/OvenLine2/Nodes/Loggers/Loggers.yaml index 393447c..b0ea25d 100644 --- a/OvenLine2/Nodes/Loggers/Loggers.yaml +++ b/OvenLine2/Nodes/Loggers/Loggers.yaml @@ -219,6 +219,56 @@ Children: Type: BaseVariableType DataType: DynamicLinkMode Value: 2 + - Name: Z5_PV + Type: VariableToLog + DataType: BaseDataType + Children: + - Name: LastValue + Type: PropertyType + DataType: BaseDataType + AccessLevel: Read + - Name: Timestamp + Type: PropertyType + DataType: UtcTime + AccessLevel: Read + - Name: LastOperationCode + Type: PropertyType + DataType: StatusCode + AccessLevel: Read + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "../../../../Model/Oven/Zones/Z5/PV" + Children: + - Name: Mode + Type: BaseVariableType + DataType: DynamicLinkMode + Value: 2 + - Name: Z5_SP + Type: VariableToLog + DataType: BaseDataType + Children: + - Name: LastValue + Type: PropertyType + DataType: BaseDataType + AccessLevel: Read + - Name: Timestamp + Type: PropertyType + DataType: UtcTime + AccessLevel: Read + - Name: LastOperationCode + Type: PropertyType + DataType: StatusCode + AccessLevel: Read + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "../../../../Model/Oven/Zones/Z5/SP" + Children: + - Name: Mode + Type: BaseVariableType + DataType: DynamicLinkMode + Value: 2 - Class: Reference Target: ns=8;i=21 Direction: Forward diff --git a/OvenLine2/Nodes/UI/Screens/Screens.yaml b/OvenLine2/Nodes/UI/Screens/Screens.yaml index 4534541..0b2dc2b 100644 --- a/OvenLine2/Nodes/UI/Screens/Screens.yaml +++ b/OvenLine2/Nodes/UI/Screens/Screens.yaml @@ -490,6 +490,93 @@ Children: Type: DynamicLink DataType: NodePath Value: "{Zone}/Output" + - Name: TileZ5 + Type: ZoneTile + Children: + - Name: LeftMargin + Type: BaseVariableType + DataType: Size + ModellingRule: Optional + Value: 1016.0 + - Name: TopMargin + Type: BaseVariableType + DataType: Size + ModellingRule: Optional + Value: 72.0 + - Name: Zone + Type: Alias + DataType: NodeId + Value: "/Objects/OvenLine2/Model/Oven/Zones/Z5" + Children: + - Name: Kind + Type: PropertyType + DataType: NodeId + Value: "/Objects/OvenLine2/Model/ZoneType" + - Name: Card + Type: Rectangle + - Name: Stripe + Type: Rectangle + Children: + - Name: FillColor + Type: BaseDataVariableType + DataType: Color + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "/Objects/OvenLine2/UI/Palette/Series5" + - Name: Name + Type: Label + Children: + - Name: Text + Type: BaseDataVariableType + DataType: LocalizedText + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "{Zone}@BrowseName" + - Name: Caption + Type: Label + - Name: PV + Type: Label + Children: + - Name: Text + Type: BaseDataVariableType + DataType: LocalizedText + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "{Zone}/PV" + - Name: PVUnit + Type: Label + - Name: SPCaption + Type: Label + - Name: SP + Type: Label + Children: + - Name: Text + Type: BaseDataVariableType + DataType: LocalizedText + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "{Zone}/SP" + - Name: OutCaption + Type: Label + - Name: Output + Type: Label + Children: + - Name: Text + Type: BaseDataVariableType + DataType: LocalizedText + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "{Zone}/Output" - Name: BeltCard Type: Rectangle Children: @@ -1247,6 +1334,37 @@ Children: DataType: LocalizedText ModellingRule: Optional Value: {"LocaleId":"en-US","Text":"Z4 PV"} + - Name: Z5_PV + Type: TrendPen + DataType: Float + Children: + - Name: Thickness + Type: BaseDataVariableType + DataType: Size + Value: 2.0 + - Name: Enabled + Type: BaseDataVariableType + DataType: Boolean + Value: true + - Name: Thresholds + Type: BaseObjectType + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "/Objects/OvenLine2/Loggers/OvenLogger/VariablesToLog/Z5_PV/LastValue" + - Name: Color + Type: BaseDataVariableType + DataType: Color + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "/Objects/OvenLine2/UI/Palette/Series5" + - Name: Title + Type: BaseDataVariableType + DataType: LocalizedText + ModellingRule: Optional + Value: {"LocaleId":"en-US","Text":"Z5 PV"} - Class: Reference Target: ns=3;i=1129 Direction: Forward @@ -4475,6 +4593,41 @@ Children: Type: DynamicLink DataType: NodePath Value: "{Item}/Z4_Avg" + - Name: Z5_AvgColumn + Type: DataGridColumn + Children: + - Name: Title + Type: BaseDataVariableType + DataType: LocalizedText + Value: {"LocaleId":"en-US","Text":"Z5 AVG"} + - Name: Width + Type: BaseDataVariableType + DataType: Size + Value: 56.0 + - Name: Visible + Type: BaseDataVariableType + DataType: Boolean + Value: true + - Name: HeaderAlignment + Type: BaseDataVariableType + DataType: TextHorizontalAlignment + - Name: ContentAlignment + Type: BaseVariableType + DataType: HorizontalAlignment + - Name: OrderBy + Type: BaseDataVariableType + DataType: NodePath + - Name: DataItemTemplate + Type: DataGridLabelItemTemplate + Children: + - Name: Text + Type: BaseDataVariableType + DataType: LocalizedText + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "{Item}/Z5_Avg" - Name: ResultColumn Type: DataGridColumn Children: @@ -5195,6 +5348,33 @@ Children: DataType: LocalizedText ModellingRule: Optional Value: {"LocaleId":"en-US","Text":"Z4 PV"} + - Name: Z5_PV + Type: TrendPen + DataType: Float + Children: + - Name: Thickness + Type: BaseDataVariableType + DataType: Size + Value: 2.0 + - Name: Enabled + Type: BaseDataVariableType + DataType: Boolean + Value: true + - Name: Thresholds + Type: BaseObjectType + - Name: Color + Type: BaseDataVariableType + DataType: Color + Children: + - Name: DynamicLink + Type: DynamicLink + DataType: NodePath + Value: "/Objects/OvenLine2/UI/Palette/Series5" + - Name: Title + Type: BaseDataVariableType + DataType: LocalizedText + ModellingRule: Optional + Value: {"LocaleId":"en-US","Text":"Z5 PV"} - Class: Reference Target: ns=3;i=1129 Direction: Forward diff --git a/OvenLine2/ProjectFiles/NetSolution/OvenZones.cs b/OvenLine2/ProjectFiles/NetSolution/OvenZones.cs index cf4e150..b5dd79e 100644 --- a/OvenLine2/ProjectFiles/NetSolution/OvenZones.cs +++ b/OvenLine2/ProjectFiles/NetSolution/OvenZones.cs @@ -2,5 +2,5 @@ // Model/Oven/Zones; the run journal logs and averages only the zones listed here. public static class OvenZones { - public static readonly string[] Shown = { "Z1", "Z2", "Z3", "Z4" }; + public static readonly string[] Shown = { "Z1", "Z2", "Z3", "Z4", "Z5" }; }