Skip to content

Fix shift-modifier Extras lost on save and misapplied on load #49

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 shift-modifier Extras lost on save and misapplied on load #49

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
7 changes: 6 additions & 1 deletion DS4Windows/DS4Control/DTOXml/ProfileDTO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1988,6 +1988,11 @@ public void MapFrom(BackingStore source)
}
}
}

if (hasExtrasValue)
{
shiftExtrasSerializer.CustomMapExtras.Add(dcs.control, dcs.shiftExtras);
}
}

if (buttonSerializer.CustomMapButtons.Count > 0)
Expand Down Expand Up @@ -2634,7 +2639,7 @@ public void MapTo(BackingStore destination)
foreach (KeyValuePair<DS4Controls, string> pair in ShiftControl.Extras.CustomMapExtras)
{
destination.UpdateDS4CExtra(deviceIndex,
pair.Key.ToString(), false, pair.Value);
pair.Key.ToString(), true, pair.Value);
}
}

Expand Down
52 changes: 52 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,57 @@ public void CheckWriteProfile()
Assert.AreEqual(true, !string.IsNullOrEmpty(testStr));
Assert.AreEqual(defaultProfileXml, testStr);
}

[TestMethod]
public void CheckShiftExtrasWrittenOnSave()
{
// Shift-modifier extras stored in the BackingStore must survive MapFrom
// into the DTO's ShiftControl.Extras so they get serialized.
string shiftExtras = "1,255,0,0,255,0,0,1,0";
BackingStore tempStore = new BackingStore();
tempStore.UpdateDS4CExtra(0, "Cross", true, shiftExtras);

ProfileDTO dto = new ProfileDTO();
dto.DeviceIndex = 0;
dto.MapFrom(tempStore);

Assert.IsNotNull(dto.ShiftControl.Extras);
Assert.IsTrue(dto.ShiftControl.Extras.CustomMapExtras.ContainsKey(DS4Controls.Cross));
Assert.AreEqual(shiftExtras, dto.ShiftControl.Extras.CustomMapExtras[DS4Controls.Cross]);
}

[TestMethod]
public void CheckShiftExtrasReadIntoShiftSlot()
{
// ShiftControl/Extras in the profile XML must load into the control's
// shift extras slot without clobbering its normal extras.
string normalExtras = "1,255,0,0,255,0,0,1,0";
string shiftExtras = "1,0,255,0,255,0,0,1,0";
string profileXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
<DS4Windows config_version=""5"">
<Control>
<Extras>
<Cross>{normalExtras}</Cross>
</Extras>
</Control>
<ShiftControl>
<Extras>
<Cross>{shiftExtras}</Cross>
</Extras>
</ShiftControl>
</DS4Windows>";

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

DS4ControlSettings dcs = tempStore.GetDS4CSetting(0, "Cross");
Assert.AreEqual(normalExtras, dcs.extras);
Assert.AreEqual(shiftExtras, dcs.shiftExtras);
}
}
}
Loading