Minor refactor.

Author: Mysticial

Common/SerialPABotBase/SerialPABotBase_Messages_ESP32.h

@@ -19,8 +19,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-namespace PokemonAutomation{
-namespace SerialPABotBase{
 #endif
 
 
@@ -30,7 +28,7 @@ typedef struct{
     uint8_t buttons[3];
     uint8_t left_grip[3];
     uint8_t right_grip[3];
-} NintendoSwitch_ControllerColors;
+} PABB_ESP32_NintendoSwitch_ControllerColors;
 
 typedef struct{
     uint8_t button3;
@@ -39,11 +37,11 @@ typedef struct{
     uint8_t left_joystick[3];
     uint8_t right_joystick[3];
     uint8_t vibrator;
-} NintendoSwitch_ButtonState;
+} PABB_ESP32_NintendoSwitch_ButtonState;
 
 typedef struct{
     uint8_t data[36];
-} NintendoSwitch_GyroState;
+} PABB_ESP32_NintendoSwitch_GyroState;
 
 
 
@@ -79,25 +77,23 @@ typedef struct{
 typedef struct{
     seqnum_t seqnum;
     uint16_t milliseconds;
-    NintendoSwitch_ButtonState buttons;
+    PABB_ESP32_NintendoSwitch_ButtonState buttons;
 } PABB_PACK pabb_Message_ESP32_CommandButtonState;
 
 
 #define PABB_MSG_ESP32_CONTROLLER_STATE_FULL        0xa1
 typedef struct{
     seqnum_t seqnum;
     uint16_t milliseconds;
-    NintendoSwitch_ButtonState buttons;
-    NintendoSwitch_GyroState gyro;
+    PABB_ESP32_NintendoSwitch_ButtonState buttons;
+    PABB_ESP32_NintendoSwitch_GyroState gyro;
 } PABB_PACK pabb_Message_ESP32_CommandFullState;
 
 
 
 
 #ifdef __cplusplus
 }
-}
-}
 #endif
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -225,7 +225,7 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
                     desired_controller
                 );
 
-            NintendoSwitch_ControllerColors colors;
+            PABB_ESP32_NintendoSwitch_ControllerColors colors;
             {
                 Color color(profile.body_color);
                 colors.body[0] = color.red();
@@ -254,7 +254,7 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
             m_botbase->issue_request_and_wait(
                 MessageControllerWriteSpi(
                     desired_controller,
-                    0x00006050, sizeof(NintendoSwitch_ControllerColors),
+                    0x00006050, sizeof(PABB_ESP32_NintendoSwitch_ControllerColors),
                     &colors
                 ),
 //                MessageControllerSetColors(desired_controller, colors),

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.h

@@ -154,7 +154,7 @@ class MessageControllerSetColors : public BotBaseRequest{
 class MessageControllerStateButtons : public BotBaseRequest{
 public:
     pabb_Message_ESP32_CommandButtonState params;
-    MessageControllerStateButtons(uint16_t milliseconds, const NintendoSwitch_ButtonState& state)
+    MessageControllerStateButtons(uint16_t milliseconds, const PABB_ESP32_NintendoSwitch_ButtonState& state)
         : BotBaseRequest(true)
     {
         params.seqnum = 0;
@@ -170,8 +170,8 @@ class MessageControllerStateFull : public BotBaseRequest{
     pabb_Message_ESP32_CommandFullState params;
     MessageControllerStateFull(
         uint16_t milliseconds,
-        const NintendoSwitch_ButtonState& buttons,
-        const NintendoSwitch_GyroState& gyro
+        const PABB_ESP32_NintendoSwitch_ButtonState& buttons,
+        const PABB_ESP32_NintendoSwitch_GyroState& gyro
     )
         : BotBaseRequest(true)
     {

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.cpp

@@ -65,7 +65,7 @@ void SerialPABotBase_WirelessController::stop(){
 
 void SerialPABotBase_WirelessController::issue_report(
     const Cancellable* cancellable,
-    const SerialPABotBase::NintendoSwitch_ButtonState& buttons,
+    const PABB_ESP32_NintendoSwitch_ButtonState& buttons,
     WallDuration duration
 ){
     //  Release the state lock since we are no longer touching state.
@@ -118,7 +118,7 @@ void SerialPABotBase_WirelessController::status_thread(){
     try{
         m_logger.log("Reading Controller Colors...");
 
-        using ControllerColors = SerialPABotBase::NintendoSwitch_ControllerColors;
+        using ControllerColors = PABB_ESP32_NintendoSwitch_ControllerColors;
 
         BotBaseMessage response = m_serial->issue_request_and_wait(
             SerialPABotBase::MessageControllerReadSpi(

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.h

@@ -102,7 +102,7 @@ class SerialPABotBase_WirelessController : public SerialPABotBase_Controller{
 
     void issue_report(
         const Cancellable* cancellable,
-        const SerialPABotBase::NintendoSwitch_ButtonState& buttons,
+        const PABB_ESP32_NintendoSwitch_ButtonState& buttons,
         WallDuration duration
     );
 

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.cpp

@@ -129,7 +129,7 @@ void SerialPABotBase_WirelessJoycon::issue_mash_button(
 void SerialPABotBase_WirelessJoycon::push_state_left_joycon(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ButtonState report{
+    PABB_ESP32_NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,
@@ -192,7 +192,7 @@ void SerialPABotBase_WirelessJoycon::push_state_left_joycon(const Cancellable* c
 void SerialPABotBase_WirelessJoycon::push_state_right_joycon(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ButtonState report{
+    PABB_ESP32_NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp

@@ -36,7 +36,7 @@ SerialPABotBase_WirelessProController::~SerialPABotBase_WirelessProController(){
 void SerialPABotBase_WirelessProController::push_state(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ButtonState report{
+    PABB_ESP32_NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,