Fix errors in my last commit

Crayon2000 · Dec 21, 2024 · ce6d8a2 · ce6d8a2
1 parent eff8f70
commit ce6d8a2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ target_compile_options(MiisendU-Wii-U PRIVATE
 target_sources(MiisendU-Wii-U PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}/source/main.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/console.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/source/udp.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/udp.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/vpad_to_json.cpp
   ${inih_SOURCE_DIR}/ini.c
 )

diff --git a/source/main.cpp b/source/main.cpp
@@ -123,12 +123,6 @@ static int sendPadData() {
         KPADReadEx(WPAD_CHAN_2, &kpad_data3, 1, &kpad_error3);
         KPADReadEx(WPAD_CHAN_3, &kpad_data4, 1, &kpad_error4);
 
-        // Read the HPADs
-        int32_t hpad_error1 = HPADRead(HPAD_CHAN_0, &hpad_data1[0], 16);
-        int32_t hpad_error2 = HPADRead(HPAD_CHAN_1, &hpad_data2[0], 16);
-        int32_t hpad_error3 = HPADRead(HPAD_CHAN_2, &hpad_data3[0], 16);
-        int32_t hpad_error4 = HPADRead(HPAD_CHAN_3, &hpad_data4[0], 16);
-
         // Flush the cache (may be needed due to continuous refresh of the data ?)
         DCFlushRange(&vpad_data, sizeof(VPADStatus));
 
@@ -152,25 +146,25 @@ static int sendPadData() {
         {
             pad_data.kpad[3] = &kpad_data4;
         }
-        if(hpad_error1 >= 0)
+        if(HPADRead(HPAD_CHAN_0, &hpad_data1[0], 16) >= 0)
         {
             pad_data.hpad[0] = &hpad_data1[0];
         }
-        if(hpad_error2 >= 0)
+        if(HPADRead(HPAD_CHAN_1, &hpad_data2[0], 16) >= 0)
         {
             pad_data.hpad[1] = &hpad_data2[0];
         }
-        if(hpad_error3 >= 0)
+        if(HPADRead(HPAD_CHAN_2, &hpad_data3[0], 16) >= 0)
         {
             pad_data.hpad[2] = &hpad_data3[0];
         }
-        if(hpad_error4 >= 0)
+        if(HPADRead(HPAD_CHAN_3, &hpad_data4[0], 16) >= 0)
         {
             pad_data.hpad[3] = &hpad_data4[0];
         }
 
         // The buffer sent to the computer
-        char msg_data[1024];
+        char msg_data[2048];
         pad_to_json(pad_data, msg_data, sizeof(msg_data));
 
         // Send the message

diff --git a/source/udp.c → source/udp.cpp b/source/udp.c → source/udp.cpp
diff --git a/source/vpad_to_json.cpp b/source/vpad_to_json.cpp
@@ -123,15 +123,15 @@ void pad_to_json(PADData pad_data, char* out, uint32_t out_size)
         {
             if(pad_data.kpad[i]->extensionType != WPAD_EXT_PRO_CONTROLLER)
             {   // Wii Remote with or without an extension
-                wii_remotes_status.emplace(i, pad_data.kpad[i]);
+                wii_remotes_status.emplace(i + 1, pad_data.kpad[i]);
             }
             else
             {   // Wii U Pro Controller
-                wii_u_pro_status.emplace(i, pad_data.kpad[i]);
+                wii_u_pro_status.emplace(i + 1, pad_data.kpad[i]);
             }
         }
     }
-    if (wii_u_pro_status.empty() == false) {
+    if (wii_remotes_status.empty() == false) {
         writer.Key("wiiRemotes");
         writer.StartArray();
         for (const auto& [order, kpad] : wii_remotes_status) {