diff --git a/.drone.yml b/.drone.yml index 6389ed6..ee056c9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -92,22 +92,6 @@ steps: GIT_USER: from_secret: GIT_USER -- name: "check out product-development" - when: - branch: - - format-branch - image: alpine/git:latest - commands: - - git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f' - - git fetch - - git checkout product-development - - git merge format-branch - environment: - GIT_PASSWORD: - from_secret: GIT_PASSWORD - GIT_USER: - from_secret: GIT_USER - - name: "convert to xml" image: sigyl/zone-10-batch2yaml:latest when: diff --git a/equipment-model.axml b/equipment-model.axml index 5b003dd..3d889a2 100644 --- a/equipment-model.axml +++ b/equipment-model.axml @@ -1,6 +1,2 @@ -<<<<<<< Updated upstream -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 ready for review.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 -======= -1.00AREA1PHASE_FAILURES0YES_NO1YES1NO0$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 ready for review.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_CLS1101UNIT1UNIT2PROCESS_CELL2PCELL_CLS1501UNIT1UNIT_CLS1201PHASE11UNIT2UNIT_CLS1401PHASE11PHASE1TAGPHASE310instruction.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 ->>>>>>> Stashed changes +1.00AREA1PHASE_FAILURES0YES_NO1YES1NO0$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 ready for review.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_CLS1101UNIT1UNIT2PROCESS_CELL2PCELL_CLS1501UNIT1UNIT_CLS1201PHASE11UNIT2UNIT_CLS1401PHASE11PHASE1TAGPHASE310instruction.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