Rename files to avoid name conflict.

Mysticial · Mysticial · commit 7b84845f30d4 · 2025-03-04T00:22:10.000-08:00
diff --git a/ClientSource/Connection/MessageLogger.cpp b/ClientSource/Connection/MessageLogger.cpp
@@ -31,7 +31,7 @@ void MessageLogger::on_send(const BotBaseMessage& message, bool is_retransmit){
         if (message.type == PABB_MSG_REQUEST_CLOCK){
             print = false;
         }
-#if 1
+#if 0
         if (message.type == PABB_MSG_CONTROLLER_STATE){
 //            pabb_controller_state body;
 //            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -835,12 +835,12 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Controllers/NintendoSwitch_ProControllerWithScheduler.h
     Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp
     Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.cpp
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.h
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_ProController.cpp
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_ProController.h
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_WirelessProController.cpp
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_WirelessProController.h
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.cpp
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.h
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp
diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -411,9 +411,9 @@ SOURCES += \
     Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp \
     Source/NintendoSwitch/Controllers/NintendoSwitch_ProControllerWithScheduler.cpp \
     Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.cpp \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_ProController.cpp \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_WirelessProController.cpp \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.cpp \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.cpp \
@@ -1579,9 +1579,9 @@ HEADERS += \
     Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h \
     Source/NintendoSwitch/Controllers/NintendoSwitch_ProControllerWithScheduler.h \
     Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.h \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_ProController.h \
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_WirelessProController.h \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.h \
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h \
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp
@@ -11,8 +11,8 @@
 #include "SerialPABotBase_Descriptor.h"
 #include "SerialPABotBase_SelectorWidget.h"
 
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.h"
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_WirelessProController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp
@@ -1,4 +1,4 @@
-/*  Pokken Controller
+/*  SerialPABotBase: Pokken Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
@@ -12,7 +12,7 @@
 #include "Controllers/ControllerCapability.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h"
-#include "NintendoSwitch_PokkenController.h"
+#include "NintendoSwitch_SerialPABotBase_PokkenController.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h
@@ -1,14 +1,14 @@
-/*  Pokken Controller
+/*  SerialPABotBase: Pokken Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
  */
 
-#ifndef PokemonAutomation_NintendoSwitch_PokkenController_H
-#define PokemonAutomation_NintendoSwitch_PokkenController_H
+#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_PokkenController_H
+#define PokemonAutomation_NintendoSwitch_SerialPABotBase_PokkenController_H
 
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch_ProController.h"
+#include "NintendoSwitch_SerialPABotBase_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.cpp
@@ -1,4 +1,4 @@
-/*  Pro Controller
+/*  SerialPABotBase: Pro Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
@@ -8,7 +8,7 @@
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "Controllers/ControllerTypeStrings.h"
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch_ProController.h"
+#include "NintendoSwitch_SerialPABotBase_ProController.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_ProController.h
@@ -1,11 +1,11 @@
-/*  Pro Controller
+/*  SerialPABotBase: Pro Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
  */
 
-#ifndef PokemonAutomation_NintendoSwitch_ProController_H
-#define PokemonAutomation_NintendoSwitch_ProController_H
+#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_ProController_H
+#define PokemonAutomation_NintendoSwitch_SerialPABotBase_ProController_H
 
 #include "ClientSource/Connection/BotBase.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp
@@ -1,4 +1,4 @@
-/*  Pokken Controller
+/*  SerialPABotBase: Wireless Pro Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
@@ -13,7 +13,7 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch_WirelessProController.h"
+#include "NintendoSwitch_SerialPABotBase_WirelessProController.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h
@@ -1,13 +1,13 @@
-/*  Wireless Pro Controller
+/*  SerialPABotBase: Wireless Pro Controller
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
  */
 
-#ifndef PokemonAutomation_NintendoSwitch_WirelessProController_H
-#define PokemonAutomation_NintendoSwitch_WirelessProController_H
+#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_WirelessProController_H
+#define PokemonAutomation_NintendoSwitch_SerialPABotBase_WirelessProController_H
 
-#include "NintendoSwitch_ProController.h"
+#include "NintendoSwitch_SerialPABotBase_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/Tests/PokemonLA_Tests.cpp b/SerialPrograms/Source/Tests/PokemonLA_Tests.cpp
@@ -12,7 +12,7 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_PokkenController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
 #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 #include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
 #include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void MessageLogger::on_send(const BotBaseMessage& message, bool is_retransmit){`
`31`	`31`	`if (message.type == PABB_MSG_REQUEST_CLOCK){`
`32`	`32`	`print = false;`
`33`	`33`	`}`
`34`		`-#if 1`
	`34`	`+#if 0`
`35`	`35`	`if (message.type == PABB_MSG_CONTROLLER_STATE){`
`36`	`36`	`// pabb_controller_state body;`
`37`	`37`	`// memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Pokken Controller`
	`1`	`+/* SerialPABotBase: Pokken Controller`
`2`	`2`	`*`
`3`	`3`	`* From: https://github.com/PokemonAutomation/Arduino-Source`
`4`	`4`	`*`
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include "Controllers/ControllerCapability.h"`
`13`	`13`	`#include "NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h"`
`14`	`14`	`#include "NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h"`
`15`		`-#include "NintendoSwitch_PokkenController.h"`
	`15`	`+#include "NintendoSwitch_SerialPABotBase_PokkenController.h"`
`16`	`16`
`17`	`17`	`//#include <iostream>`
`18`	`18`	`//using std::cout;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Pro Controller`
	`1`	`+/* SerialPABotBase: Pro Controller`
`2`	`2`	`*`
`3`	`3`	`* From: https://github.com/PokemonAutomation/Arduino-Source`
`4`	`4`	`*`
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"`
`9`	`9`	`#include "Controllers/ControllerTypeStrings.h"`
`10`	`10`	`#include "Controllers/ControllerCapability.h"`
`11`		`-#include "NintendoSwitch_ProController.h"`
	`11`	`+#include "NintendoSwitch_SerialPABotBase_ProController.h"`
`12`	`12`
`13`	`13`	`//#include <iostream>`
`14`	`14`	`//using std::cout;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-/* Pro Controller`
	`1`	`+/* SerialPABotBase: Pro Controller`
`2`	`2`	`*`
`3`	`3`	`* From: https://github.com/PokemonAutomation/Arduino-Source`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#ifndef PokemonAutomation_NintendoSwitch_ProController_H`
`8`		`-#define PokemonAutomation_NintendoSwitch_ProController_H`
	`7`	`+#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_ProController_H`
	`8`	`+#define PokemonAutomation_NintendoSwitch_SerialPABotBase_ProController_H`
`9`	`9`
`10`	`10`	`#include "ClientSource/Connection/BotBase.h"`
`11`	`11`	`#include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Pokken Controller`
	`1`	`+/* SerialPABotBase: Wireless Pro Controller`
`2`	`2`	`*`
`3`	`3`	`* From: https://github.com/PokemonAutomation/Arduino-Source`
`4`	`4`	`*`
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include "CommonFramework/GlobalSettingsPanel.h"`
`14`	`14`	`#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"`
`15`	`15`	`#include "Controllers/ControllerCapability.h"`
`16`		`-#include "NintendoSwitch_WirelessProController.h"`
	`16`	`+#include "NintendoSwitch_SerialPABotBase_WirelessProController.h"`
`17`	`17`
`18`	`18`	`//#include <iostream>`
`19`	`19`	`//using std::cout;`