Merge pull request 'ok here' (#73) from develop-7 into master

Reviewed-on: #73

.gitea/workflows/build-develop-branch.yml

@@ -37,7 +37,7 @@ jobs:
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml"
           git push -f origin HEAD:${{ env.BUILD_BRANCH }}
 
-      - name: make pull request
+      - name: make pull request comment
         run: |
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
           chmod +x ./tea

.gitea/workflows/convert-to-yml.yml

@@ -7,7 +7,7 @@ jobs:
     if: ${{ startsWith(github.ref_name, 'format-') }}
     runs-on: ubuntu-latest
     steps:
-      # https://github.com/RouxAntoine/checkout/tree/v3.5.4
+      # https://github.com/RouxAntoine/checkout/tree/v3.5.4 
       - uses: RouxAntoine/checkout@v3.5.4
       - uses: actions/setup-node@v3
         with:
@@ -29,11 +29,11 @@ jobs:
           ls
           git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
           git config --global user.email "username@users.noreply.github.com"
+          git config pull.rebase false
           git checkout -b ${{ env.PRODUCTION_BRANCH }}
           git add -A
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
           git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
-
       - name: make pull request
         run: |
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea

instructions/equipment-model2.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'
@@ -135,7 +135,7 @@
       - Required: '0'
       - ApproveSignatureTemplateName: null
       - RevertSignatureTemplateName: null
-      - Description: Confirmation by the author of the recipe that it is ready for review.
+      - Description: Confirmation by the author of the recipe that it is ready for review.s...hhh....
     - RecipeApprovalStep:
       - Name: Review Recipe
       - Id: '-3'
@@ -959,7 +959,6 @@
     - HyperlinkString: null
     - ERPAlias: null
     - ConfiguredUnitName: UNIT1
-    - ConfiguredUnitName: UNIT2
   - Unit:
     - attributes:
         XPos: '101'
@@ -982,27 +981,6 @@
     - HyperlinkString: null
     - ERPAlias: null
     - ConfiguredEquipmentModuleName: PHASE11
-  - Unit:
-    - attributes:
-        XPos: '245'
-        YPos: '98'
-    - 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
   - EquipmentModule:
     - attributes:
         XPos: '266'