Browse Source

fix 同步FAB代码:新增蓝灯点位/DG1 单位不对

jiangjy 1 month ago
parent
commit
f403f2974c

+ 2 - 2
Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -843,7 +843,7 @@
 	</IoAPCs>
 	<IoPressureMeters classType="FurnaceRT.Devices.IoPressureMeter" assembly="FurnaceRT">
 
-		<IoPressureMeter id="DG1AnalogValue" display="DG1AnalogValue"  schematicId="DG1AnalogValue" unit="Kpa " aiFeedback="AI_DG1Pressure"  physical="0,15000" scale="-500,500" aioType="float"/>
+		<IoPressureMeter id="DG1AnalogValue" display="DG1AnalogValue"  schematicId="DG1AnalogValue" unit="pa " aiFeedback="AI_DG1Pressure"  physical="0,15000" scale="-500,500" aioType="float"/>
 		<!--压力表-->
 		<IoPressureMeter id="VG11" display="VG11"  schematicId="VG11" unit="Torr" aiFeedback="AI_VG11Pressure"  physical="0,15000" scale="0,1000" aioType="float" unSigned="True"/>
 		<IoPressureMeter id="VG21" display="VG21"  schematicId="VG21" unit="Torr" aiFeedback="AI_VG21Pressure"  physical="0,15000" scale="0,1000" aioType="float"/>
@@ -1559,7 +1559,7 @@
 	</IoTriggers>-->
 	<IoSignalTowers  assembly="FurnaceRT" classType="FurnaceRT.Equipments.Systems.FurnaceSignalTower">
 		<IoSignalTower module="System" id ="SignalTower" display="Signal Tower" schematicId=""
-						   doRed="DO_TowerRed" doYellow="DO_TowerOrange" doGreen="DO_TowerGreen" doBlue=""
+						   doRed="DO_TowerRed" doYellow="DO_TowerOrange" doGreen="DO_TowerGreen" doBlue="DO_TowerBlue"
 						   doBuzzer1="DO_TowerBuzzle"/>
 	</IoSignalTowers>
 

+ 1 - 0
Furnace/FurnaceRT/Config/IO/ELK/_ioDefinePM.xml

@@ -1284,6 +1284,7 @@
 		<DO_ITEM Index="1501" Name="DO_LP2FOUPClamp" BufferOffset="1501" Addr="D1093.13" Description="loadport 2 FOUP clamp(D1093.13)" />
 		<DO_ITEM Index="1504" Name="DO_loadport1E84REQ" BufferOffset="1504" Addr="D1094.0" Description="loadport 1 E84 REQ(D1094.00)" />
 		<DO_ITEM Index="1505" Name="DO_loadport1E84UREQ" BufferOffset="1505" Addr="D1094.1" Description="loadport 1 E84 UREQ(D1094.01)" />
+		<DO_ITEM Index="1478" Name="DO_TowerBlue" BufferOffset="1506" Addr="D1094.2" Description="tower-blue(D1094.2)" />
 		<DO_ITEM Index="1507" Name="DO_loadport1E84Ready" BufferOffset="1507" Addr="D1094.3" Description="loadport 1 E84 ready(D1094.03)" />
 		<DO_ITEM Index="1510" Name="DO_loadport1E84HOAVBL" BufferOffset="1510" Addr="D1094.6" Description="loadport 1 E84 HO_AVBL(D1094.06)" />
 		<DO_ITEM Index="1511" Name="DO_loadport1E84ES" BufferOffset="1511" Addr="D1094.7" Description="loadport 1 E84 ES(D1094.07)" />

+ 1 - 1
Furnace/FurnaceRT/FurnaceRT.csproj

@@ -365,6 +365,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="dependence\MECF.Framework.MyFA.Core.dll" />
     <None Include="Config\Recipe\Furnace\Process\TiN\RecipeFormat.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -601,7 +602,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Config\BackUp\" />
-    <Folder Include="dependence\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />

BIN
Furnace/FurnaceRT/dependence/MECF.Framework.MyFA.Core.dll