From bd2213f14f2cce8b190efdc7db74d2296c82291e Mon Sep 17 00:00:00 2001
From: Marc Riera <marc.riera.irigoyen@gmail.com>
Date: Sun, 10 Dec 2023 16:16:37 +0100
Subject: [PATCH] Fix D combo with MTC

---
 src/controller/emulated/dgoc44u.rs           | 3 ++-
 src/controller/emulated/sotp031201_p4b2b7.rs | 4 ++--
 src/controller/emulated/sotp031201_p4b7.rs   | 4 ++--
 src/controller/emulated/sotp031201_p5b5.rs   | 4 ++--
 src/controller/emulated/sotp031201_p5b7.rs   | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/controller/emulated/dgoc44u.rs b/src/controller/emulated/dgoc44u.rs
index 4168be3..07715ed 100644
--- a/src/controller/emulated/dgoc44u.rs
+++ b/src/controller/emulated/dgoc44u.rs
@@ -1,5 +1,6 @@
 use std::fs::File;
-use std::io::{Write};
+use std::io::Write;
+
 use bitflags::bitflags;
 use crate::controller::physical::ControllerState;
 use crate::controller::emulated::{DeviceDescriptor, ENDPOINT1};
diff --git a/src/controller/emulated/sotp031201_p4b2b7.rs b/src/controller/emulated/sotp031201_p4b2b7.rs
index bc70929..8e54370 100644
--- a/src/controller/emulated/sotp031201_p4b2b7.rs
+++ b/src/controller/emulated/sotp031201_p4b2b7.rs
@@ -70,8 +70,8 @@ pub fn update_gadget(state: &mut ControllerState) {
     }
     if !state.combo && state.button_a { buttons1.insert(Buttons1::A) }
     if state.button_b { buttons1.insert(Buttons1::B) }
-    if !state.combo && state.button_c { buttons1.insert(Buttons1::C) }
-    if state.button_d { buttons1.insert(Buttons1::D) }
+    if state.button_c { buttons1.insert(Buttons1::C) }
+    if !state.combo && state.button_d { buttons1.insert(Buttons1::D) }
     if !state.combo && state.button_up { buttons2.insert(Buttons2::UP) }
     if !state.combo && state.button_down { buttons2.insert(Buttons2::DOWN) }
     if !state.combo && state.button_left { buttons2.insert(Buttons2::LEFT) }
diff --git a/src/controller/emulated/sotp031201_p4b7.rs b/src/controller/emulated/sotp031201_p4b7.rs
index f9498c8..2d6427b 100644
--- a/src/controller/emulated/sotp031201_p4b7.rs
+++ b/src/controller/emulated/sotp031201_p4b7.rs
@@ -70,8 +70,8 @@ pub fn update_gadget(state: &mut ControllerState) {
     }
     if !state.combo && state.button_a { buttons1.insert(Buttons1::A) }
     if state.button_b { buttons1.insert(Buttons1::B) }
-    if !state.combo && state.button_c { buttons1.insert(Buttons1::C) }
-    if state.button_d { buttons1.insert(Buttons1::D) }
+    if state.button_c { buttons1.insert(Buttons1::C) }
+    if !state.combo && state.button_d { buttons1.insert(Buttons1::D) }
     if !state.combo && state.button_up { buttons2.insert(Buttons2::UP) }
     if !state.combo && state.button_down { buttons2.insert(Buttons2::DOWN) }
     if !state.combo && state.button_left { buttons2.insert(Buttons2::LEFT) }
diff --git a/src/controller/emulated/sotp031201_p5b5.rs b/src/controller/emulated/sotp031201_p5b5.rs
index edc650e..ff30f65 100644
--- a/src/controller/emulated/sotp031201_p5b5.rs
+++ b/src/controller/emulated/sotp031201_p5b5.rs
@@ -70,8 +70,8 @@ pub fn update_gadget(state: &mut ControllerState) {
     }
     if !state.combo && state.button_a { buttons1.insert(Buttons1::A) }
     if state.button_b { buttons1.insert(Buttons1::B) }
-    if !state.combo && state.button_c { buttons1.insert(Buttons1::C) }
-    if state.button_d { buttons1.insert(Buttons1::D) }
+    if state.button_c { buttons1.insert(Buttons1::C) }
+    if !state.combo && state.button_d { buttons1.insert(Buttons1::D) }
     if !state.combo && state.button_up { buttons2.insert(Buttons2::UP) }
     if !state.combo && state.button_down { buttons2.insert(Buttons2::DOWN) }
     if !state.combo && state.button_left { buttons2.insert(Buttons2::LEFT) }
diff --git a/src/controller/emulated/sotp031201_p5b7.rs b/src/controller/emulated/sotp031201_p5b7.rs
index 072ce13..5cb5ee3 100644
--- a/src/controller/emulated/sotp031201_p5b7.rs
+++ b/src/controller/emulated/sotp031201_p5b7.rs
@@ -70,8 +70,8 @@ pub fn update_gadget(state: &mut ControllerState) {
     }
     if !state.combo && state.button_a { buttons1.insert(Buttons1::A) }
     if state.button_b { buttons1.insert(Buttons1::B) }
-    if !state.combo && state.button_c { buttons1.insert(Buttons1::C) }
-    if state.button_d { buttons1.insert(Buttons1::D) }
+    if state.button_c { buttons1.insert(Buttons1::C) }
+    if !state.combo && state.button_d { buttons1.insert(Buttons1::D) }
     if !state.combo && state.button_up { buttons2.insert(Buttons2::UP) }
     if !state.combo && state.button_down { buttons2.insert(Buttons2::DOWN) }
     if !state.combo && state.button_left { buttons2.insert(Buttons2::LEFT) }