Skip to content

Commit

Permalink
Modified management of type selection combo box
Browse files Browse the repository at this point in the history
  • Loading branch information
@GioCC
GioCC committed Aug 8, 2023
1 parent 5d046d9 commit 9b9116e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 44 deletions.
6 changes: 1 addition & 5 deletions UI/Panels/Device/MFLedSegmentPanel.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 35 additions & 30 deletions UI/Panels/Device/MFLedSegmentPanel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ public partial class MFLedSegmentPanel : UserControl
private MobiFlight.Config.LedModule ledModule;
private List<MobiFlightPin> pinList; // COMPLETE list of pins (includes status)
private bool initialized = false;
string currentMode;
private string exMAXClsPin = "";

public event EventHandler Changed;

public MFLedSegmentPanel()
{
InitializeComponent();
InitializeDisplayTypeComboBox();
mfPin1ComboBox.Items.Clear();
mfPin2ComboBox.Items.Clear();
mfPin3ComboBox.Items.Clear();
Expand All @@ -39,26 +41,41 @@ public MFLedSegmentPanel(MobiFlight.Config.LedModule ledModule, List<MobiFlightP
mfIntensityTrackBar.Value = ledModule.Brightness;
ComboBoxHelper.SetSelectedItem(mfNumModulesComboBox, ledModule.NumModules);

switch(ledModule.ClsPin) {
initialized = true;

currentMode = ledModule.ClsPin;
switch (currentMode) {
case MobiFlight.Config.LedModule.MODEL_TM1637_4D:
mfDisplayTypeComboBox.SelectedIndex = 1;
break;
case MobiFlight.Config.LedModule.MODEL_TM1637_6D:
mfDisplayTypeComboBox.SelectedIndex = 2;
mfDisplayTypeComboBox.SelectedValue = ledModule.ClsPin;
break;
default:
mfDisplayTypeComboBox.SelectedIndex = 0;
mfDisplayTypeComboBox.SelectedValue = MobiFlight.Config.LedModule.MODEL_MAX72xx;
break;
}

UpdateFreePinsInDropDowns();

initialized = true;
}


private void InitializeDisplayTypeComboBox()
{
mfDisplayTypeComboBox.Items.Clear();

List<ListItem> languageOptions = new List<ListItem>();
languageOptions.Add(new ListItem() { Value = MobiFlight.Config.LedModule.MODEL_MAX72xx, Label = "MAX72xx" });
languageOptions.Add(new ListItem() { Value = MobiFlight.Config.LedModule.MODEL_TM1637_4D, Label = "TM1637 - 4Digit" });
languageOptions.Add(new ListItem() { Value = MobiFlight.Config.LedModule.MODEL_TM1637_6D, Label = "TM1637 - 6Digit" });
mfDisplayTypeComboBox.DataSource = languageOptions;
mfDisplayTypeComboBox.DisplayMember = "Label";
mfDisplayTypeComboBox.ValueMember = "Value";
mfDisplayTypeComboBox.SelectedIndex = 0;
}

private bool isMax()
{
return mfDisplayTypeComboBox.SelectedIndex == 0;
//return mfDisplayTypeComboBox.SelectedIndex == 0;
return mfDisplayTypeComboBox.SelectedValue.ToString() == MobiFlight.Config.LedModule.MODEL_MAX72xx;
}
private void setNonPinValues()
{
Expand All @@ -78,14 +95,13 @@ private void setMAXMode(String mode) // bool MAXmode)
private void changeMAXMode(String mode)
{
setMAXMode(mode);
var MAXmode = (mode == MobiFlight.Config.LedModule.MODEL_MAX72xx);
if (MAXmode) {
if (mode == MobiFlight.Config.LedModule.MODEL_MAX72xx) {
// First try and see if the "old" pin is still available, otherwise assign the first free one
ledModule.ClsPin = ((exMAXClsPin != "") ? exMAXClsPin : "");
ledModule.ClsPin = exMAXClsPin;
ComboBoxHelper.assignPin(pinList, ref ledModule.ClsPin);
UpdateFreePinsInDropDowns();
} else {
if(exMAXClsPin == "") exMAXClsPin = ledModule.ClsPin;
if(currentMode == MobiFlight.Config.LedModule.MODEL_MAX72xx) exMAXClsPin = ledModule.ClsPin;
// "freePin()" is the first half part only of "ReassignFreePinsInDropDowns()"
ComboBoxHelper.freePin(pinList, ledModule.ClsPin);
// Make sure to use a neutral value
Expand All @@ -94,6 +110,7 @@ private void changeMAXMode(String mode)
// Now replace it with the special marker
ledModule.ClsPin = mode;
}
currentMode = mode;
if (Changed != null)
Changed(ledModule, new EventArgs());
}
Expand Down Expand Up @@ -134,26 +151,14 @@ private void value_Changed(object sender, EventArgs e)
if (Changed != null)
Changed(ledModule, new EventArgs());
}

private void mfDisplayTypeComboBox_SelectedIndexChanged(object sender, EventArgs e)
private void mfDisplayTypeComboBox_SelectedValueChanged(object sender, EventArgs e)
{
var selection = (sender as ComboBox).SelectedIndex;
string newMode = "";
switch (selection) {
case 0:
newMode = MobiFlight.Config.LedModule.MODEL_MAX72xx;
break;
case 1:
newMode = MobiFlight.Config.LedModule.MODEL_TM1637_4D;
break;
case 2:
newMode = MobiFlight.Config.LedModule.MODEL_TM1637_6D;
break;

}
if (!initialized) return;
string newMode = (sender as ComboBox).SelectedValue.ToString();
if (!initialized) {
setMAXMode(newMode);
} else {
} else {
changeMAXMode(newMode);
}
}
Expand Down
9 changes: 0 additions & 9 deletions UI/Panels/Device/MFLedSegmentPanel.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,15 +681,6 @@
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="mfDisplayTypeComboBox.Items" xml:space="preserve">
<value>MAX72xx</value>
</data>
<data name="mfDisplayTypeComboBox.Items1" xml:space="preserve">
<value>TM1637-4Digit</value>
</data>
<data name="mfDisplayTypeComboBox.Items2" xml:space="preserve">
<value>TM1637-6Digit</value>
</data>
<data name="mfDisplayTypeComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 27</value>
</data>
Expand Down

0 comments on commit 9b9116e

Please sign in to comment.