Merge pull request 'this is a PR! it rocks!' (#14) from product-development into master
Reviewed-on: #14
This commit is contained in:
commit
830909d1b0
44
README.md
44
README.md
|
@ -4,3 +4,47 @@ This repository will store and allow versioning and approval of a batch configur
|
|||
|
||||
This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file.
|
||||
|
||||
## change process
|
||||
|
||||
### FTBatch development pc on development branch
|
||||
|
||||
```sh
|
||||
git branch -D format-branch
|
||||
git checkout -b format-branch
|
||||
|
||||
```
|
||||
|
||||
make changes and export files
|
||||
|
||||
commit and push back to server
|
||||
|
||||
```sh
|
||||
git add -A
|
||||
git commit
|
||||
git push origin format-branch
|
||||
```
|
||||
|
||||
### format-bot pc
|
||||
|
||||
```sh
|
||||
git branch -D format-branch
|
||||
git fetch origin
|
||||
git checkout -b format-branch
|
||||
git checkout master
|
||||
git pull
|
||||
git branch -D product-development
|
||||
git checkout -b product-development
|
||||
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
|
||||
|
||||
```
|
||||
|
||||
run the formatter
|
||||
|
||||
```sh
|
||||
git add -A
|
||||
git commit
|
||||
git push origin product-development
|
||||
git push origin --delete format-branch
|
||||
|
||||
```
|
||||
|
||||
|
|
|
@ -981,7 +981,7 @@
|
|||
- ProcessCell:
|
||||
- attributes:
|
||||
XPos: '97'
|
||||
YPos: '61'
|
||||
YPos: '62'
|
||||
- UniqueName: PROCESS_CELL1
|
||||
- Class: PCELL_CLS1
|
||||
- UniqueID: '1'
|
||||
|
@ -1043,6 +1043,7 @@
|
|||
- HyperlinkString: null
|
||||
- HyperlinkString: null
|
||||
- ERPAlias: null
|
||||
- ConfiguredEquipmentModuleName: UNIT2_PHASE_ONE
|
||||
- EquipmentModule:
|
||||
- attributes:
|
||||
XPos: '190'
|
||||
|
@ -1162,3 +1163,122 @@
|
|||
- 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'
|
||||
- CreateReportLimitTag: 'false'
|
||||
- OnControlScanRate: '1000'
|
||||
- OffControlScanRate: '60000'
|
||||
- ControlTagCommand:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.OC
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.OCW
|
||||
- ControlTagFailure:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.F
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.FW
|
||||
- ControlTagOwner:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.W
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.WW
|
||||
- ControlTagPause:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.P
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.PW
|
||||
- ControlTagPaused:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.PD
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.PDW
|
||||
- ControlTagRequest:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.RQ
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.RQW
|
||||
- ControlTagSingleStep:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.SS
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.SSW
|
||||
- ControlTagStatus:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.ST
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.STW
|
||||
- ControlTagStepIndex:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.SI
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.SIW
|
||||
- ControlTagUnit:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.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
|
||||
- RequestTag:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.Q01
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.Q01W
|
||||
- RequestTag:
|
||||
- Server: InstructionBasedServer
|
||||
- DataType: Integer
|
||||
- ReadAccessPath: INSTRUCTIONS
|
||||
- ReadItemName: UNIT2_PHASE_ONE.Q02
|
||||
- WriteAccessPath: INSTRUCTIONS
|
||||
- WriteItemName: UNIT2_PHASE_ONE.Q02W
|
||||
|
|
Loading…
Reference in New Issue