diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index a782ee5..87c6d53 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -43,7 +43,7 @@ jobs: - name: push run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then - git rebase origin/master --strategy-option ours --force-rebase + git rebase origin/master --strategy-option ours git log -5 echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; @@ -59,22 +59,21 @@ jobs: echo 'pushed new branch and created pr'; else if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then - git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }} - #git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - #git -C ../cloned fetch origin #--depth=1 - #git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH - #mv ../cloned/.git .. - #rm -rf ../cloned - #cp -r . ../cloned - #rm -rf ../cloned/.git - #mv ../.git ../cloned - #mv .git/config ../cloned/.git - #rm -r ./* - #rm -r .git - #mv ../cloned/* . - #mv ../cloned/.git . - #git add -A - #git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH + mv ../cloned/.git .. + rm -rf ../cloned + cp -r . ../cloned + rm -rf ../cloned/.git + mv ../.git ../cloned + mv .git/config ../cloned/.git + rm -r ./* + rm -r .git + mv ../cloned/* . + mv ../cloned/.git . + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; else echo 'no changes so no push' diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index c0e1c36..83ddfe8 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -43,22 +43,21 @@ jobs: git push origin HEAD:${{ env.BUILD_BRANCH }}; else if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then - git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }} - #git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - #git -C ../cloned fetch origin #--depth=1 - #git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH - #mv ../cloned/.git .. - #rm -rf ../cloned - #cp -r . ../cloned - #rm -rf ../cloned/.git - #mv ../.git ../cloned - #mv .git/config ../cloned/.git - #rm -r ./* - #rm -r .git - #mv ../cloned/* . - #mv ../cloned/.git . - #git add -A - #git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH + mv ../cloned/.git .. + rm -rf ../cloned + cp -r . ../cloned + rm -rf ../cloned/.git + mv ../.git ../cloned + mv .git/config ../cloned/.git + rm -r ./* + rm -r .git + mv ../cloned/* . + mv ../cloned/.git . + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git push origin HEAD:${{ env.BUILD_BRANCH }} else echo 'no changes so no push' diff --git a/equipment-model.axml b/equipment-model.axml new file mode 100644 index 0000000..5d0127c --- /dev/null +++ b/equipment-model.axml @@ -0,0 +1 @@ +1.00AREA1444YES_NO1YES19NO0PHASE_FAILURES0$TIMER_TYPE13COUNT_DOWN0COUNT_UP1$HOLD_BEHAVIOR1RETENTIVE1RESET2CONTINUE0REPORTING_CONTEXTS1NULL0STATICInstructionBasedServerInstructionBasedServer.dsdfOPCINSTRUCTIONSINSTRUCTIONSWATCHDOGINSTRUCTIONSWATCHDOGW10006000011Begin Approvals-111qUsed to formally begin the approval process.Confirm Author-220Confirmation by the author of the recipe tgabghatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh....Revi edcdw Recipe-330Confirmation that the recipe has been reviewed by the signer(s)Approve Recipe-440Confirmation that the recipe has been approved by the signer(s)Release Recipe as Step-521Confirmation that this step can be available for use by others.Release Recipe to Production-621Confirmation that this recipe can be available to put on the batch list.Release Recipe as Step-711Confirmation that this step can be available for use by others.Release Recipe to Production-811Confirmation that this recipe can be available to put on the batch list.00NOT_AVAILABLEPARMTR01RealfalsePARMTR02RealfalsePARMTR03RealfalseREPORT01RealfalseREPORT02RealfalseREQUST01RealfalseREQUST02RealfalsePCELL_CLS1CFactory1.BMPUNIT_CLS1UAGImixer.BMP$TIMER_DN_SECONDPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse65535300104147200SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_MINUTEPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse65535200.1769120MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_HOURPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse6553550.0031152HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_DAYPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse655355048DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_SECONDPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_MINUTEPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_HOURPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_DAYPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$NULLPstopwatch.bmptrueStandard0000truePHASE1Pagitator.bmpfalseStandard0000truePROCESS_CELL1PCELL_CLS1101UNIT1UNIT1UNIT_CLS1201PHASE11PHASE11PHASE1TAGPHASE310instruction.htmfalsefalse100060000InstructionBasedServerIntegerINSTRUCTIONSPHASE11.OCINSTRUCTIONSPHASE11.OCWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.FINSTRUCTIONSPHASE11.FWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.WINSTRUCTIONSPHASE11.WWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.PINSTRUCTIONSPHASE11.PWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.PDINSTRUCTIONSPHASE11.PDWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.RQINSTRUCTIONSPHASE11.RQWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.SSINSTRUCTIONSPHASE11.SSWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.STINSTRUCTIONSPHASE11.STWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.SIINSTRUCTIONSPHASE11.SIWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.UNINSTRUCTIONSPHASE11.UNWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.Q01INSTRUCTIONSPHASE11.Q01WInstructionBasedServerIntegerINSTRUCTIONSPHASE11.Q02INSTRUCTIONSPHASE11.Q02W \ No newline at end of file diff --git a/instructions/equipment-model2.axml b/instructions/equipment-model2.axml new file mode 100644 index 0000000..9c172b8 --- /dev/null +++ b/instructions/equipment-model2.axml @@ -0,0 +1 @@ +1.00AREA1YES_NO1YES1NO0PHASE_FAILURES0$TIMER_TYPE1COUNT_DOWN0COUNT_UP1$HOLD_BEHAVIOR1RETENTIVE1RESET2CONTINUE0REPORTING_CONTEXTS1NULL0STATICInstructionBasedServerInstructionBasedServer.dsdfOPCINSTRUCTIONSINSTRUCTIONSWATCHDOGINSTRUCTIONSWATCHDOGW10006000011Begin Approvals-111Used to formally begin the approval process.Confirm Author-220Confirmation by the author of the recipe that it is readybg f review.s...hhh....Review Recipe-330Confirmation that the recipe has been reviewed by the signer(s)Approve Recipe-440Confirmation that the recipe has been approved by the signer(s)Release Recipe as Step-521Confirmation that this step can be available for use by others.Release Recipe to Production-621Confirmation that this recipe can be available to put on the batch list.Release Recipe as Step-711Confirmation that this step can be available for use by others.Release Recipe to Production-811Confirmation that this recipe can be available to put on the batch list.00NOT_AVAILABLEPARMTR01RealfalsePARMTR02RealfalsePARMTR03RealfalseREPORT01RealfalseREPORT02RealfalseREQUST01RealfalseREQUST02RealfalsePCELL_CLS1CFactory1.BMPUNIT_CLS1UAGImixer.BMP$TIMER_DN_SECONDPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse65535300104147200SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_MINUTEPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse65535200.1769120MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_HOURPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse6553550.0031152HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_DN_DAYPstopwatch.bmptrueStandard3200true$TIMER_TYPE1Enumerationfalse65535COUNT_DOWN$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$SETPOINT3Realfalse655355048DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplate$ELAPSED_TIME1Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$REMAINING_TIME2Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_SECONDPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535SECONDSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_MINUTEPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535MINUTESNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_HOURPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535HOURSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$TIMER_UP_DAYPstopwatch.bmptrueStandard2100true$TIMER_TYPE1Enumerationfalse65535COUNT_UP$TIMER_TYPE$HOLD_BEHAVIOR2Enumerationfalse65535CONTINUE$HOLD_BEHAVIOR$ELAPSED_TIME1Real065535DAYSNo_LimitsfalseNoneSignatureTemplateSignatureTemplateSignatureTemplateAbsolute$NULLPstopwatch.bmptrueStandard0000truePHASE1Pagitator.bmpfalseStandard0000truePROCESS_CELL1PCELL_CLS1101UNIT1UNIT1UNIT_CLS1201PHASE11PHASE11PHASE1TAGPHASE310instruction.htmfalsefalse100060000InstructionBasedServerIntegerINSTRUCTIONSPHASE11.OCINSTRUCTIONSPHASE11.OCWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.FINSTRUCTIONSPHASE11.FWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.WINSTRUCTIONSPHASE11.WWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.PINSTRUCTIONSPHASE11.PWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.PDINSTRUCTIONSPHASE11.PDWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.RQINSTRUCTIONSPHASE11.RQWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.SSINSTRUCTIONSPHASE11.SSWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.STINSTRUCTIONSPHASE11.STWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.SIINSTRUCTIONSPHASE11.SIWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.UNINSTRUCTIONSPHASE11.UNWInstructionBasedServerIntegerINSTRUCTIONSPHASE11.Q01INSTRUCTIONSPHASE11.Q01WInstructionBasedServerIntegerINSTRUCTIONSPHASE11.Q02INSTRUCTIONSPHASE11.Q02W \ No newline at end of file