Browse Source

Modify .gitignore;

niuyx 1 week ago
parent
commit
5fc416d483

+ 3 - 1
athos/.gitignore

@@ -1,4 +1,6 @@
 ################################################################################
 # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
 ################################################################################
-*.vs
+*.vs
+Logs
+Objects

+ 7 - 7
athos/athos/ViewModels/OperationViewModel.cs

@@ -847,13 +847,13 @@ namespace athos.ViewModels
             FlipperTurnOverHorizontal = (bool)QueryDataClient.Instance.Service.GetData($"TurnOverStation.IsFlipperHorizontal");
             FlipperTurnOverOrigin = (bool)QueryDataClient.Instance.Service.GetData($"TurnOverStation.IsFlipperOrigin");
             //各模块Wafer显示更新
-            ChangeSlotWaferIU(ModuleName.LL1);
-            ChangeSlotWaferIU(ModuleName.LL2);
-            ChangeSlotWaferIU(ModuleName.Aligner1);
-            ChangeSlotWaferIU(ModuleName.LP1);
-            ChangeSlotWaferIU(ModuleName.LP2);
-            ChangeSlotWaferIU(ModuleName.Buffer);
-            ChangeSlotWaferIU(ModuleName.TurnOverStation);
+            if (IsLL1Installed) ChangeSlotWaferIU(ModuleName.LL1);
+            if (IsLL2Installed) ChangeSlotWaferIU(ModuleName.LL2);
+            if (IsAligner1Installed) ChangeSlotWaferIU(ModuleName.Aligner1);
+            if (IsLP1Installed) ChangeSlotWaferIU(ModuleName.LP1);
+            if (IsLP2Installed) ChangeSlotWaferIU(ModuleName.LP2);
+            if (IsBuffer1Installed) ChangeSlotWaferIU(ModuleName.Buffer);
+            if (IsFlipper1Installed) ChangeSlotWaferIU(ModuleName.TurnOverStation);
             ChangeSlotWaferIU(ModuleName.Robot);
             //FlipperTurnOverHorizontal = true;
             //FlipperTurnOverOrigin = true;

+ 1 - 1
athos/athos/Views/Operation.xaml

@@ -403,7 +403,7 @@
                             <UserControls:Robot Margin="49,92,136,6" Blade1RobotXAction="{Binding Blade1RobotXAction}" Blade2RobotXAction="{Binding Blade2RobotXAction}" BladeRobotTAction="{Binding BladeRobotTAction}"
                                                 Blade1WaferInfo="{Binding RobotWaferInfo[0]}" Blade2WaferInfo="{Binding RobotWaferInfo[1]}" Blade1Wafer="{Binding RobotBlader1Wafer}" Blade2Wafer="{Binding RobotBlader2Wafer}"/>
                         </Border>
-                        <!--Aligner-->
+                        <!--Buffer-->
                         <TextBlock Visibility="{Binding IsBuffer1Installed,Converter={StaticResource boolToVisibility}}" Width="60" TextAlignment="Center" Canvas.Left="43" FontSize="18" Canvas.Top="10"  Text="Buffer" Foreground="Black" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                         <Rectangle Visibility="{Binding IsBuffer1Installed,Converter={StaticResource boolToVisibility}}" Width="94" Height="94" RadiusX="15" RadiusY="15" Canvas.Left="27" Canvas.Top="37" Stroke="Gray" StrokeThickness="2">
                             <Rectangle.Fill>

+ 4 - 0
athos/athos/bin/Debug/Logs/log2025-04-30.txt

@@ -1 +1,5 @@
 2025-04-30 10:36:43,495                  INFO                 UI                   -------------------------------------------------- 
+2025-04-30 11:11:32,799                  INFO                 UI                   -------------------------------------------------- 
+2025-04-30 11:12:31,025                  INFO                 UI                   -------------------------------------------------- 
+2025-04-30 11:15:50,530                  INFO                 UI                   -------------------------------------------------- 
+2025-04-30 11:16:44,077                  INFO                 UI                   -------------------------------------------------- 

BIN
athos/athos/bin/Debug/athos.exe


BIN
athos/athos/bin/Debug/athos.pdb


+ 1 - 1
athos/athos/obj/Debug/Views/Operation.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Views\Operation.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "155043FBE965D9174EB5260FCE8AAE60647F1B6B9DB232D83DA794E29D6D3BB5"
+#pragma checksum "..\..\..\Views\Operation.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0688BE3B7ED0DA1A81FBF8F1B67F6E3244568CF3B2B628896A74CBE8D2602A9A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

+ 1 - 1
athos/athos/obj/Debug/Views/Operation.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Views\Operation.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "155043FBE965D9174EB5260FCE8AAE60647F1B6B9DB232D83DA794E29D6D3BB5"
+#pragma checksum "..\..\..\Views\Operation.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0688BE3B7ED0DA1A81FBF8F1B67F6E3244568CF3B2B628896A74CBE8D2602A9A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

BIN
athos/athos/obj/Debug/athos.exe


BIN
athos/athos/obj/Debug/athos.pdb


BIN
athos/athosRT/bin/Debug/Objects/WaferManager.obj