Add new message type in preparation for ESP32 reconnect.

Author: Mysticial

ClientSource/Libraries/MessageConverter.cpp

@@ -336,7 +336,19 @@ int register_message_converters_framework_requests(){
             if (body.size() != sizeof(pabb_MsgRequestChangeControllerMode)){ ss << "(invalid size)" << std::endl; return ss.str(); }
             const auto* params = (const pabb_MsgRequestChangeControllerMode*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", mode = " << params->mode;
+            ss << ", controller_id = " << params->controller_id;
+            return ss.str();
+        }
+    );
+    register_message_converter(
+        PABB_MSG_REQUEST_RESET_TO_CONTROLLER,
+        [](const std::string& body){
+            std::ostringstream ss;
+            ss << "PABB_MSG_REQUEST_RESET_TO_CONTROLLER - ";
+            if (body.size() != sizeof(pabb_MsgRequestChangeControllerMode)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_MsgRequestChangeControllerMode*)body.c_str();
+            ss << "seqnum = " << (uint64_t)params->seqnum;
+            ss << ", controller_id = " << params->controller_id;
             return ss.str();
         }
     );

Common/SerialPABotBase/SerialPABotBase_Protocol.h

@@ -322,10 +322,11 @@ typedef struct{
     seqnum_t seqnum;
 } PABB_PACK pabb_MsgRequestReadControllerMode;
 
-#define PABB_MSG_REQUEST_CHANGE_CONTROLLER_MODE 0x4a
+#define PABB_MSG_REQUEST_CHANGE_CONTROLLER_MODE 0x4a    //  Change controller and keep settings.
+#define PABB_MSG_REQUEST_RESET_TO_CONTROLLER    0x4b    //  Change controller and wipe settings. (unpair from host)
 typedef struct{
     seqnum_t seqnum;
-    uint32_t mode;
+    uint32_t controller_id;
 } PABB_PACK pabb_MsgRequestChangeControllerMode;
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h

@@ -117,15 +117,27 @@ class DeviceRequest_read_controller_mode : public BotBaseRequest{
 class DeviceRequest_change_controller_mode : public BotBaseRequest{
 public:
     pabb_MsgRequestChangeControllerMode params;
-    DeviceRequest_change_controller_mode(uint32_t mode)
+    DeviceRequest_change_controller_mode(uint32_t controller_id)
         : BotBaseRequest(false)
     {
-        params.mode = mode;
+        params.controller_id = controller_id;
     }
     virtual BotBaseMessage message() const override{
         return BotBaseMessage(PABB_MSG_REQUEST_CHANGE_CONTROLLER_MODE, params);
     }
 };
+class DeviceRequest_reset_to_controller : public BotBaseRequest{
+public:
+    pabb_MsgRequestChangeControllerMode params;
+    DeviceRequest_reset_to_controller(uint32_t controller_id)
+        : BotBaseRequest(false)
+    {
+        params.controller_id = controller_id;
+    }
+    virtual BotBaseMessage message() const override{
+        return BotBaseMessage(PABB_MSG_REQUEST_RESET_TO_CONTROLLER, params);
+    }
+};
 class MessageControllerStatus : public BotBaseRequest{
 public:
     pabb_Message_RequestStatus params;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -264,6 +264,13 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
     auto screenshot = feed.snapshot();
 
+    TeraCardReader detector;
+    detector.make_overlays(overlays);
+
+    cout << detector.detect(screenshot) << endl;
+    detector.pokemon_slug(logger, env.program_info(), screenshot);
+
+
 #if 0
     NewsDetector detector;
     detector.make_overlays(overlays);