Negcon rumble (#3177)

* Implemented NeGcon with rumble. Code is a mix of the existing NeGcon AnalogController modes. * Fix negcon id reply and analog/digital toggle. * Implemented NeGcon with rumble. Code is a mix of the existing NeGcon AnalogController modes. * Fix negcon id reply and analog/digital toggle. * Update macros * Code cleanup
stenzek · Apr 16, 2024 · 07c012a · 07c012a
1 parent 4d8ed49
commit 07c012a
Show file tree

Hide file tree

Showing 8 changed files with 944 additions and 4 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -83,6 +83,8 @@ add_library(core
   multitap.h
   negcon.cpp
   negcon.h
+  negcon_rumble.cpp
+  negcon_rumble.h
   pad.cpp
   pad.h
   pcdrv.cpp

diff --git a/src/core/controller.cpp b/src/core/controller.cpp
@@ -9,6 +9,7 @@
 #include "guncon.h"
 #include "host.h"
 #include "negcon.h"
+#include "negcon_rumble.h"
 #include "playstation_mouse.h"
 #include "util/state_wrapper.h"
 
@@ -21,8 +22,8 @@ static const Controller::ControllerInfo s_none_info = {ControllerType::None,
                                                        Controller::VibrationCapabilities::NoVibration};
 
 static const Controller::ControllerInfo* s_controller_info[] = {
-  &s_none_info,  &DigitalController::INFO, &AnalogController::INFO, &AnalogJoystick::INFO, &NeGcon::INFO,
-  &GunCon::INFO, &PlayStationMouse::INFO,
+  &s_none_info,  &DigitalController::INFO, &AnalogController::INFO, &AnalogJoystick::INFO,
+  &NeGcon::INFO, &NeGconRumble::INFO,&GunCon::INFO, &PlayStationMouse::INFO,
 };
 
 Controller::Controller(u32 index) : m_index(index)
@@ -99,6 +100,9 @@ std::unique_ptr<Controller> Controller::Create(ControllerType type, u32 index)
 
     case ControllerType::NeGcon:
       return NeGcon::Create(index);
+
+    case ControllerType::NeGconRumble:
+      return NeGconRumble::Create(index);
 
     case ControllerType::None:
     default:

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -65,6 +65,7 @@
     <ClCompile Include="multitap.cpp" />
     <ClCompile Include="guncon.cpp" />
     <ClCompile Include="negcon.cpp" />
+    <ClCompile Include="negcon_rumble.cpp" />
     <ClCompile Include="pad.cpp" />
     <ClCompile Include="controller.cpp" />
     <ClCompile Include="pcdrv.cpp" />
@@ -143,6 +144,7 @@
     <ClInclude Include="multitap.h" />
     <ClInclude Include="guncon.h" />
     <ClInclude Include="negcon.h" />
+    <ClInclude Include="negcon_rumble.h" />
     <ClInclude Include="pad.h" />
     <ClInclude Include="controller.h" />
     <ClInclude Include="pcdrv.h" />

diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
@@ -52,6 +52,7 @@
     <ClCompile Include="multitap.cpp" />
     <ClCompile Include="host.cpp" />
     <ClCompile Include="game_database.cpp" />
+    <ClCompile Include="negcon_rumble.cpp" />
     <ClCompile Include="pcdrv.cpp" />
     <ClCompile Include="game_list.cpp" />
     <ClCompile Include="imgui_overlays.cpp" />
@@ -122,6 +123,7 @@
     <ClInclude Include="achievements.h" />
     <ClInclude Include="game_database.h" />
     <ClInclude Include="input_types.h" />
+    <ClInclude Include="negcon_rumble.h" />
     <ClInclude Include="pcdrv.h" />
     <ClInclude Include="game_list.h" />
     <ClInclude Include="imgui_overlays.h" />