Fix bug where normal D-Pad up input didn't work

JonnyHaystack · JonnyHaystack · commit 378901968698 · 2021-03-06T19:02:03.000Z
diff --git a/HayB0XX/ProjectM.cpp b/HayB0XX/ProjectM.cpp
@@ -52,7 +52,9 @@ void ProjectM::UpdateDigitalOutputs() {
     mOutputState.dpadRight = mrInputState.c_right;
   }
 
-  mOutputState.dpadUp = mrInputState.midshield;
+  // Don't override dpad up if it's already pressed using the MX + MY dpad
+  // layer.
+  mOutputState.dpadUp = mOutputState.dpadUp || mrInputState.midshield;
 
   if (mrInputState.select)
     mOutputState.dpadLeft = true;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ void ProjectM::UpdateDigitalOutputs() {`
`52`	`52`	`mOutputState.dpadRight = mrInputState.c_right;`
`53`	`53`	`}`
`54`	`54`
`55`		`- mOutputState.dpadUp = mrInputState.midshield;`
	`55`	`+ // Don't override dpad up if it's already pressed using the MX + MY dpad`
	`56`	`+ // layer.`
	`57`	`+ mOutputState.dpadUp = mOutputState.dpadUp \|\| mrInputState.midshield;`
`56`	`58`
`57`	`59`	`if (mrInputState.select)`
`58`	`60`	`mOutputState.dpadLeft = true;`