BotBaseContext -> NintendoSwitch::ControllerContext

Author: Mysticial

ClientSource/Connection/BotBase.cpp

@@ -15,22 +15,22 @@ namespace PokemonAutomation{
 
 
 
-void BotBaseContext::wait_for_all_requests() const{
+void BotBaseControllerContext::wait_for_all_requests() const{
     m_lifetime_sanitizer.check_usage();
     m_controller.wait_for_all_requests(this);
 }
-void BotBaseContext::cancel_now(){
+void BotBaseControllerContext::cancel_now(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
     m_controller.stop_all_commands();
 }
-void BotBaseContext::cancel_lazy(){
+void BotBaseControllerContext::cancel_lazy(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
     m_controller.next_command_interrupt();
 }
 
-bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
+bool BotBaseControllerContext::cancel(std::exception_ptr exception) noexcept{
     m_lifetime_sanitizer.check_usage();
     if (CancellableScope::cancel(std::move(exception))){
         return true;
@@ -41,16 +41,16 @@ bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
     return false;
 }
 
-bool BotBaseContext::try_issue_request(const BotBaseRequest& request) const{
+bool BotBaseControllerContext::try_issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
     return m_controller.try_issue_request(request, this);
 }
-void BotBaseContext::issue_request(const BotBaseRequest& request) const{
+void BotBaseControllerContext::issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
     m_controller.issue_request(request, this);
 }
 
-BotBaseMessage BotBaseContext::issue_request_and_wait(const BotBaseRequest& request) const{
+BotBaseMessage BotBaseControllerContext::issue_request_and_wait(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
     return m_controller.issue_request_and_wait(request, this);
 }

ClientSource/Connection/BotBase.h

@@ -15,13 +15,13 @@ namespace PokemonAutomation{
 class Logger;
 struct BotBaseMessage;
 class BotBaseRequest;
-class BotBaseContext;
+class BotBaseControllerContext;
 
 
 
 class BotBaseController{
 public:
-    using ContextType = BotBaseContext;
+    using ContextType = BotBaseControllerContext;
 
     enum class State{
         RUNNING,
@@ -82,20 +82,20 @@ class ControllerContext : public CancellableScope{
 
 
 //  A wrapper for BotBase that allows for asynchronous cancelling.
-class BotBaseContext final : public ControllerContext{
+class BotBaseControllerContext final : public ControllerContext{
 public:
     using ControllerType = BotBaseController;
 
 public:
-    BotBaseContext(BotBaseController& botbase)
+    BotBaseControllerContext(BotBaseController& botbase)
         : m_controller(botbase)
     {}
-    BotBaseContext(CancellableScope& parent, BotBaseController& botbase)
+    BotBaseControllerContext(CancellableScope& parent, BotBaseController& botbase)
         : m_controller(botbase)
     {
         attach(parent);
     }
-    virtual ~BotBaseContext(){
+    virtual ~BotBaseControllerContext(){
         detach();
     }
 

Common/Cpp/LifetimeSanitizer.h

@@ -8,8 +8,8 @@
 #define PokemonAutomation_LifetimeSanitizer_H
 
 #include <stdint.h>
+//#include <string>
 #include <atomic>
-#include <string>
 #include "Common/Compiler.h"
 
 #define PA_SANITIZER_ENABLE

Common/Cpp/PanicDump.h

@@ -7,9 +7,7 @@
 #ifndef PokemonAutomation_PanicDumping_H
 #define PokemonAutomation_PanicDumping_H
 
-#include <string>
 #include <functional>
-#include "ClientSource/Connection/BotBase.h"
 
 namespace PokemonAutomation{
 

SerialPrograms/CMakeLists.txt

@@ -537,7 +537,7 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/Tools/ErrorDumper.h
     Source/CommonFramework/Tools/FileDownloader.cpp
     Source/CommonFramework/Tools/FileDownloader.h
-    Source/CommonFramework/Tools/InterruptableCommands.cpp
+    Source/CommonFramework/Tools/InterruptableCommands.tpp
     Source/CommonFramework/Tools/InterruptableCommands.h
     Source/CommonFramework/Tools/MultiConsoleErrors.cpp
     Source/CommonFramework/Tools/MultiConsoleErrors.h
@@ -547,7 +547,7 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/Tools/StatsDatabase.h
     Source/CommonFramework/Tools/StatsTracking.cpp
     Source/CommonFramework/Tools/StatsTracking.h
-    Source/CommonFramework/Tools/SuperControlSession.cpp
+    Source/CommonFramework/Tools/SuperControlSession.tpp
     Source/CommonFramework/Tools/SuperControlSession.h
     Source/CommonFramework/Tools/VideoResolutionCheck.cpp
     Source/CommonFramework/Tools/VideoResolutionCheck.h
@@ -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.cpp
     Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.h
     Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
     Source/NintendoSwitch/DevPrograms/BoxDraw.h

SerialPrograms/SerialPrograms.pro

@@ -282,12 +282,11 @@ SOURCES += \
     Source/CommonFramework/Tools/DebugDumper.cpp \
     Source/CommonFramework/Tools/ErrorDumper.cpp \
     Source/CommonFramework/Tools/FileDownloader.cpp \
-    Source/CommonFramework/Tools/InterruptableCommands.cpp \
+    Source/CommonFramework/Tools/InterruptableCommands.tpp \
     Source/CommonFramework/Tools/MultiConsoleErrors.cpp \
     Source/CommonFramework/Tools/ProgramEnvironment.cpp \
     Source/CommonFramework/Tools/StatsDatabase.cpp \
     Source/CommonFramework/Tools/StatsTracking.cpp \
-    Source/CommonFramework/Tools/SuperControlSession.cpp \
     Source/CommonFramework/Tools/VideoResolutionCheck.cpp \
     Source/CommonFramework/Tools/VideoStream.cpp \
     Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp \
@@ -395,6 +394,7 @@ SOURCES += \
     Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp \
     Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp \
     Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp \
+    Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.cpp \
     Source/NintendoSwitch/DevPrograms/BoxDraw.cpp \
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp \
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp \
@@ -1382,11 +1382,13 @@ HEADERS += \
     Source/CommonFramework/Tools/ErrorDumper.h \
     Source/CommonFramework/Tools/FileDownloader.h \
     Source/CommonFramework/Tools/InterruptableCommands.h \
+    Source/CommonFramework/Tools/InterruptableCommands.tpp \
     Source/CommonFramework/Tools/MultiConsoleErrors.h \
     Source/CommonFramework/Tools/ProgramEnvironment.h \
     Source/CommonFramework/Tools/StatsDatabase.h \
     Source/CommonFramework/Tools/StatsTracking.h \
     Source/CommonFramework/Tools/SuperControlSession.h \
+    Source/CommonFramework/Tools/SuperControlSession.tpp \
     Source/CommonFramework/Tools/VideoResolutionCheck.h \
     Source/CommonFramework/Tools/VideoStream.h \
     Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h \

SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.cpp

@@ -381,7 +381,7 @@ void BotBaseHandle::thread_body(){
         }
     });
 
-    BotBaseContext context(*m_botbase);
+    BotBaseControllerContext context(*m_botbase);
     while (true){
         if (m_state.load(std::memory_order_acquire) != State::READY){
             break;

SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.h

@@ -9,12 +9,13 @@
 
 #include <mutex>
 #include <condition_variable>
+#include "Common/Cpp/CancellableScope.h"
 #include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "ClientSource/Connection/BotBase.h"
 
 
 namespace PokemonAutomation{
 
+class Logger;
 class ProgramEnvironment;