Merge pull request 'format-branch' (#16) from format-branch into master

Reviewed-on: #16
2023-10-17 19:53:28 +00:00 · 2023-10-17 19:53:28 +00:00 · 126229be5a
parent 029bd7290c bdfce63019
commit 126229be5a
3 changed files with 50 additions and 239 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
-equipment-model.cfg
+*.cfg
 logs
 journals
 restart
--- a/README.md
+++ b/README.md
@ -20,8 +20,9 @@ sudo apt-get install -y tea
 ### FTBatch development pc on development branch

 ```sh
-git branch -D format-branch
-git checkout -b format-branch
+?git branch -D format-branch
+git checkout format-branch
+git merge deployed

 ```

--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
@ -7,9 +7,6 @@
  - Version: '1.00'
  - Area:
    - UniqueName: AREA1
-  - EnumerationSet:
-    - UniqueName: PHASE_FAILURES
-    - Type: '0'
  - EnumerationSet:
    - UniqueName: YES_NO
    - Type: '1'
@ -19,6 +16,9 @@
    - Member:
      - Name: NO
      - Ordinal: '0'
+  - EnumerationSet:
+    - UniqueName: PHASE_FAILURES
+    - Type: '0'
  - EnumerationSet:
    - UniqueName: $TIMER_TYPE
    - Type: '1'
@ -62,18 +62,6 @@
    - LocalServer: '1'
    - RemoteServerLocation: null
    - WatchdogProtocol: '1'
-  - SignatureTemplate:
-    - Name: Template
-    - Index: '1'
-    - LastSignoff: '0'
-    - Signoff:
-      - Index: '1'
-      - Meaning: ok
-      - Comment: Optional
-      - Permission:
-        - DomainOrComputer: null
-        - UserOrGroup: Engineers
-        - UserIsGroup: 'true'
  - CommandVerificationPolicies:
    - AbortCmd:
      - SignatureTemplateName: null
@ -137,8 +125,8 @@
      - Id: '-1'
      - StepOrder: '1'
      - Required: '1'
-      - ApproveSignatureTemplateName: Template
-      - RevertSignatureTemplateName: Template
+      - ApproveSignatureTemplateName: null
+      - RevertSignatureTemplateName: null
      - Description: Used to formally begin the approval process.
    - RecipeApprovalStep:
      - Name: Confirm Author
@ -169,16 +157,16 @@
      - Id: '-5'
      - StepOrder: '2'
      - Required: '1'
-      - ApproveSignatureTemplateName: Template
-      - RevertSignatureTemplateName: Template
+      - ApproveSignatureTemplateName: null
+      - RevertSignatureTemplateName: null
      - Description: Confirmation that this step can be available for use by others.
    - RecipeApprovalStep:
      - Name: Release Recipe to Production
      - Id: '-6'
      - StepOrder: '2'
      - Required: '1'
-      - ApproveSignatureTemplateName: Template
-      - RevertSignatureTemplateName: Template
+      - ApproveSignatureTemplateName: null
+      - RevertSignatureTemplateName: null
      - Description: Confirmation that this recipe can be available to put on the batch list.
  - ExpeditedApprovalsProcess:
    - RecipeApprovalStep:
@ -186,16 +174,16 @@
      - Id: '-7'
      - StepOrder: '1'
      - Required: '1'
-      - ApproveSignatureTemplateName: Template
-      - RevertSignatureTemplateName: Template
+      - ApproveSignatureTemplateName: null
+      - RevertSignatureTemplateName: null
      - Description: Confirmation that this step can be available for use by others.
    - RecipeApprovalStep:
      - Name: Release Recipe to Production
      - Id: '-8'
      - StepOrder: '1'
      - Required: '1'
-      - ApproveSignatureTemplateName: Template
-      - RevertSignatureTemplateName: Template
+      - ApproveSignatureTemplateName: null
+      - RevertSignatureTemplateName: null
      - Description: Confirmation that this recipe can be available to put on the batch list.
  - RecipeApprovalProcessConfigured: '0'
  - EnableRecipeVersioning: '0'
@ -945,43 +933,15 @@
    - SystemCreated: 'false'
    - Type: Standard
    - DefaultControllerProgramName: null
-    - NumberOfParameterTags: '1'
+    - NumberOfParameterTags: '0'
    - NumberOfReportTags: '0'
    - NumberOfRequestTags: '0'
    - NumberOfMessagePartners: '0'
    - ParameterTagLockEnabled: 'true'
-    - RecipeParameter:
-      - Name: QUANTITY
-      - ID: '1'
-      - Type: Real
-      - Scale: 'false'
-      - DownloadFlags: '65535'
-      - Contexts: null
-      - RealDefault: '0'
-      - RealMin: '0'
-      - RealMax: '100'
-      - EngineeringUnits: ENG. UNITS
-      - ParameterLimit:
-        - VerificationMethod: No_Limits
-        - LimitScale: 'false'
-        - NormalAction: None
-        - NormalSignatureTemplate: null
-        - HighLowAction: SignatureTemplate
-        - HighLowSignatureTemplate: null
-        - HighValue: null
-        - LowValue: null
-        - HighHighLowLowAction: SignatureTemplate
-        - HighHighLowLowSignatureTemplate: null
-        - HighHighValue: null
-        - LowLowValue: null
-        - HighHighHighLowLowLowAction: SignatureTemplate
-        - HighHighHighLowLowLowSignatureTemplate: null
-        - HighHighHighValue: null
-        - LowLowLowValue: null
  - ProcessCell:
    - attributes:
-        XPos: '97'
-        YPos: '62'
+        XPos: '160'
+        YPos: '73'
    - UniqueName: PROCESS_CELL1
    - Class: PCELL_CLS1
    - UniqueID: '1'
@ -999,11 +959,10 @@
    - HyperlinkString: null
    - ERPAlias: null
    - ConfiguredUnitName: UNIT1
-    - ConfiguredUnitName: UNIT2
  - Unit:
    - attributes:
-        XPos: '115'
-        YPos: '75'
+        XPos: '101'
+        YPos: '84'
    - UniqueName: UNIT1
    - Class: UNIT_CLS1
    - UniqueID: '2'
@ -1021,34 +980,12 @@
    - HyperlinkString: null
    - HyperlinkString: null
    - ERPAlias: null
-    - ConfiguredEquipmentModuleName: PHASE_ONE
-  - Unit:
-    - attributes:
-        XPos: '326'
-        YPos: '164'
-    - UniqueName: UNIT2
-    - Class: UNIT_CLS1
-    - UniqueID: '4'
-    - Logix5000UID: '0'
-    - Server: null
-    - MaxOwners: '1'
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - ERPAlias: null
-    - ConfiguredEquipmentModuleName: UNIT2_PHASE_ONE
+    - ConfiguredEquipmentModuleName: PHASE11
  - EquipmentModule:
    - attributes:
-        XPos: '190'
-        YPos: '168'
-    - UniqueName: PHASE_ONE
+        XPos: '266'
+        YPos: '225'
+    - UniqueName: PHASE11
    - RecipePhase: PHASE1
    - EquipmentPhaseType: TAGPHASE
    - UniqueID: '3'
@ -1065,125 +1002,6 @@
    - HyperlinkString: null
    - ERPAlias: null
    - UploadDownloadFlags: '0'
-    - InstructionBasedConfiguration:
-      - InstructionFilePathname: instruction
-    - CreateParameterLimitTag: 'false'
-    - CreateReportLimitTag: 'false'
-    - OnControlScanRate: '1000'
-    - OffControlScanRate: '60000'
-    - ControlTagCommand:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.OC
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.OCW
-    - ControlTagFailure:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.F
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.FW
-    - ControlTagOwner:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.W
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.WW
-    - ControlTagPause:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.P
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.PW
-    - ControlTagPaused:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.PD
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.PDW
-    - ControlTagRequest:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.RQ
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.RQW
-    - ControlTagSingleStep:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.SS
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.SSW
-    - ControlTagStatus:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.ST
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.STW
-    - ControlTagStepIndex:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.SI
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.SIW
-    - ControlTagUnit:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.UN
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.UNW
-    - ParameterTag:
-      - Server: InstructionBasedServer
-      - DataType: String
-      - VerificationMethod: No_Limits
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.P01
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.P01W
-    - RequestTag:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.Q01
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.Q01W
-    - RequestTag:
-      - Server: InstructionBasedServer
-      - DataType: Integer
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: PHASE_ONE.Q02
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: PHASE_ONE.Q02W
-  - EquipmentModule:
-    - attributes:
-        XPos: '225'
-        YPos: '265'
-    - UniqueName: UNIT2_PHASE_ONE
-    - RecipePhase: PHASE1
-    - EquipmentPhaseType: TAGPHASE
-    - UniqueID: '5'
-    - MaxOwners: '1'
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - CrossInvocationString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - HyperlinkString: null
-    - ERPAlias: null
-    - UploadDownloadFlags: '0'
    - InstructionBasedConfiguration:
      - InstructionFilePathname: instruction.htm
    - CreateParameterLimitTag: 'false'
@ -1194,91 +1012,83 @@
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.OC
+      - ReadItemName: PHASE11.OC
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.OCW
+      - WriteItemName: PHASE11.OCW
    - ControlTagFailure:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.F
+      - ReadItemName: PHASE11.F
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.FW
+      - WriteItemName: PHASE11.FW
    - ControlTagOwner:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.W
+      - ReadItemName: PHASE11.W
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.WW
+      - WriteItemName: PHASE11.WW
    - ControlTagPause:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.P
+      - ReadItemName: PHASE11.P
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.PW
+      - WriteItemName: PHASE11.PW
    - ControlTagPaused:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.PD
+      - ReadItemName: PHASE11.PD
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.PDW
+      - WriteItemName: PHASE11.PDW
    - ControlTagRequest:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.RQ
+      - ReadItemName: PHASE11.RQ
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.RQW
+      - WriteItemName: PHASE11.RQW
    - ControlTagSingleStep:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.SS
+      - ReadItemName: PHASE11.SS
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.SSW
+      - WriteItemName: PHASE11.SSW
    - ControlTagStatus:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.ST
+      - ReadItemName: PHASE11.ST
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.STW
+      - WriteItemName: PHASE11.STW
    - ControlTagStepIndex:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.SI
+      - ReadItemName: PHASE11.SI
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.SIW
+      - WriteItemName: PHASE11.SIW
    - ControlTagUnit:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.UN
+      - ReadItemName: PHASE11.UN
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.UNW
-    - ParameterTag:
-      - Server: InstructionBasedServer
-      - DataType: String
-      - VerificationMethod: No_Limits
-      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.P01
-      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.P01W
+      - WriteItemName: PHASE11.UNW
    - RequestTag:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.Q01
+      - ReadItemName: PHASE11.Q01
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.Q01W
+      - WriteItemName: PHASE11.Q01W
    - RequestTag:
      - Server: InstructionBasedServer
      - DataType: Integer
      - ReadAccessPath: INSTRUCTIONS
-      - ReadItemName: UNIT2_PHASE_ONE.Q02
+      - ReadItemName: PHASE11.Q02
      - WriteAccessPath: INSTRUCTIONS
-      - WriteItemName: UNIT2_PHASE_ONE.Q02W
+      - WriteItemName: PHASE11.Q02W