Rename BotBase. Move ConsoleHandle into NintendoSwitch namespace.

Author: Mysticial

ClientSource/Connection/BotBase.cpp

@@ -17,17 +17,17 @@ namespace PokemonAutomation{
 
 void BotBaseContext::wait_for_all_requests() const{
     m_lifetime_sanitizer.check_usage();
-    m_botbase.wait_for_all_requests(this);
+    m_controller.wait_for_all_requests(this);
 }
 void BotBaseContext::cancel_now(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
-    m_botbase.stop_all_commands();
+    m_controller.stop_all_commands();
 }
 void BotBaseContext::cancel_lazy(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
-    m_botbase.next_command_interrupt();
+    m_controller.next_command_interrupt();
 }
 
 bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
@@ -36,23 +36,23 @@ bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
         return true;
     }
     try{
-        m_botbase.stop_all_commands();
+        m_controller.stop_all_commands();
     }catch (...){}
     return false;
 }
 
 bool BotBaseContext::try_issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    return m_botbase.try_issue_request(request, this);
+    return m_controller.try_issue_request(request, this);
 }
 void BotBaseContext::issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    m_botbase.issue_request(request, this);
+    m_controller.issue_request(request, this);
 }
 
 BotBaseMessage BotBaseContext::issue_request_and_wait(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    return m_botbase.issue_request_and_wait(request, this);
+    return m_controller.issue_request_and_wait(request, this);
 }
 
 

ClientSource/Connection/BotBase.h

@@ -19,7 +19,7 @@ class BotBaseContext;
 
 
 
-class BotBase{
+class BotBaseController{
 public:
     using ContextType = BotBaseContext;
 
@@ -31,7 +31,7 @@ class BotBase{
     };
 
 public:
-    virtual ~BotBase() = default;
+    virtual ~BotBaseController() = default;
 
     virtual Logger& logger() = 0;
     virtual State state() const = 0;
@@ -84,14 +84,14 @@ class ControllerContext : public CancellableScope{
 //  A wrapper for BotBase that allows for asynchronous cancelling.
 class BotBaseContext final : public ControllerContext{
 public:
-    using ControllerType = BotBase;
+    using ControllerType = BotBaseController;
 
 public:
-    BotBaseContext(BotBase& botbase)
-        : m_botbase(botbase)
+    BotBaseContext(BotBaseController& botbase)
+        : m_controller(botbase)
     {}
-    BotBaseContext(CancellableScope& parent, BotBase& botbase)
-        : m_botbase(botbase)
+    BotBaseContext(CancellableScope& parent, BotBaseController& botbase)
+        : m_controller(botbase)
     {
         attach(parent);
     }
@@ -102,8 +102,8 @@ class BotBaseContext final : public ControllerContext{
 
     virtual void wait_for_all_requests() const override;
 
-    operator BotBase&() const{ return m_botbase; }
-    BotBase& controller() const{ return m_botbase; }
+    operator BotBaseController&() const{ return m_controller; }
+    BotBaseController& controller() const{ return m_controller; }
 
     //  Stop all commands in this context now.
     virtual void cancel_now() override;
@@ -127,7 +127,7 @@ class BotBaseContext final : public ControllerContext{
 
 
 private:
-    BotBase& m_botbase;
+    BotBaseController& m_controller;
     LifetimeSanitizer m_lifetime_sanitizer;
 };
 

ClientSource/Connection/PABotBase.h

@@ -40,7 +40,7 @@
 namespace PokemonAutomation{
 
 
-class PABotBase : public BotBase, private PABotBaseConnection{
+class PABotBase : public BotBaseController, private PABotBaseConnection{
 //    static const size_t MAX_PENDING_REQUESTS = PABB_DEVICE_QUEUE_SIZE;
     static const seqnum_t MAX_SEQNUM_GAP = (seqnum_t)-1 >> 2;
 
@@ -89,9 +89,9 @@ class PABotBase : public BotBase, private PABotBaseConnection{
 public:
     //  For Command Implementations
 
-//    using BotBase::try_issue_request;
-    using BotBase::issue_request;
-    using BotBase::issue_request_and_wait;
+//    using BotBaseController::try_issue_request;
+    using BotBaseController::issue_request;
+    using BotBaseController::issue_request_and_wait;
 
 
 private:

Common/Microcontroller/DeviceRoutines.cpp

@@ -10,29 +10,29 @@ namespace PokemonAutomation{
 namespace Microcontroller{
 
 
-uint32_t protocol_version(BotBase& botbase){
+uint32_t protocol_version(BotBaseController& botbase){
     pabb_MsgAckRequestI32 response;
     botbase.issue_request_and_wait(
         DeviceRequest_protocol_version()
     ).convert<PABB_MSG_ACK_REQUEST_I32>(botbase.logger(), response);
     return response.data;
 }
-uint32_t program_version(BotBase& botbase){
+uint32_t program_version(BotBaseController& botbase){
     pabb_MsgAckRequestI32 response;
     botbase.issue_request_and_wait(
         DeviceRequest_program_version()
     ).convert<PABB_MSG_ACK_REQUEST_I32>(botbase.logger(), response);
     return response.data;
 }
-uint8_t device_queue_size(BotBase& botbase){
+uint8_t device_queue_size(BotBaseController& botbase){
     pabb_MsgAckRequestI8 response;
     botbase.issue_request_and_wait(
         DeviceRequest_queue_size()
     ).convert<PABB_MSG_ACK_REQUEST_I8>(botbase.logger(), response);
     return response.data;
 
 }
-uint8_t program_id(BotBase& botbase){
+uint8_t program_id(BotBaseController& botbase){
     pabb_MsgAckRequestI8 response;
     botbase.issue_request_and_wait(
         DeviceRequest_program_id()

Common/Microcontroller/DeviceRoutines.h

@@ -14,10 +14,10 @@
 namespace PokemonAutomation{
 namespace Microcontroller{
 
-uint32_t protocol_version(BotBase& botbase);
-uint32_t program_version(BotBase& botbase);
-uint8_t device_queue_size(BotBase& botbase);
-uint8_t program_id(BotBase& botbase);
+uint32_t protocol_version(BotBaseController& botbase);
+uint32_t program_version(BotBaseController& botbase);
+uint8_t device_queue_size(BotBaseController& botbase);
+uint8_t program_id(BotBaseController& botbase);
 
 
 class DeviceRequest_seqnum_reset : public BotBaseRequest{

SerialPrograms/CMakeLists.txt

@@ -791,6 +791,7 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.h
     Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
     Source/NintendoSwitch/DevPrograms/BoxDraw.h
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

SerialPrograms/SerialPrograms.pro

@@ -1516,6 +1516,7 @@ HEADERS += \
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h \
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h \
     Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h \
+    Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.h \
     Source/NintendoSwitch/DevPrograms/BoxDraw.h \
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.h \
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h \

SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.cpp

@@ -108,8 +108,8 @@ BotBaseHandle::~BotBaseHandle(){
     emit on_not_connected("");
 }
 
-BotBase* BotBaseHandle::botbase(){
-    BotBase* ret = m_botbase.get();
+BotBaseController* BotBaseHandle::botbase(){
+    BotBaseController* ret = m_botbase.get();
     if (ret == nullptr){
         m_logger.log("BotBaseHandle::botbase() called with null botbase...", COLOR_RED);
     }

SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.h

@@ -52,7 +52,7 @@ class BotBaseHandle : public QObject{
 public:
     //  Not thread-safe with stop() or reset(). The returned pointer
     //  will only be valid until the next call to stop()/reset().
-    BotBase* botbase();
+    BotBaseController* botbase();
 
     //  Safe to call anywhere anytime. If called asynchronously with
     //  stop()/reset(), the result may be immediately out-of-date.

SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.cpp

@@ -205,7 +205,7 @@ void AsyncCommandSession<ControllerType>::stop_session_and_rethrow(){
 
 
 
-template class AsyncCommandSession<BotBase>;
+template class AsyncCommandSession<BotBaseController>;