Skip to content

Fix legacy Green/Blue lightbar channels parsing the Red element's value #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anagnorisis2peripeteia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix legacy Green/Blue lightbar channels parsing the Red element's value #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DS4Windows/DS4Control/DTOXml/ProfileDTO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2668,12 +2668,12 @@ public void PostProcessXml()

if (!string.IsNullOrEmpty(GreenColorString))
{
byte.TryParse(RedColorString, out _ledColor.green);
byte.TryParse(GreenColorString, out _ledColor.green);
}

if (!string.IsNullOrEmpty(BlueColorString))
{
byte.TryParse(RedColorString, out _ledColor.blue);
byte.TryParse(BlueColorString, out _ledColor.blue);
}
}

Expand Down
27 changes: 27 additions & 0 deletions DS4WindowsTests/ProfileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,5 +378,32 @@ public void CheckWriteProfile()
Assert.AreEqual(true, !string.IsNullOrEmpty(testStr));
Assert.AreEqual(defaultProfileXml, testStr);
}

[TestMethod]
public void CheckLegacyPerChannelColorRead()
{
// Old profiles store the lightbar colour as separate <Red>/<Green>/<Blue>
// elements rather than a combined <Color>. Each channel must be parsed
// from its own element.
string legacyColorProfileXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
<DS4Windows config_version=""5"">
<Red>10</Red>
<Green>20</Green>
<Blue>30</Blue>
</DS4Windows>";

XmlSerializer serializer = new XmlSerializer(typeof(ProfileDTO),
ProfileDTO.GetAttributeOverrides());
using StringReader sr = new StringReader(legacyColorProfileXml);
ProfileDTO dto = serializer.Deserialize(sr) as ProfileDTO;
dto.DeviceIndex = 0;
BackingStore tempStore = new BackingStore();
dto.MapTo(tempStore);

DS4Color led = tempStore.lightbarSettingInfo[0].ds4winSettings.m_Led;
Assert.AreEqual((byte)10, led.red);
Assert.AreEqual((byte)20, led.green);
Assert.AreEqual((byte)30, led.blue);
}
}
}
Loading