Add support for WUPS 0.8.1

wiiu-env · May 5, 2024 · f9b67d5 · f9b67d5
1 parent 2047d57
commit f9b67d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ghcr.io/wiiu-env/devkitppc:20240423
+FROM ghcr.io/wiiu-env/devkitppc:20240505
 
 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240425 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240505 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO

diff --git a/source/plugin/PluginMetaInformationFactory.cpp b/source/plugin/PluginMetaInformationFactory.cpp
@@ -107,8 +107,8 @@ std::optional<PluginMetaInformation> PluginMetaInformationFactory::loadPlugin(st
                     } else if (key == "wups") {
                         if (value == "0.7.1") {
                             pluginInfo.setWUPSVersion(0, 7, 1);
-                        } else if (value == "0.8.0") {
-                            pluginInfo.setWUPSVersion(0, 8, 0);
+                        } else if (value == "0.8.1") {
+                            pluginInfo.setWUPSVersion(0, 8, 1);
                         } else {
                             error = PLUGIN_PARSE_ERROR_INCOMPATIBLE_VERSION;
                             DEBUG_FUNCTION_LINE_ERR("Warning: Ignoring plugin - Unsupported WUPS version: %s.", value.c_str());

diff --git a/source/utils/config/ConfigUtils.cpp b/source/utils/config/ConfigUtils.cpp
@@ -128,11 +128,15 @@ void ConfigUtils::displayMenu() {
 
     CombinedInput baseInput;
     VPadInput vpadInput;
-    WPADInput wpadInputs[4] = {
+    WPADInput wpadInputs[7] = {
             WPAD_CHAN_0,
             WPAD_CHAN_1,
             WPAD_CHAN_2,
-            WPAD_CHAN_3};
+            WPAD_CHAN_3,
+            WPAD_CHAN_4,
+            WPAD_CHAN_5,
+            WPAD_CHAN_6,
+    };
 
     auto startTime      = OSGetTime();
     bool skipFirstInput = true;
@@ -171,7 +175,7 @@ void ConfigUtils::displayMenu() {
         complexData.vpad.data      = vpadInput.vpad;
         complexData.vpad.tpCalib   = vpadInput.tpCalib;
         complexData.vpad.vpadError = vpadInput.vpadError;
-        for (int i = 0; i < 4; i++) {
+        for (int i = 0; i < 7; i++) {
             complexData.kpad.kpadError[i] = wpadInputs[i].kpadError;
             complexData.kpad.data[i]      = wpadInputs[i].kpad;
         }