update top/operation over view UI

CyberX8_MainPages/Views/OperationOverView.xaml

@@ -273,57 +273,6 @@
                         </Grid>
                     </StackPanel>
                 </Border>
-
-                <Border Grid.Row="2" BorderBrush="{DynamicResource MainFrame_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource MainFrame_BG_Title}" Padding="5,1" Grid.ColumnSpan="2">
-
-                </Border>
-                <Border Grid.Row="3" BorderBrush="{DynamicResource MainFrame_BD}" BorderThickness="1,0,1,1" Padding="5,1" Grid.ColumnSpan="2">
-                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5">
-                        <Grid x:Name="Cycle_Info" Visibility="{Binding IsCycleInfoVisibility}" Margin="0,10,0,0">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="110"/>
-                                <ColumnDefinition Width="70"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="25"/>
-                                <RowDefinition Height="24"/>
-                                <RowDefinition Height="24"/>
-                                <RowDefinition Height="24"/>
-
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.ColumnSpan="2" Text="Cycle Information" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,3"/>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Title}" Grid.Row="1" Padding="5,1">
-                                <TextBlock Text="Wafer Count" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
-                            </Border>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="1" Grid.Column="1" Padding="5,1">
-                                <TextBlock Text="{Binding RtDataValues[Scheduler.CycledWafer]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
-                            </Border>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="2" Padding="5,1">
-                                <TextBlock Text="Cycle Count" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
-                            </Border>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.Column="1" Padding="5,1">
-                                <TextBlock  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center">
-                                    <TextBlock.Text>
-                                        <MultiBinding StringFormat="{}{0}/{1}">
-                                            <Binding Path="RtDataValues[Scheduler.CycleSetPoint]"></Binding>
-                                            <Binding Path="RtDataValues[Scheduler.CycledCount]"></Binding>
-                                        </MultiBinding>
-                                    </TextBlock.Text>
-                                </TextBlock>
-                            </Border>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Padding="5,1">
-                                <TextBlock Text="Throughput" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
-                            </Border>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1">
-                                <TextBlock Text="{Binding RtDataValues[Scheduler.Throughput]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
-                            </Border>
-                        </Grid>
-
-                        <TextBlock Grid.ColumnSpan="2" Text="{Binding ATMModeIsOn}" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,20,0,0"/>
-
-                    </StackPanel>
-                </Border>
-
             </Grid>
 
 

CyberX8_MainPages/Views/TopView.xaml

@@ -51,37 +51,37 @@
 
 
             </Grid.ColumnDefinitions>
-            <userControls:StateTitle Title="System"                 TextBoxValue="{Binding RtDataValues[SYSTEM.FsmState]}" TextBoxColor="{Binding RtDataValues[SYSTEM.FsmState],Converter={StaticResource SystemStateConverter}}" LabelColor="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource IsOnlineConverter}}"/>
+            <userControls:StateTitle Title="System"                 TextBoxValue="{Binding RtDataValues[SYSTEM.FsmState]}" TextBoxColor="{Binding RtDataValues[SYSTEM.FsmState],Converter={StaticResource SystemStateConverter}}" LabelColor="#396293"/>
 
             <userControls:StateTitle Title="EFEM"  Grid.Column="1"  TextBoxValue="{Binding RtDataValues[EFEM.FsmState]}"   
                                      TextBoxColor="{Binding RtDataValues[EFEM.FsmState],Converter={StaticResource EFEMStateConverter}}"     
-                                     LabelColor="{Binding RtDataValues[EFEM.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+                                     LabelColor="#396293" 
                                      Visibility="{Binding EFEMIsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
 
             <userControls:StateTitle Title="PUF1"  Grid.Column="2"  TextBoxValue="{Binding RtDataValues[PUF1.FsmState]}"   
                           TextBoxColor="{Binding RtDataValues[PUF1.FsmState],Converter={StaticResource PUFStateConverter}}"     
-                          LabelColor="{Binding RtDataValues[PUF1.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+                          LabelColor="#396293"  
                           Visibility="{Binding PUF1IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
 
             <userControls:StateTitle Title="Loader1" Grid.Row="0"  Grid.Column="3"  TextBoxValue="{Binding RtDataValues[Loader1.FsmState]}"   
               TextBoxColor="{Binding RtDataValues[Loader1.FsmState],Converter={StaticResource LoaderStateConverter}}"     
-              LabelColor="{Binding RtDataValues[Loader1.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+              LabelColor="#396293"  
               Visibility="{Binding Loader1IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
             <userControls:StateTitle Title="Ldr" Grid.Row="1"  Grid.Column="0"  TextBoxValue="{Binding RtDataValues[Transporter2.FsmState]}"   
                                      TextBoxColor="{Binding RtDataValues[Transporter2.FsmState],Converter={StaticResource TransporterStateConverter}}"    
-                                     LabelColor="{Binding RtDataValues[Transporter2.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+                                     LabelColor="#396293" 
                                      Visibility="{Binding Transporter2IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
             <userControls:StateTitle Title="Pdr" Grid.Row="1"  Grid.Column="1"  TextBoxValue="{Binding RtDataValues[Transporter1.FsmState]}"  
                                      TextBoxColor="{Binding RtDataValues[Transporter1.FsmState],Converter={StaticResource TransporterStateConverter}}"                                
-                                     LabelColor="{Binding RtDataValues[Transporter1.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+                                     LabelColor="#396293"  
                                      Visibility="{Binding Transporter2IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
             <userControls:StateTitle Title="SRD1" Grid.Row="1"  Grid.Column="2"  TextBoxValue="{Binding RtDataValues[SRD1.FsmState]}"  
                           TextBoxColor="{Binding RtDataValues[SRD1.FsmState],Converter={StaticResource SRDStateConverter}}"                                
-                          LabelColor="{Binding RtDataValues[SRD1.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+                          LabelColor="#396293"  
                           Visibility="{Binding SRD1IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
             <userControls:StateTitle Title="SRD2" Grid.Row="1"  Grid.Column="3"  TextBoxValue="{Binding RtDataValues[SRD2.FsmState]}"  
               TextBoxColor="{Binding RtDataValues[SRD2.FsmState],Converter={StaticResource SRDStateConverter}}"                                
-              LabelColor="{Binding RtDataValues[SRD2.IsOnline],Converter={StaticResource IsOnlineConverter}}"  
+              LabelColor="#396293" 
               Visibility="{Binding SRD2IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" />
 
             <StackPanel Orientation="Horizontal" Grid.Column="0"  Grid.Row="2" Grid.ColumnSpan="5">

CyberX8_RT/Config/Devices/PowerSupplierCfg-Simulator.xml

@@ -3,7 +3,7 @@
   <PowerSupplierDeviceConfig Name="Power1" IpAddress="127.0.0.1" Port="820" Type="1" SendTimeout="2000" RecvTimeout="2000"> 
     <Device Name="Power1-1" Address="1"  UnitSetScale="1000000" UnitScale="10000" />
   </PowerSupplierDeviceConfig>
-  <!--<PowerSupplierDeviceConfig Name="Power2" IpAddress="127.0.0.1" Port="821" Type="0" SendTimeout="2000" RecvTimeout="2000"> 
+  <PowerSupplierDeviceConfig Name="Power2" IpAddress="127.0.0.1" Port="821" Type="0" SendTimeout="2000" RecvTimeout="2000"> 
     <Device Name="Power2-1" Address="1"  UnitSetScale="1000" UnitScale="10000" />
   </PowerSupplierDeviceConfig>
   <PowerSupplierDeviceConfig Name="Power3" IpAddress="127.0.0.1" Port="822" Type="0" SendTimeout="2000" RecvTimeout="2000"> 
@@ -55,5 +55,5 @@
   
   <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.0.1" Port="835" Type="0" SendTimeout="2000" RecvTimeout="2000"> 
     <Device Name="CMMPower1-1" Address="1"  UnitSetScale="1000" UnitScale="10000" />
-  </PowerSupplierDeviceConfig>-->
+  </PowerSupplierDeviceConfig>
 </PowerSupplierConfig>