Add aux sensors.

smx-config/App.config

@@ -13,6 +13,9 @@
             <setting name="LaunchOnStartup" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="AuxSensors" serializeAs="String">
+                <value />
+            </setting>
         </smx_config.Properties.Settings>
     </userSettings>
 </configuration>

smx-config/Helpers.cs

@@ -381,6 +381,7 @@ namespace smx_config
     // on the user's settings.  This handles managing which sensors each slider controls.
     static class ThresholdSettings
     {
+        [Serializable]
         public struct PanelAndSensor
         {
             public PanelAndSensor(int panel, int sensor)
@@ -408,10 +409,75 @@ namespace smx_config
             // are then synced to the other panels.
             { "cardinal",   7 },
             { "corner",     2 },
+
+            // The aux threshold allows giving a list of specific sensors different thresholds.
+            { "aux",        -1 },
         };
 
+        // Save and load the list of aux sensors to settings.  These aren't saved to the pad, we just
+        // keep them in application settings.
+        static List<PanelAndSensor> cachedAuxSensors;
+        static public void SetAuxSensors(List<PanelAndSensor> panelAndSensors)
+        {
+            List<object> result = new List<object>();
+            foreach(PanelAndSensor panelAndSensor in panelAndSensors)
+            {
+                List<int> panelAndSensorArray = new List<int>() { panelAndSensor.panel, panelAndSensor.sensor };
+                result.Add(panelAndSensorArray);
+            }
+
+            Properties.Settings.Default.AuxSensors = SerializeJSON.Serialize(result);
+            Properties.Settings.Default.Save();
+
+            // Clear the cache.  Set it to null instead of assigning panelAndSensors to it to force
+            // it to re-parse at least once, to catch problems early.
+            cachedAuxSensors = null;
+        }
+
+        // Return the sensors that are controlled by the aux threshold slider.  The other
+        // threshold sliders will leave these alone.
+        static public List<PanelAndSensor> GetAuxSensors()
+        {
+//                Properties.Settings.Default.AuxSensors = "[[0,0], [1,0]]";
+            // This is only ever changed with calls to SetSavedAuxSensors.
+            if(cachedAuxSensors != null)
+                return Helpers.DeepClone(cachedAuxSensors);
+
+            List<PanelAndSensor> result = new List<PanelAndSensor>();
+            if(Properties.Settings.Default.AuxSensors == "")
+                return result;
+
+            try {
+                // This is a list of [panel,sensor] arrays:
+                // [[0,0], [0,1], [1,0]]
+                List<object> sensors = SMXJSON.ParseJSON.Parse<List<object>>(Properties.Settings.Default.AuxSensors);
+                foreach(object panelAndSensorObj in sensors)
+                {
+                    List<object> panelAndSensor = (List<object>) panelAndSensorObj;
+                    int panel = panelAndSensor.Get(0, -1);
+                    int sensor = panelAndSensor.Get(1, -1);
+                    if(panel == -1 || sensor == -1)
+                        continue;
+
+                    result.Add(new PanelAndSensor(panel, sensor));
+                }
+            } catch(ParseError) {
+                return result;
+            }
+
+            cachedAuxSensors = result;
+                // SetAuxSensors(result); // XXX
+
+            // SetSavedAuxSensors(result);
+            return Helpers.DeepClone(cachedAuxSensors);
+        }
+
         static public List<PanelAndSensor> GetControlledSensorsForSliderType(string Type, bool advancedMode)
         {
+            // The aux threshold slider always controls the aux sensors.
+            if(Type == "aux")
+                return GetAuxSensors();
+
             List<PanelAndSensor> result = new List<PanelAndSensor>();
 
             // Check if this slider is shown in this mode.
@@ -432,6 +498,7 @@ namespace smx_config
             // If advanced mode is disabled, save to all panels this slider affects.  The down arrow controls
             // all four cardinal panels.  (If advanced mode is enabled we'll never be a different cardinal
             // direction, since those widgets won't exist.)  If it's disabled, just write to our own panel.
+            List<PanelAndSensor> auxSensors = GetAuxSensors();
             List<int> saveToPanels = new List<int>();
             int ourPanelIdx = panelNameToIndex[Type];
             saveToPanels.Add(ourPanelIdx);
@@ -442,25 +509,17 @@ namespace smx_config
             {
                 for(int sensor = 0; sensor < 4; ++sensor)
                 {
+                    // Ignore sensors controlled by the aux threshold.
                     PanelAndSensor panelAndSensor = new PanelAndSensor(panelIdx, sensor);
+                    if(auxSensors.Contains(panelAndSensor))
+                        continue;
+
                     result.Add(panelAndSensor);
                 }
             }
 
             return result;
         }
-
-        // Return the sensors that are controlled by the aux threshold slider.  The other
-        // threshold sliders will leave these alone.
-        static public List<PanelAndSensor> GetAuxSensors()
-        {
-            List<PanelAndSensor> result = new List<PanelAndSensor>();
-            result.Add(new PanelAndSensor(1,0));
-            result.Add(new PanelAndSensor(1,1));
-            result.Add(new PanelAndSensor(1,2));
-            result.Add(new PanelAndSensor(1,3));
-            return result;
-        }
     }
 
     // This class just makes it easier to assemble binary command packets.

smx-config/MainWindow.xaml

@@ -931,6 +931,11 @@ instead of only panels with sensors.</TextBlock>
                         <Button Content="Import" Width="50" Padding="5,2" Margin="5,10" Click="ImportSettings" />
                     </StackPanel>
 
+                    <Separator Margin="0,10,0,10" />
+                    <TextBlock HorizontalAlignment="Center"
+                                    xml:space="preserve" FontSize="16">Aux sensors</TextBlock>
+                    <Button Content="Set auxilliary sensors" Width="140" Margin="0 10 0 0" Padding="0 4" Click="SetAuxSensors_Click"/>
+
                     <Separator Margin="0,10,0,10" />
                     <TextBlock HorizontalAlignment="Center"
                                     xml:space="preserve" FontSize="16">Reset all settings</TextBlock>

smx-config/MainWindow.xaml.cs

@@ -17,7 +17,8 @@ namespace smx_config
         {
             InitializeComponent();
 
-            onConfigChange = new OnConfigChange(this, delegate(LoadFromConfigDelegateArgs args) {
+            onConfigChange = new OnConfigChange(this, delegate (LoadFromConfigDelegateArgs args)
+            {
                 LoadUIFromConfig(args);
             });
 
@@ -70,7 +71,7 @@ namespace smx_config
 
         List<string> thresholdSliderNames = new List<string>()
         {
-            "up-left", "up", "up-right", "left", "center", "right", "down-left", "down", "down-right", "cardinal", "corner",
+            "up-left", "up", "up-right", "left", "center", "right", "down-left", "down", "down-right", "cardinal", "corner", "aux",
         };
 
         Dictionary<string, string> thresholdToIcon = new Dictionary<string, string>()
@@ -86,6 +87,7 @@ namespace smx_config
             { "down-right","Resources/pad_down_right.png" },
             { "cardinal",  "Resources/pad_cardinal.png" },
             { "corner",    "Resources/pad_diagonal.png" },
+            { "aux",       "Resources/pad_diagonal.png" },
         };
 
         bool IsThresholdSliderShown(string type)
@@ -598,6 +600,12 @@ namespace smx_config
             }
         }
 
+        private void SetAuxSensors_Click(object sender, RoutedEventArgs e)
+        {
+            SetAuxSensors dialog = new SetAuxSensors();
+            dialog.ShowDialog();
+        }
+
         private void UploadLatestGIF()
         {
             // Create a progress window.  Center it on top of the main window.

smx-config/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace smx_config.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -34,5 +34,17 @@ namespace smx_config.Properties {
                 this["LaunchOnStartup"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string AuxSensors {
+            get {
+                return ((string)(this["AuxSensors"]));
+            }
+            set {
+                this["AuxSensors"] = value;
+            }
+        }
     }
 }

smx-config/Properties/Settings.settings

@@ -5,5 +5,8 @@
     <Setting Name="LaunchOnStartup" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="AuxSensors" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

smx-config/SMXConfig.csproj

@@ -105,6 +105,9 @@
     <Compile Include="DiagnosticsWidgets.cs" />
     <Compile Include="DoubleSlider.cs" />
     <Compile Include="Helpers.cs" />
+    <Compile Include="SetAuxSensors.xaml.cs">
+      <DependentUpon>SetAuxSensors.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ProgressWindow.xaml.cs">
       <DependentUpon>ProgressWindow.xaml</DependentUpon>
     </Compile>
@@ -123,6 +126,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="SetAuxSensors.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ProgressWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

smx-config/SetAuxSensors.xaml

@@ -0,0 +1,102 @@
+<Window x:Class="smx_config.SetAuxSensors"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Icon="Resources/window icon.png"
+        Background="#DDD"
+        Height="418" Width="325" ResizeMode="NoResize"
+        xmlns:controls="clr-namespace:smx_config"
+        x:Name="root"
+        Title="Select Auxilliary Sensors"
+        UseLayoutRounding="True">
+    <Window.Resources>
+        <Style x:Key="SensorSelectionButton" TargetType="{x:Type ToggleButton}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Background" Value="#FFDDDDDD"/>
+            <Setter Property="BorderBrush" Value="#FF707070"/>
+            <Setter Property="Foreground" Value="#FFFFFF"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type controls:SensorSelectionButton}">
+                        <Border x:Name="border" BorderBrush="#000000" BorderThickness="1" SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                SnapsToDevicePixels="true"
+                                Focusable="False"
+                                HorizontalAlignment="Center" VerticalAlignment="Center"
+                            />
+                        </Border>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter Property="Background" TargetName="border" Value="#FF2020A0"/>
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter Property="Background" TargetName="border" Value="#FF00F000"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="true">
+                                <Setter Property="Background" TargetName="border" Value="#FFC4E5F6"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="#FF2C628B"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style TargetType="{x:Type controls:SensorSelector}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type controls:SensorSelector}">
+                        <Border Padding="1">
+                            <Grid Width="70" Height="70">
+                                <!-- XXX: the order of these is wrong -->
+                                <controls:SensorSelectionButton x:Name="Sensor0" Style="{StaticResource SensorSelectionButton}" 
+                                    Width="40" Height="13" VerticalAlignment="Top" />
+                                <controls:SensorSelectionButton x:Name="Sensor1" Style="{StaticResource SensorSelectionButton}" 
+                                    Width="40" Height="13" VerticalAlignment="Bottom" />
+                                <controls:SensorSelectionButton x:Name="Sensor2" Style="{StaticResource SensorSelectionButton}" 
+                                    Width="13" Height="40" HorizontalAlignment="Left" />
+                                <controls:SensorSelectionButton x:Name="Sensor3" Style="{StaticResource SensorSelectionButton}" 
+                                    Width="13" Height="40" HorizontalAlignment="Right" />
+                            </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>        
+
+    </Window.Resources>
+
+    <StackPanel Background="#FFE5E5E5">
+        <TextBlock xml:space="preserve" HorizontalAlignment="Center" Margin="0,15,0,10" TextAlignment="Center" FontSize="16">Select which sensors are controlled
+by the auxilliary threshold.</TextBlock>
+
+        <Grid Width="250" Height="250" Background="#FFAAAAAA" Margin="0,10,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <controls:SensorSelector Grid.Row="0" Grid.Column="0" Panel="0" Focusable="false" />
+            <controls:SensorSelector Grid.Row="0" Grid.Column="1" Panel="1" Focusable="false" />
+            <controls:SensorSelector Grid.Row="0" Grid.Column="2" Panel="2" Focusable="false" />
+            <controls:SensorSelector Grid.Row="1" Grid.Column="0" Panel="3" Focusable="false" />
+            <controls:SensorSelector Grid.Row="1" Grid.Column="1" Panel="4" Focusable="false" />
+            <controls:SensorSelector Grid.Row="1" Grid.Column="2" Panel="5" Focusable="false" />
+            <controls:SensorSelector Grid.Row="2" Grid.Column="0" Panel="6" Focusable="false" />
+            <controls:SensorSelector Grid.Row="2" Grid.Column="1" Panel="7" Focusable="false" />
+            <controls:SensorSelector Grid.Row="2" Grid.Column="2" Panel="8" Focusable="false" />
+        </Grid>
+
+        <Button x:Name="OK" Content="OK" IsDefault="True" Click="OK_Click" HorizontalAlignment="Center" FontSize="20" Padding="10,4" Margin="0,10,0,0" />
+    </StackPanel>
+</Window>

smx-config/SetAuxSensors.xaml.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace smx_config
+{
+    public class SensorSelectionButton: ToggleButton
+    {
+    }
+
+    // A control with one button for each of four sensors:
+    class SensorSelector: Control
+    {
+        // The panel we're editing (0-8).
+        public static readonly DependencyProperty PanelProperty = DependencyProperty.RegisterAttached("Panel",
+            typeof(int), typeof(SensorSelector), new FrameworkPropertyMetadata(0));
+
+        public int Panel {
+            get { return (int) this.GetValue(PanelProperty); }
+            set { this.SetValue(PanelProperty, value); }
+        }
+
+        ToggleButton[] SensorSelectionButtons = new ToggleButton[4];
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            for(int sensor = 0; sensor < 4; ++sensor)
+            {
+                int ThisSensor = sensor; // bind
+                SensorSelectionButtons[sensor] = GetTemplateChild("Sensor" + sensor) as ToggleButton;
+                SensorSelectionButtons[sensor].Click += delegate(object sender, RoutedEventArgs e)
+                {
+                    ClickedSensorButton(ThisSensor);
+                };
+            }
+
+            // These settings are stored in the application settings, not on the pad.  However,
+            // we treat changes to this as config changes, so we can use the same OnConfigChange
+            // method for updating.
+            OnConfigChange onConfigChange;
+            onConfigChange = new OnConfigChange(this, delegate(LoadFromConfigDelegateArgs args) {
+                LoadUIFromConfig(args);
+            });
+        }
+
+        private void ClickedSensorButton(int sensor)
+        {
+            // Toggle the clicked sensor.
+            Console.WriteLine("Clicked sensor " + sensor);
+            List<ThresholdSettings.PanelAndSensor> auxSensors = ThresholdSettings.GetAuxSensors();
+            bool enabled = !IsSensorEnabled(auxSensors, sensor);
+
+            if(enabled)
+                auxSensors.Add(new ThresholdSettings.PanelAndSensor(Panel, sensor));
+            else
+                auxSensors.Remove(new ThresholdSettings.PanelAndSensor(Panel, sensor));
+            ThresholdSettings.SetAuxSensors(auxSensors);
+
+            CurrentSMXDevice.singleton.FireConfigurationChanged(this);
+        }
+
+        // Return true if the given sensor is marked as an aux sensor.
+        bool IsSensorEnabled(List<ThresholdSettings.PanelAndSensor> auxSensors, int sensor)
+        {
+            foreach(ThresholdSettings.PanelAndSensor panelAndSensor in auxSensors)
+            {
+                if(panelAndSensor.panel == Panel && panelAndSensor.sensor == sensor)
+                    return true;
+            }
+            return false;
+        }
+
+        private void LoadUIFromConfig(LoadFromConfigDelegateArgs args)
+        {
+            // Check the selected aux sensors.
+            List<ThresholdSettings.PanelAndSensor> auxSensors = ThresholdSettings.GetAuxSensors();
+            for(int sensor = 0; sensor < 4; ++sensor)
+                SensorSelectionButtons[sensor].IsChecked = IsSensorEnabled(auxSensors, sensor);
+        }
+    }
+
+    // This dialog sets which sensors are controlled by the auxilliary threshold.  The actual
+    // work is done by SensorSelector above.
+    public partial class SetAuxSensors: Window
+    {
+        public SetAuxSensors()
+        {
+            InitializeComponent();
+        }
+
+        private void OK_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}