More controllers refactor.

Author: Mysticial

Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h

@@ -21,8 +21,7 @@
 
 
 #ifdef __cplusplus
-namespace PokemonAutomation{
-namespace SerialPABotBase{
+extern "C" {
 #endif
 
 
@@ -37,7 +36,6 @@ typedef struct{
 
 #ifdef __cplusplus
 }
-}
 #endif
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_OemControllers.h

@@ -10,6 +10,7 @@
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h"
 #include "Controllers/ControllerTypes.h"
+#include "Controllers/SerialPABotBase/SerialPABotBase.h"
 #include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
@@ -25,21 +26,8 @@ class MessageControllerReadSpi : public BotBaseRequest{
     MessageControllerReadSpi(ControllerType controller_type, uint32_t address, uint8_t bytes)
         : BotBaseRequest(false)
     {
-        uint32_t controller_id = PABB_CID_NONE;
-        switch (controller_type){
-        case ControllerType::NintendoSwitch_WirelessProController:
-            controller_id = PABB_CID_NintendoSwitch_WirelessProController;
-            break;
-        case ControllerType::NintendoSwitch_LeftJoycon:
-            controller_id = PABB_CID_NintendoSwitch_LeftJoycon;
-            break;
-        case ControllerType::NintendoSwitch_RightJoycon:
-            controller_id = PABB_CID_NintendoSwitch_RightJoycon;
-            break;
-        default:;
-        }
         params.seqnum = 0;
-        params.controller_type = controller_id;
+        params.controller_type = controller_type_to_id(controller_type);
         params.address = address;
         params.bytes = bytes;
     }
@@ -57,22 +45,9 @@ class MessageControllerWriteSpi : public BotBaseRequest{
     )
         : BotBaseRequest(false)
     {
-        uint32_t controller_id = PABB_CID_NONE;
-        switch (controller_type){
-        case ControllerType::NintendoSwitch_WirelessProController:
-            controller_id = PABB_CID_NintendoSwitch_WirelessProController;
-            break;
-        case ControllerType::NintendoSwitch_LeftJoycon:
-            controller_id = PABB_CID_NintendoSwitch_LeftJoycon;
-            break;
-        case ControllerType::NintendoSwitch_RightJoycon:
-            controller_id = PABB_CID_NintendoSwitch_RightJoycon;
-            break;
-        default:;
-        }
         pabb_Message_NS1_OemController_WriteSpi params;
         params.seqnum = 0;
-        params.controller_type = controller_id;
+        params.controller_type = controller_type_to_id(controller_type);
         params.address = address;
         params.bytes = bytes;
         data = std::string((char*)&params, sizeof(params));

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

@@ -12,9 +12,10 @@
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_SerialPABotBase_OemController.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+//  REMOVE
+#include <iostream>
+using std::cout;
+using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -40,6 +41,8 @@ SerialPABotBase_OemController::SerialPABotBase_OemController(
     )
     , m_controller_type(controller_type)
 {
+//    cout << "controller_type = " << (int)controller_type << endl;
+
     using namespace SerialPABotBase;
 
     switch (controller_type){
@@ -155,6 +158,7 @@ void SerialPABotBase_OemController::set_info(){
         colors.right_grip[2] = color.blue();
     }
 
+
     m_serial->issue_request_and_wait(
         MessageControllerWriteSpi(
             m_controller_type,
@@ -359,6 +363,7 @@ void SerialPABotBase_OemController::update_status(Cancellable& cancellable){
             m_logger.log("Reading Controller Colors... Done");
 
             switch (m_controller_type){
+            case ControllerType::NintendoSwitch_WiredProController:
             case ControllerType::NintendoSwitch_WirelessProController:{
                 Color left(colors.left_grip[0], colors.left_grip[1], colors.left_grip[2]);
                 Color body(colors.body[0], colors.body[1], colors.body[2]);