Browse Source

去掉AV Bypass

zhangzw 4 months ago
parent
commit
8d2a24f21b

BIN
TIN001/TIN001/.vs/TIN001/v15/.suo


File diff suppressed because it is too large
+ 4 - 4
TIN001/TIN001/PLC/PLC.tmc


+ 295 - 38
TIN001/TIN001/PLC/POUs/_200_Interlock/Interlock.TcPOU

@@ -107,6 +107,7 @@ VAR
 	AC100VTFPowerOnTrig: R_TRIG;
 	aAVBypass		: ARRAY [1..250] OF BOOL;
 	bBoatUnloadBypass: BOOL;
+	ReBypass: BOOL;
 END_VAR
 ]]></Declaration>
     <Implementation>
@@ -5180,7 +5181,7 @@ bFFUAlarm :=
                     <v n="OutCommented">false</v>
                     <l2 n="NetworkItems">
                       <o t="BoxTreeDemux">
-                        <v n="VarId">6</v>
+                        <v n="VarId">12</v>
                         <o n="Input" t="BoxTreeTerminator">
                           <n n="Input" />
                           <o n="Flags" t="Flags">
@@ -5247,7 +5248,7 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">6</v>
+                              <v n="VarId">12</v>
                               <n n="Input" />
                               <v n="Id">591L</v>
                             </o>
@@ -5291,7 +5292,7 @@ bFFUAlarm :=
                             </o>
                             <o t="BoxTreeOperand">
                               <o n="Operand" t="Operand">
-                                <v n="Operand">"GVL.stPLCtoPMC.T_REF"</v>
+                                <v n="Operand">"GVL.stPMCtoPLC.T_REF_sw"</v>
                                 <v n="Type">"BOOL"</v>
                                 <v n="Comment">""</v>
                                 <v n="SymbolComment">""</v>
@@ -5382,28 +5383,156 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">6</v>
+                              <v n="VarId">12</v>
                               <n n="Input" />
                               <v n="Id">592L</v>
                             </o>
-                            <o t="BoxTreeOperand">
-                              <o n="Operand" t="Operand">
-                                <v n="Operand">"aAVBypass[100]"</v>
-                                <v n="Type">"BOOL"</v>
+                            <o t="BoxTreeBox">
+                              <v n="BoxType">"OR"</v>
+                              <o n="Instance" t="Operand">
+                                <n n="Operand" />
+                                <v n="Type">""</v>
                                 <v n="Comment">""</v>
                                 <v n="SymbolComment">""</v>
                                 <v n="Address">""</v>
                                 <o n="Flags" t="Flags">
                                   <v n="Flags">0</v>
-                                  <v n="Fixed">true</v>
+                                  <v n="Fixed">false</v>
                                   <v n="Extensible">false</v>
                                 </o>
                                 <v n="LValue">false</v>
-                                <v n="Boolean">true</v>
-                                <v n="IsInstance">false</v>
-                                <v n="Id">603L</v>
+                                <v n="Boolean">false</v>
+                                <v n="IsInstance">true</v>
+                                <v n="Id">612L</v>
+                              </o>
+                              <o n="OutputItems" t="OutputItemList">
+                                <l2 n="OutputItems" />
+                              </o>
+                              <o n="Flags" t="Flags">
+                                <v n="Flags">0</v>
+                                <v n="Fixed">false</v>
+                                <v n="Extensible">false</v>
+                              </o>
+                              <n n="InputFlags" />
+                              <l2 n="InputItems">
+                                <o t="BoxTreeOperand">
+                                  <o n="Operand" t="Operand">
+                                    <v n="Operand">"aAVBypass[100]"</v>
+                                    <v n="Type">"BOOL"</v>
+                                    <v n="Comment">""</v>
+                                    <v n="SymbolComment">""</v>
+                                    <v n="Address">""</v>
+                                    <o n="Flags" t="Flags">
+                                      <v n="Flags">0</v>
+                                      <v n="Fixed">true</v>
+                                      <v n="Extensible">false</v>
+                                    </o>
+                                    <v n="LValue">false</v>
+                                    <v n="Boolean">true</v>
+                                    <v n="IsInstance">false</v>
+                                    <v n="Id">603L</v>
+                                  </o>
+                                  <v n="Id">602L</v>
+                                </o>
+                                <o t="BoxTreeBox">
+                                  <v n="BoxType">"AND"</v>
+                                  <o n="Instance" t="Operand">
+                                    <n n="Operand" />
+                                    <v n="Type">""</v>
+                                    <v n="Comment">""</v>
+                                    <v n="SymbolComment">""</v>
+                                    <v n="Address">""</v>
+                                    <o n="Flags" t="Flags">
+                                      <v n="Flags">0</v>
+                                      <v n="Fixed">false</v>
+                                      <v n="Extensible">false</v>
+                                    </o>
+                                    <v n="LValue">false</v>
+                                    <v n="Boolean">false</v>
+                                    <v n="IsInstance">true</v>
+                                    <v n="Id">616L</v>
+                                  </o>
+                                  <o n="OutputItems" t="OutputItemList">
+                                    <l2 n="OutputItems" />
+                                  </o>
+                                  <o n="Flags" t="Flags">
+                                    <v n="Flags">0</v>
+                                    <v n="Fixed">false</v>
+                                    <v n="Extensible">false</v>
+                                  </o>
+                                  <n n="InputFlags" />
+                                  <l2 n="InputItems" cet="BoxTreeOperand">
+                                    <o>
+                                      <o n="Operand" t="Operand">
+                                        <v n="Operand">"aAVBypass[100]"</v>
+                                        <v n="Type">"BOOL"</v>
+                                        <v n="Comment">""</v>
+                                        <v n="SymbolComment">""</v>
+                                        <v n="Address">""</v>
+                                        <o n="Flags" t="Flags">
+                                          <v n="Flags">1</v>
+                                          <v n="Fixed">true</v>
+                                          <v n="Extensible">false</v>
+                                        </o>
+                                        <v n="LValue">false</v>
+                                        <v n="Boolean">true</v>
+                                        <v n="IsInstance">false</v>
+                                        <v n="Id">619L</v>
+                                      </o>
+                                      <v n="Id">618L</v>
+                                    </o>
+                                    <o>
+                                      <o n="Operand" t="Operand">
+                                        <v n="Operand">"aILK_AV[100]"</v>
+                                        <v n="Type">"BOOL"</v>
+                                        <v n="Comment">""</v>
+                                        <v n="SymbolComment">""</v>
+                                        <v n="Address">""</v>
+                                        <o n="Flags" t="Flags">
+                                          <v n="Flags">0</v>
+                                          <v n="Fixed">true</v>
+                                          <v n="Extensible">false</v>
+                                        </o>
+                                        <v n="LValue">false</v>
+                                        <v n="Boolean">true</v>
+                                        <v n="IsInstance">false</v>
+                                        <v n="Id">615L</v>
+                                      </o>
+                                      <v n="Id">614L</v>
+                                    </o>
+                                  </l2>
+                                  <o n="InputParam" t="ParamList">
+                                    <l2 n="Names" />
+                                    <l2 n="Types" />
+                                  </o>
+                                  <o n="OutputParam" t="ParamList">
+                                    <l2 n="Names" />
+                                    <l2 n="Types" />
+                                  </o>
+                                  <v n="CallType" t="Operator">And</v>
+                                  <n n="EN" />
+                                  <n n="ENO" />
+                                  <n n="STSnippet" />
+                                  <v n="ContainsExtensibleInputs">false</v>
+                                  <v n="ProvidesSTSnippet">false</v>
+                                  <v n="Id">617L</v>
+                                </o>
+                              </l2>
+                              <o n="InputParam" t="ParamList">
+                                <l2 n="Names" />
+                                <l2 n="Types" />
+                              </o>
+                              <o n="OutputParam" t="ParamList">
+                                <l2 n="Names" />
+                                <l2 n="Types" />
                               </o>
-                              <v n="Id">602L</v>
+                              <v n="CallType" t="Operator">Or</v>
+                              <n n="EN" />
+                              <n n="ENO" />
+                              <n n="STSnippet" />
+                              <v n="ContainsExtensibleInputs">false</v>
+                              <v n="ProvidesSTSnippet">false</v>
+                              <v n="Id">613L</v>
                             </o>
                           </l2>
                           <o n="InputParam" t="ParamList">
@@ -5994,7 +6123,7 @@ bFFUAlarm :=
                     <v n="Id">485L</v>
                   </o>
                 </l2>
-                <v n="BranchCounter">6</v>
+                <v n="BranchCounter">12</v>
                 <v n="ValidIds">true</v>
               </o>
             </Data>
@@ -52070,7 +52199,7 @@ bFFUAlarm :=
                     <v n="OutCommented">false</v>
                     <l2 n="NetworkItems">
                       <o t="BoxTreeDemux">
-                        <v n="VarId">51</v>
+                        <v n="VarId">393</v>
                         <o n="Input" t="BoxTreeTerminator">
                           <n n="Input" />
                           <o n="Flags" t="Flags">
@@ -52137,7 +52266,7 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">51</v>
+                              <v n="VarId">393</v>
                               <n n="Input" />
                               <v n="Id">3594L</v>
                             </o>
@@ -52272,28 +52401,156 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">51</v>
+                              <v n="VarId">393</v>
                               <n n="Input" />
                               <v n="Id">3595L</v>
                             </o>
-                            <o t="BoxTreeOperand">
-                              <o n="Operand" t="Operand">
-                                <v n="Operand">"aAVBypass[88]"</v>
-                                <v n="Type">"BOOL"</v>
+                            <o t="BoxTreeBox">
+                              <v n="BoxType">"OR"</v>
+                              <o n="Instance" t="Operand">
+                                <n n="Operand" />
+                                <v n="Type">""</v>
                                 <v n="Comment">""</v>
                                 <v n="SymbolComment">""</v>
                                 <v n="Address">""</v>
                                 <o n="Flags" t="Flags">
                                   <v n="Flags">0</v>
-                                  <v n="Fixed">true</v>
+                                  <v n="Fixed">false</v>
                                   <v n="Extensible">false</v>
                                 </o>
                                 <v n="LValue">false</v>
-                                <v n="Boolean">true</v>
-                                <v n="IsInstance">false</v>
-                                <v n="Id">3603L</v>
+                                <v n="Boolean">false</v>
+                                <v n="IsInstance">true</v>
+                                <v n="Id">4824L</v>
                               </o>
-                              <v n="Id">3602L</v>
+                              <o n="OutputItems" t="OutputItemList">
+                                <l2 n="OutputItems" />
+                              </o>
+                              <o n="Flags" t="Flags">
+                                <v n="Flags">0</v>
+                                <v n="Fixed">false</v>
+                                <v n="Extensible">false</v>
+                              </o>
+                              <n n="InputFlags" />
+                              <l2 n="InputItems">
+                                <o t="BoxTreeOperand">
+                                  <o n="Operand" t="Operand">
+                                    <v n="Operand">"aAVBypass[88]"</v>
+                                    <v n="Type">"BOOL"</v>
+                                    <v n="Comment">""</v>
+                                    <v n="SymbolComment">""</v>
+                                    <v n="Address">""</v>
+                                    <o n="Flags" t="Flags">
+                                      <v n="Flags">0</v>
+                                      <v n="Fixed">true</v>
+                                      <v n="Extensible">false</v>
+                                    </o>
+                                    <v n="LValue">false</v>
+                                    <v n="Boolean">true</v>
+                                    <v n="IsInstance">false</v>
+                                    <v n="Id">3603L</v>
+                                  </o>
+                                  <v n="Id">3602L</v>
+                                </o>
+                                <o t="BoxTreeBox">
+                                  <v n="BoxType">"AND"</v>
+                                  <o n="Instance" t="Operand">
+                                    <n n="Operand" />
+                                    <v n="Type">""</v>
+                                    <v n="Comment">""</v>
+                                    <v n="SymbolComment">""</v>
+                                    <v n="Address">""</v>
+                                    <o n="Flags" t="Flags">
+                                      <v n="Flags">0</v>
+                                      <v n="Fixed">false</v>
+                                      <v n="Extensible">false</v>
+                                    </o>
+                                    <v n="LValue">false</v>
+                                    <v n="Boolean">false</v>
+                                    <v n="IsInstance">true</v>
+                                    <v n="Id">4828L</v>
+                                  </o>
+                                  <o n="OutputItems" t="OutputItemList">
+                                    <l2 n="OutputItems" />
+                                  </o>
+                                  <o n="Flags" t="Flags">
+                                    <v n="Flags">0</v>
+                                    <v n="Fixed">false</v>
+                                    <v n="Extensible">false</v>
+                                  </o>
+                                  <n n="InputFlags" />
+                                  <l2 n="InputItems" cet="BoxTreeOperand">
+                                    <o>
+                                      <o n="Operand" t="Operand">
+                                        <v n="Operand">"aAVBypass[88]"</v>
+                                        <v n="Type">"BOOL"</v>
+                                        <v n="Comment">""</v>
+                                        <v n="SymbolComment">""</v>
+                                        <v n="Address">""</v>
+                                        <o n="Flags" t="Flags">
+                                          <v n="Flags">1</v>
+                                          <v n="Fixed">true</v>
+                                          <v n="Extensible">false</v>
+                                        </o>
+                                        <v n="LValue">false</v>
+                                        <v n="Boolean">true</v>
+                                        <v n="IsInstance">false</v>
+                                        <v n="Id">4827L</v>
+                                      </o>
+                                      <v n="Id">4826L</v>
+                                    </o>
+                                    <o>
+                                      <o n="Operand" t="Operand">
+                                        <v n="Operand">"aILK_AV[88]"</v>
+                                        <v n="Type">"BOOL"</v>
+                                        <v n="Comment">""</v>
+                                        <v n="SymbolComment">""</v>
+                                        <v n="Address">""</v>
+                                        <o n="Flags" t="Flags">
+                                          <v n="Flags">0</v>
+                                          <v n="Fixed">true</v>
+                                          <v n="Extensible">false</v>
+                                        </o>
+                                        <v n="LValue">false</v>
+                                        <v n="Boolean">true</v>
+                                        <v n="IsInstance">false</v>
+                                        <v n="Id">4831L</v>
+                                      </o>
+                                      <v n="Id">4830L</v>
+                                    </o>
+                                  </l2>
+                                  <o n="InputParam" t="ParamList">
+                                    <l2 n="Names" />
+                                    <l2 n="Types" />
+                                  </o>
+                                  <o n="OutputParam" t="ParamList">
+                                    <l2 n="Names" />
+                                    <l2 n="Types" />
+                                  </o>
+                                  <v n="CallType" t="Operator">And</v>
+                                  <n n="EN" />
+                                  <n n="ENO" />
+                                  <n n="STSnippet" />
+                                  <v n="ContainsExtensibleInputs">false</v>
+                                  <v n="ProvidesSTSnippet">false</v>
+                                  <v n="Id">4829L</v>
+                                </o>
+                              </l2>
+                              <o n="InputParam" t="ParamList">
+                                <l2 n="Names" />
+                                <l2 n="Types" />
+                              </o>
+                              <o n="OutputParam" t="ParamList">
+                                <l2 n="Names" />
+                                <l2 n="Types" />
+                              </o>
+                              <v n="CallType" t="Operator">Or</v>
+                              <n n="EN" />
+                              <n n="ENO" />
+                              <n n="STSnippet" />
+                              <v n="ContainsExtensibleInputs">false</v>
+                              <v n="ProvidesSTSnippet">false</v>
+                              <v n="Id">4825L</v>
                             </o>
                           </l2>
                           <o n="InputParam" t="ParamList">
@@ -61737,7 +61994,7 @@ bFFUAlarm :=
                     <v n="OutCommented">false</v>
                     <l2 n="NetworkItems">
                       <o t="BoxTreeDemux">
-                        <v n="VarId">380</v>
+                        <v n="VarId">395</v>
                         <o n="Input" t="BoxTreeTerminator">
                           <n n="Input" />
                           <o n="Flags" t="Flags">
@@ -61804,7 +62061,7 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">380</v>
+                              <v n="VarId">395</v>
                               <n n="Input" />
                               <v n="Id">3556L</v>
                             </o>
@@ -61996,7 +62253,7 @@ bFFUAlarm :=
                           <n n="InputFlags" />
                           <l2 n="InputItems">
                             <o t="BoxTreeDemux">
-                              <v n="VarId">380</v>
+                              <v n="VarId">395</v>
                               <n n="Input" />
                               <v n="Id">3557L</v>
                             </o>
@@ -62016,7 +62273,7 @@ bFFUAlarm :=
                                 <v n="LValue">false</v>
                                 <v n="Boolean">false</v>
                                 <v n="IsInstance">true</v>
-                                <v n="Id">4608L</v>
+                                <v n="Id">4832L</v>
                               </o>
                               <o n="OutputItems" t="OutputItemList">
                                 <l2 n="OutputItems" />
@@ -62063,7 +62320,7 @@ bFFUAlarm :=
                                     <v n="LValue">false</v>
                                     <v n="Boolean">false</v>
                                     <v n="IsInstance">true</v>
-                                    <v n="Id">4612L</v>
+                                    <v n="Id">4836L</v>
                                   </o>
                                   <o n="OutputItems" t="OutputItemList">
                                     <l2 n="OutputItems" />
@@ -62090,9 +62347,9 @@ bFFUAlarm :=
                                         <v n="LValue">false</v>
                                         <v n="Boolean">true</v>
                                         <v n="IsInstance">false</v>
-                                        <v n="Id">4611L</v>
+                                        <v n="Id">4839L</v>
                                       </o>
-                                      <v n="Id">4610L</v>
+                                      <v n="Id">4838L</v>
                                     </o>
                                     <o>
                                       <o n="Operand" t="Operand">
@@ -62109,9 +62366,9 @@ bFFUAlarm :=
                                         <v n="LValue">false</v>
                                         <v n="Boolean">true</v>
                                         <v n="IsInstance">false</v>
-                                        <v n="Id">4615L</v>
+                                        <v n="Id">4835L</v>
                                       </o>
-                                      <v n="Id">4614L</v>
+                                      <v n="Id">4834L</v>
                                     </o>
                                   </l2>
                                   <o n="InputParam" t="ParamList">
@@ -62128,7 +62385,7 @@ bFFUAlarm :=
                                   <n n="STSnippet" />
                                   <v n="ContainsExtensibleInputs">false</v>
                                   <v n="ProvidesSTSnippet">false</v>
-                                  <v n="Id">4613L</v>
+                                  <v n="Id">4837L</v>
                                 </o>
                               </l2>
                               <o n="InputParam" t="ParamList">
@@ -62145,7 +62402,7 @@ bFFUAlarm :=
                               <n n="STSnippet" />
                               <v n="ContainsExtensibleInputs">false</v>
                               <v n="ProvidesSTSnippet">false</v>
-                              <v n="Id">4609L</v>
+                              <v n="Id">4833L</v>
                             </o>
                           </l2>
                           <o n="InputParam" t="ParamList">
@@ -65917,7 +66174,7 @@ bFFUAlarm :=
                     <v n="Id">2696L</v>
                   </o>
                 </l2>
-                <v n="BranchCounter">386</v>
+                <v n="BranchCounter">395</v>
                 <v n="ValidIds">true</v>
               </o>
             </Data>

BIN
TIN001/TIN001/PLC/_CompileInfo/6640182D-E01A-018E-AE99-420FF5ABF548.compileinfo


BIN
TIN001/TIN001/TIN001/PMC/_CompileInfo/61EEA572-D83A-CAA0-04A0-D6669C9CE9D5.compileinfo


+ 1 - 1
TIN001/TIN001/TIN001_PLC.tsproj

@@ -329,7 +329,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{DFAAB7BD-C0F0-4652-BE02-16AF7158E2F9}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{40686855-5ADB-C3E3-815F-42734B29C375}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{0E84A23A-3394-4476-81B9-A758B12E48B6}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

+ 1 - 1
TIN001/TIN001/TIN001_PLC.tsproj.bak

@@ -329,7 +329,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{DFAAB7BD-C0F0-4652-BE02-16AF7158E2F9}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{865CD9AD-25D6-6962-A5E0-ECB0E9453879}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="PLC\PLC.tmc" TmcHash="{BFE9AB1F-8CFA-A59C-9F32-71A2BF7E1D79}">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

BIN
TIN001/TIN001/_Boot/CurrentConfig/PLC.tpzip


BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.app


+ 1 - 1
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.cid

@@ -1 +1 @@
-²¨I«e—”â�½¶àL⫾
+-@fàŽ®™Bõ«õH

BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.crc


BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851.occ


BIN
TIN001/TIN001/_Boot/TwinCAT RT (x86)/Plc/Port_851_boot.tizip