Rename SerialBotBaseConnection. Experiment with multiple controller layouts.

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -35,7 +35,7 @@ namespace SerialPABotBase{
 
 
 
-SerialPABotBaseConnection::SerialPABotBaseConnection(Logger& logger, const QSerialPortInfo* port)
+SerialPABotBase_Connection::SerialPABotBase_Connection(Logger& logger, const QSerialPortInfo* port)
     : m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
 {
     set_label_text("Not Connected", COLOR_RED);
@@ -80,9 +80,9 @@ SerialPABotBaseConnection::SerialPABotBaseConnection(Logger& logger, const QSeri
         return;
     }
 
-    m_status_thread = std::thread(run_with_catch, "SerialPABotBaseConnection::thread_body()", [this]{ thread_body(); });
+    m_status_thread = std::thread(run_with_catch, "SerialPABotBase_Connection::thread_body()", [this]{ thread_body(); });
 }
-SerialPABotBaseConnection::~SerialPABotBaseConnection(){
+SerialPABotBase_Connection::~SerialPABotBase_Connection(){
     m_ready.store(false, std::memory_order_release);
     signal_pre_not_ready();
     if (m_botbase == nullptr){
@@ -100,7 +100,7 @@ SerialPABotBaseConnection::~SerialPABotBaseConnection(){
 }
 
 
-void SerialPABotBaseConnection::update_with_capabilities(const std::set<ControllerFeature>& capabilities){
+void SerialPABotBase_Connection::update_with_capabilities(const std::set<ControllerFeature>& capabilities){
     Logger& logger = m_logger;
 
     do{
@@ -130,16 +130,16 @@ void SerialPABotBaseConnection::update_with_capabilities(const std::set<Controll
 
 
 
-BotBaseController* SerialPABotBaseConnection::botbase(){
+BotBaseController* SerialPABotBase_Connection::botbase(){
     BotBaseController* ret = m_botbase.get();
     if (ret == nullptr){
-        m_logger.log("SerialPABotBaseConnection::botbase() called with null botbase...", COLOR_RED);
+        m_logger.log("SerialPABotBase_Connection::botbase() called with null botbase...", COLOR_RED);
     }
     return ret;
 }
 
 
-void SerialPABotBaseConnection::set_label_text(const std::string& text, Color color){
+void SerialPABotBase_Connection::set_label_text(const std::string& text, Color color){
     m_label = html_color_text(text, color);
 
     std::string status = m_label;
@@ -151,7 +151,7 @@ void SerialPABotBaseConnection::set_label_text(const std::string& text, Color co
     }
     set_status(status);
 }
-void SerialPABotBaseConnection::set_uptime_text(const std::string& text, Color color){
+void SerialPABotBase_Connection::set_uptime_text(const std::string& text, Color color){
     m_uptime = html_color_text(text, color);
 
     std::string status = m_label;
@@ -168,13 +168,13 @@ void SerialPABotBaseConnection::set_uptime_text(const std::string& text, Color c
 
 
 
-std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBaseConnection::supported_controllers() const{
+std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBase_Connection::supported_controllers() const{
     std::lock_guard<std::mutex> lg(m_lock);
     return m_controllers;
 }
 
 
-std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBaseConnection::read_device_specs(){
+std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBase_Connection::read_device_specs(){
     Logger& logger = m_logger;
 
 
@@ -223,7 +223,7 @@ std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBaseConnection:
 
 
 
-void SerialPABotBaseConnection::thread_body(){
+void SerialPABotBase_Connection::thread_body(){
     using namespace PokemonAutomation;
 
     m_botbase->set_sniffer(&m_logger);
@@ -266,7 +266,8 @@ void SerialPABotBaseConnection::thread_body(){
         }
         if (error.empty()){
             m_ready.store(true, std::memory_order_release);
-            std::string text = "Program: " + program_name(m_program_id) + " (" + std::to_string(m_protocol) + ")";
+//            std::string text = "Program: " + program_name(m_program_id) + " (" + std::to_string(m_protocol) + ")";
+            std::string text = program_name(m_program_id) + " (" + std::to_string(m_protocol) + ")";
             set_label_text(text, theme_friendly_darkblue());
             signal_post_ready(controllers);
         }else{

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h

@@ -22,10 +22,10 @@ namespace PokemonAutomation{
 namespace SerialPABotBase{
 
 
-class SerialPABotBaseConnection : public ControllerConnection{
+class SerialPABotBase_Connection : public ControllerConnection{
 public:
-    SerialPABotBaseConnection(Logger& logger, const QSerialPortInfo* port);
-    ~SerialPABotBaseConnection();
+    SerialPABotBase_Connection(Logger& logger, const QSerialPortInfo* port);
+    ~SerialPABotBase_Connection();
 
     void update_with_capabilities(const std::set<ControllerFeature>& capabilities);
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp

@@ -78,7 +78,7 @@ JsonValue SerialPABotBase_Descriptor::to_json() const{
 std::unique_ptr<ControllerConnection> SerialPABotBase_Descriptor::open_connection(
     Logger& logger
 ) const{
-    return std::unique_ptr<ControllerConnection>(new SerialPABotBase::SerialPABotBaseConnection(logger, &m_port));
+    return std::unique_ptr<ControllerConnection>(new SerialPABotBase::SerialPABotBase_Connection(logger, &m_port));
 }
 std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
     Logger& logger,
@@ -91,7 +91,7 @@ std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
         return std::unique_ptr<AbstractController>(
             new NintendoSwitch::SwitchController_SerialPABotBase(
                 logger,
-                static_cast<SerialPABotBase::SerialPABotBaseConnection&>(connection),
+                static_cast<SerialPABotBase::SerialPABotBase_Connection&>(connection),
                 requirements
             )
         );

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.cpp

@@ -5,14 +5,9 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-//#include "Common/Cpp/Json/JsonValue.h"
-//#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "Controllers/ControllerCapability.h"
-//#include "Controllers/ControllerDescriptor.h"
-//#include "Controllers/SerialPABotBase/SerialPABotBase.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h"
-//#include "NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h"
 #include "NintendoSwitch_SerialPABotBase.h"
 
 //#include <iostream>
@@ -22,13 +17,10 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
-
 using namespace std::chrono_literals;
 
 
 
-
-
 template <typename Type>
 PA_FORCE_INLINE Type milliseconds_to_ticks_8ms(Type milliseconds){
     return milliseconds / 8 + (milliseconds % 8 + 7) / 8;
@@ -38,14 +30,9 @@ PA_FORCE_INLINE Type milliseconds_to_ticks_8ms(Type milliseconds){
 
 
 
-
-
-SwitchController_SerialPABotBase::~SwitchController_SerialPABotBase(){
-//    m_handle.remove_status_listener(*this);
-}
 SwitchController_SerialPABotBase::SwitchController_SerialPABotBase(
     Logger& logger,
-    SerialPABotBase::SerialPABotBaseConnection& connection,
+    SerialPABotBase::SerialPABotBase_Connection& connection,
     const ControllerRequirements& requirements
 )
     : SwitchControllerWithScheduler(logger)

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.h

@@ -9,8 +9,6 @@
 #define PokemonAutomation_NintendoSwitch_Controller_SerialPABotBase_H
 
 #include "ClientSource/Connection/BotBase.h"
-//#include "Controllers/ControllerDescriptor.h"
-//#include "Controllers/ControllerConnection.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
 #include "NintendoSwitch_ControllerWithScheduler.h"
 
@@ -19,18 +17,15 @@ namespace NintendoSwitch{
 
 
 
-
-
 class SwitchController_SerialPABotBase : public SwitchControllerWithScheduler
 {
 public:
     using ContextType = SwitchControllerContext;
 
 public:
-    ~SwitchController_SerialPABotBase();
     SwitchController_SerialPABotBase(
         Logger& logger,
-        SerialPABotBase::SerialPABotBaseConnection& connection,
+        SerialPABotBase::SerialPABotBase_Connection& connection,
         const ControllerRequirements& requirements
     );
 
@@ -79,7 +74,7 @@ class SwitchController_SerialPABotBase : public SwitchControllerWithScheduler
     Logger& m_logger;
     const ControllerRequirements& m_requirements;
 
-    SerialPABotBase::SerialPABotBaseConnection& m_handle;
+    SerialPABotBase::SerialPABotBase_Connection& m_handle;
     BotBaseController* m_serial;
 
     std::string m_error_string;

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp

@@ -57,19 +57,13 @@ SwitchSystemWidget::SwitchSystemWidget(
     QWidget* widget = new QWidget(m_group_box);
     m_group_box->set_widget(widget);
     {
-        QVBoxLayout* group_layout = new QVBoxLayout(widget);
-        group_layout->setAlignment(Qt::AlignTop);
-        group_layout->setContentsMargins(0, 0, 0, 0);
-
-        m_controller = new ControllerSelectorWidget(*this, m_session.controller_session());
-        group_layout->addWidget(m_controller);
-
         m_audio_display = new AudioDisplayWidget(*this, m_session.logger(), m_session.audio_session());
         layout->addWidget(m_audio_display);
 
         QVBoxLayout* video_holder = new QVBoxLayout();
         layout->addLayout(video_holder);
         video_holder->setContentsMargins(0, 0, 0, 0);
+
         m_video_display = new VideoDisplayWidget(
             *this, *video_holder,
             m_session.console_number(),
@@ -78,6 +72,14 @@ SwitchSystemWidget::SwitchSystemWidget(
             m_session.overlay_session()
         );
         video_holder->addWidget(m_video_display);
+    }
+    {
+        QVBoxLayout* group_layout = new QVBoxLayout(widget);
+        group_layout->setAlignment(Qt::AlignTop);
+        group_layout->setContentsMargins(0, 0, 0, 0);
+
+        m_controller = new ControllerSelectorWidget(*this, m_session.controller_session());
+        group_layout->addWidget(m_controller);
 
         m_camera_widget = new CameraSelectorWidget(
             m_session.camera_session(),
@@ -89,6 +91,20 @@ SwitchSystemWidget::SwitchSystemWidget(
         m_audio_widget = new AudioSelectorWidget(*widget, m_session.audio_session());
         group_layout->addWidget(m_audio_widget);
 
+#if 0
+        //  Experiment with multiple controller layouts.
+        m_controller = new ControllerSelectorWidget(*this, m_session.controller_session());
+        group_layout->addWidget(m_controller);
+
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+        group_layout->addWidget(new ControllerSelectorWidget(*this, m_session.controller_session()));
+#endif
+
         m_command = new CommandRow(
             *widget,
             m_session.controller_session(),

SerialPrograms/Source/Tests/PokemonLA_Tests.cpp

@@ -492,7 +492,7 @@ int test_pokemonLA_SaveScreenDetector(const ImageViewRGB32& image, const std::ve
 int test_pokemonLA_shinySoundDetector(const std::vector<AudioSpectrum>& spectrums, bool target){
     auto& logger = global_logger_command_line();
     DummyBotBase botbase(logger);
-    SerialPABotBase::SerialPABotBaseConnection connection(logger, nullptr);
+    SerialPABotBase::SerialPABotBase_Connection connection(logger, nullptr);
     SwitchController_SerialPABotBase controller(logger, connection, {});
     DummyVideoFeed video_feed;
     DummyVideoOverlay video_overlay;