Skip to content

Commit

Permalink
Streamdeck mini v2 pid (#354)
Browse files Browse the repository at this point in the history
* #353 Added PID 0x0090 to DCSFP, seems like it was in StreamdeckSharp already.

* Update DCSFlightpanels.csproj
  • Loading branch information
jdahlblom authored Aug 3, 2023
1 parent b0495b5 commit b40c584
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions Source/ClassLibraryCommon/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ _ when keySequence.Contains(@"LCONTROL + RMENU") => keySequence.Replace(@"LCONTR
new GamingPanelSkeleton(GamingPanelVendorEnum.Saitek, GamingPanelEnum.TPM),
new GamingPanelSkeleton(GamingPanelVendorEnum.MadCatz, GamingPanelEnum.FarmingPanel),
new GamingPanelSkeleton(GamingPanelVendorEnum.Elgato, GamingPanelEnum.StreamDeckMini),
new GamingPanelSkeleton(GamingPanelVendorEnum.Elgato, GamingPanelEnum.StreamDeckMiniV2),
new GamingPanelSkeleton(GamingPanelVendorEnum.Elgato, GamingPanelEnum.StreamDeck),
new GamingPanelSkeleton(GamingPanelVendorEnum.Elgato, GamingPanelEnum.StreamDeckV2),
new GamingPanelSkeleton(GamingPanelVendorEnum.Elgato, GamingPanelEnum.StreamDeckMK2),
Expand Down
2 changes: 2 additions & 0 deletions Source/ClassLibraryCommon/CommonEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public enum GamingPanelEnum
TPM = 0xB4D,
[Description("StreamDeck Mini")]
StreamDeckMini = 0x0063,
[Description("StreamDeck Mini V2")]
StreamDeckMiniV2 = 0x0090,
[Description("StreamDeck")]
StreamDeck = 0x0060,
[Description("StreamDeck V2")]
Expand Down
2 changes: 1 addition & 1 deletion Source/DCSFlightpanels/DCSFlightpanels.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Authors>
<PackageId>DCSFlightpanels (DCSFP)</PackageId>
<Version>1.0.0</Version>
<AssemblyVersion>4.6.8599.1</AssemblyVersion>
<AssemblyVersion>4.6.8615.2</AssemblyVersion>
<FileVersion>
</FileVersion>
<ApplicationIcon>flightpanels02_8Rc_icon.ico</ApplicationIcon>
Expand Down
2 changes: 2 additions & 0 deletions Source/DCSFlightpanels/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ private void CreatePanel(HIDSkeleton hidSkeleton)
}

case GamingPanelEnum.StreamDeckMini:
case GamingPanelEnum.StreamDeckMiniV2:
case GamingPanelEnum.StreamDeck:
case GamingPanelEnum.StreamDeckV2:
case GamingPanelEnum.StreamDeckMK2:
Expand Down Expand Up @@ -852,6 +853,7 @@ private void SortTabs()
GamingPanelEnum.StreamDeckV2,
GamingPanelEnum.StreamDeckMK2,
GamingPanelEnum.StreamDeckMini,
GamingPanelEnum.StreamDeckMiniV2,
GamingPanelEnum.BackLitPanel,
GamingPanelEnum.PZ69RadioPanel,
GamingPanelEnum.TPM,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public StreamDeckUserControl(GamingPanelEnum panelType, HIDSkeleton hidSkeleton)
switch (panelType)
{
case GamingPanelEnum.StreamDeckMini:
case GamingPanelEnum.StreamDeckMiniV2:
{
var child = new UserControlStreamDeckUIMini(_streamDeckPanel);
_uiButtonGrid = child;
Expand Down
1 change: 1 addition & 0 deletions Source/NonVisuals/GenericPanelBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ public string SettingsString
public bool IsJSON()
{
return PanelType == GamingPanelEnum.StreamDeckMini ||
PanelType == GamingPanelEnum.StreamDeckMiniV2 ||
PanelType == GamingPanelEnum.StreamDeck ||
PanelType == GamingPanelEnum.StreamDeckV2 ||
PanelType == GamingPanelEnum.StreamDeckMK2 ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public StreamDeckPanel(GamingPanelEnum panelType, HIDSkeleton hidSkeleton, bool
_buttonCount = panelType switch
{
GamingPanelEnum.StreamDeckMini => 6,
GamingPanelEnum.StreamDeckMiniV2 => 6,

GamingPanelEnum.StreamDeck or
GamingPanelEnum.StreamDeckV2 or
Expand Down
1 change: 1 addition & 0 deletions Source/NonVisuals/Panels/StreamDeck/StreamDeckButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public void DoRelease()
PluginGamingPanelEnum pluginPanel = _streamDeckPanel.TypeOfPanel switch
{
GamingPanelEnum.StreamDeckMini => PluginGamingPanelEnum.StreamDeckMini,
GamingPanelEnum.StreamDeckMiniV2 => PluginGamingPanelEnum.StreamDeckMini,
GamingPanelEnum.StreamDeck => PluginGamingPanelEnum.StreamDeck,
GamingPanelEnum.StreamDeckV2 => PluginGamingPanelEnum.StreamDeckV2,
GamingPanelEnum.StreamDeckMK2 => PluginGamingPanelEnum.StreamDeckMK2,
Expand Down
1 change: 1 addition & 0 deletions Source/NonVisuals/Panels/StreamDeck/StreamDeckCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public static PluginGamingPanelEnum ConvertEnum(GamingPanelEnum gamingPanel)
return gamingPanel switch
{
GamingPanelEnum.StreamDeckMini => PluginGamingPanelEnum.StreamDeckMini,
GamingPanelEnum.StreamDeckMiniV2 => PluginGamingPanelEnum.StreamDeckMini,
GamingPanelEnum.StreamDeck => PluginGamingPanelEnum.StreamDeck,
GamingPanelEnum.StreamDeckV2 => PluginGamingPanelEnum.StreamDeckV2,
GamingPanelEnum.StreamDeckMK2 => PluginGamingPanelEnum.StreamDeckMK2,
Expand Down

0 comments on commit b40c584

Please sign in to comment.