From def39becf9fb33157c7a568f376cb2a24f5e2289 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <glenn@steprevolution.com>
Date: Thu, 3 Jan 2019 18:13:27 -0600
Subject: [PATCH] Add labels to the DIP switch display.

---
 smx-config/DiagnosticsWidgets.cs    |  10 +++++
 smx-config/MainWindow.xaml          |  56 ++++++++++++++++++----------
 smx-config/Resources/DIP labels.png | Bin 0 -> 3576 bytes
 smx-config/SMXConfig.csproj         |   5 ++-
 4 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 smx-config/Resources/DIP labels.png

diff --git a/smx-config/DiagnosticsWidgets.cs b/smx-config/DiagnosticsWidgets.cs
index 4f20460..c8716c8 100644
--- a/smx-config/DiagnosticsWidgets.cs
+++ b/smx-config/DiagnosticsWidgets.cs
@@ -147,6 +147,7 @@ namespace smx_config
         private FrameworkElement NoResponseFromPanel;
         private FrameworkElement NoResponseFromSensors;
         private FrameworkElement P1Diagnostics, P2Diagnostics;
+        private FrameworkElement DIPLabelLeft, DIPLabelRight;
 
         public delegate void ShowAllLightsEvent(bool on);
         public event ShowAllLightsEvent SetShowAllLights;
@@ -178,6 +179,9 @@ namespace smx_config
             // Only show the mode dropdown in debug mode.  In regular use, just show calibrated values.
             DiagnosticMode.Visibility = Helpers.GetDebug()? Visibility.Visible:Visibility.Collapsed;
 
+            DIPLabelRight = Template.FindName("DIPLabelRight", this) as FrameworkElement;
+            DIPLabelLeft = Template.FindName("DIPLabelLeft", this) as FrameworkElement;
+
             Button Recalibrate = Template.FindName("Recalibrate", this) as Button;
             Recalibrate.Click += delegate(object sender, RoutedEventArgs e)
             {
@@ -251,6 +255,12 @@ namespace smx_config
                 AnySensorsNotResponding = args.controller[SelectedPad].test_data.AnySensorsOnPanelNotResponding(PanelIndex);
             NoResponseFromSensors.Visibility = AnySensorsNotResponding? Visibility.Visible:Visibility.Collapsed;
 
+            // Adjust the DIP labels to match the PCB.
+            SMX.SMXConfig config = ActivePad.GetFirstActivePadConfig(args);
+            bool DIPLabelsOnLeft = config.masterVersion < 4;
+            DIPLabelRight.Visibility = DIPLabelsOnLeft? Visibility.Collapsed:Visibility.Visible;
+            DIPLabelLeft.Visibility = DIPLabelsOnLeft? Visibility.Visible:Visibility.Collapsed;
+
             // Update the level bar from the test mode data for the selected panel.
             for(int sensor = 0; sensor < 4; ++sensor)
             {
diff --git a/smx-config/MainWindow.xaml b/smx-config/MainWindow.xaml
index 650de3f..b5bb2ec 100644
--- a/smx-config/MainWindow.xaml
+++ b/smx-config/MainWindow.xaml
@@ -612,32 +612,50 @@ Use if the platform is too sensitive.</clr:String>
 
                             <StackPanel Orientation="Vertical"
                                 HorizontalAlignment="Left" VerticalAlignment="Top"
-                                Margin="300,350,0,0"
+                                Margin="320,350,0,0"
                             >
-                                <TextBlock Text="Current DIP"/>
-                                <controls:FrameImage
-                                    Image="Resources/DIP.png"
-                                    x:Name="CurrentDIP"
-                                    FramesX="16"
-                                    Frame="1"
-                                    Width="60"
-                                    Height="100"
-                                />
+                                <TextBlock Text="Current DIP" HorizontalAlignment="Center" />
+                                <Grid>
+                                    <Image
+                                        x:Name="DIPLabelLeft"
+                                        Source="Resources/DIP labels.png"
+                                        Width="16" Height="100"
+                                        Margin="-68 0 0 0"
+                                        VerticalAlignment="Center" HorizontalAlignment="Center"
+                                    />
+                                    <controls:FrameImage
+                                        Image="Resources/DIP.png"
+                                        x:Name="CurrentDIP"
+                                        FramesX="16"
+                                        Frame="1"
+                                        Width="60" Height="100"
+                                        VerticalAlignment="Center" HorizontalAlignment="Center"
+                                    />
+                                </Grid>
                             </StackPanel>
 
                             <StackPanel Orientation="Vertical"
                                 HorizontalAlignment="Left" VerticalAlignment="Top"
                                 Margin="400,350,0,0"
                             >
-                                <TextBlock Text="Expected DIP"/>
-                                <controls:FrameImage
-                                    Image="Resources/DIP.png"
-                                    x:Name="ExpectedDIP"
-                                    FramesX="16"
-                                    Frame="1"
-                                    Width="60"
-                                    Height="100"
-                                />
+                                <TextBlock Text="Expected DIP" HorizontalAlignment="Center" />
+                                <Grid>
+                                    <Image
+                                        x:Name="DIPLabelRight"
+                                        Source="Resources/DIP labels.png"
+                                        Width="16" Height="100"
+                                        Margin="68 0 0 0"
+                                        VerticalAlignment="Center" HorizontalAlignment="Center"
+                                    />
+                                    <controls:FrameImage
+                                        Image="Resources/DIP.png"
+                                        x:Name="ExpectedDIP"
+                                        FramesX="16"
+                                        Frame="1"
+                                        Width="60"
+                                        Height="100"
+                                    />
+                                </Grid>
                             </StackPanel>
                         </Grid>
                     </ControlTemplate>
diff --git a/smx-config/Resources/DIP labels.png b/smx-config/Resources/DIP labels.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1f39478aa5a5cffc18a6613aff6438d3a872e5
GIT binary patch
literal 3576
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

literal 0
HcmV?d00001

diff --git a/smx-config/SMXConfig.csproj b/smx-config/SMXConfig.csproj
index 22c309a..7cebda0 100644
--- a/smx-config/SMXConfig.csproj
+++ b/smx-config/SMXConfig.csproj
@@ -209,6 +209,9 @@
   <ItemGroup>
     <Resource Include="Resources\window icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DIP labels.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -217,4 +220,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file