Rename controller names. Fix controller settings being unlocked while program is running.

Author: Mysticial

SerialPrograms/Source/Controllers/ControllerCapability.cpp

@@ -12,9 +12,9 @@ namespace PokemonAutomation{
 
 const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS{
     {ControllerInterface::None,                 "None"},
-    {ControllerInterface::SerialPABotBase,      "Serial PABotBase"},
-    {ControllerInterface::SysbotBaseNetwork,    "sys-botbase Network"},
-    {ControllerInterface::SysbotBaseUSB,        "sys-botbase USB"},
+    {ControllerInterface::SerialPABotBase,      "Serial: PABotBase"},
+    {ControllerInterface::TcpSysbotBase,        "TCP: sys-botbase"},
+    {ControllerInterface::UsbSysbotBase,        "USB: sys-botbase"},
 };
 
 const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS{

SerialPrograms/Source/Controllers/ControllerCapability.h

@@ -42,8 +42,8 @@ enum class FasterIfTickPrecise{
 enum class ControllerInterface{
     None,
     SerialPABotBase,
-    SysbotBaseNetwork,
-    SysbotBaseUSB,
+    TcpSysbotBase,
+    UsbSysbotBase,
 };
 extern const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS;
 

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

@@ -44,8 +44,8 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     m_dropdowns->addWidget(interface_dropdown);
 
     interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::SerialPABotBase)));
-    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::SysbotBaseNetwork)));
-//    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::SysbotBaseUSB)));
+    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::TcpSysbotBase)));
+//    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::UsbSysbotBase)));
 
     if (!IS_BETA_VERSION && !PreloadSettings::instance().DEVELOPER_MODE){
         interface_dropdown->setHidden(true);
@@ -149,8 +149,8 @@ void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_t
         m_dropdowns->insertWidget(1, m_selector);
         break;
 
-    case ControllerInterface::SysbotBaseNetwork:
-        m_selector = new SysbotBase::SysbotBaseNetwork_SelectorWidget(*this, nullptr);
+    case ControllerInterface::TcpSysbotBase:
+        m_selector = new SysbotBase::TcpSysbotBase_SelectorWidget(*this, nullptr);
         m_dropdowns->insertWidget(1, m_selector);
         break;
 
@@ -210,7 +210,8 @@ void ControllerSelectorWidget::post_status_text_changed(const std::string& text)
 void ControllerSelectorWidget::options_locked(bool locked){
     QMetaObject::invokeMethod(this, [this, locked]{
         m_selector->setEnabled(!locked);
-//        m_devices_dropdown->setEnabled(!locked);
+        interface_dropdown->setEnabled(!locked);
+        m_controllers_dropdown->setEnabled(!locked);
         m_reset_button->setEnabled(!locked);
     });
 }

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp

@@ -37,7 +37,7 @@ bool parse_ip_and_port(const std::string& str, QHostAddress& address, int& port)
 }
 
 
-SysbotBaseNetwork_Connection::SysbotBaseNetwork_Connection(
+TcpSysbotBase_Connection::TcpSysbotBase_Connection(
     Logger& logger,
     const std::string& url
 )
@@ -50,9 +50,9 @@ SysbotBaseNetwork_Connection::SysbotBaseNetwork_Connection(
 
     set_status(html_color_text("Connecting...", COLOR_DARKGREEN));
 
-    m_thread = std::thread(&SysbotBaseNetwork_Connection::thread_body_wrapper, this);
+    m_thread = std::thread(&TcpSysbotBase_Connection::thread_body_wrapper, this);
 }
-SysbotBaseNetwork_Connection::~SysbotBaseNetwork_Connection(){
+TcpSysbotBase_Connection::~TcpSysbotBase_Connection(){
     m_ready.store(false, std::memory_order_release);
     m_stopping.store(true, std::memory_order_release);
     {
@@ -68,7 +68,7 @@ SysbotBaseNetwork_Connection::~SysbotBaseNetwork_Connection(){
 }
 
 
-std::map<ControllerType, std::set<ControllerFeature>> SysbotBaseNetwork_Connection::supported_controllers() const{
+std::map<ControllerType, std::set<ControllerFeature>> TcpSysbotBase_Connection::supported_controllers() const{
     return {
         {ControllerType::NintendoSwitch_WiredProController, {
             ControllerFeature::NintendoSwitch_ProController
@@ -78,7 +78,7 @@ std::map<ControllerType, std::set<ControllerFeature>> SysbotBaseNetwork_Connecti
 
 
 
-void SysbotBaseNetwork_Connection::write_data(const std::string& data){
+void TcpSysbotBase_Connection::write_data(const std::string& data){
     std::lock_guard<std::mutex> lg(m_lock);
     if (m_socket == nullptr){
         return;
@@ -96,7 +96,7 @@ void SysbotBaseNetwork_Connection::write_data(const std::string& data){
 
 
 
-void SysbotBaseNetwork_Connection::thread_body_wrapper(){
+void TcpSysbotBase_Connection::thread_body_wrapper(){
     QTcpSocket socket;
     {
         std::lock_guard<std::mutex> lg(m_lock);
@@ -134,7 +134,7 @@ void SysbotBaseNetwork_Connection::thread_body_wrapper(){
     std::lock_guard<std::mutex> lg(m_lock);
     m_socket = nullptr;
 }
-void SysbotBaseNetwork_Connection::thread_body_internal(){
+void TcpSysbotBase_Connection::thread_body_internal(){
     std::string message =
         "Connecting To: " + m_address.toString().toStdString() +
         " - Port: " + std::to_string(m_port);

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h

@@ -19,13 +19,13 @@ namespace PokemonAutomation{
 namespace SysbotBase{
 
 
-class SysbotBaseNetwork_Connection : public ControllerConnection{
+class TcpSysbotBase_Connection : public ControllerConnection{
 public:
-    SysbotBaseNetwork_Connection(
+    TcpSysbotBase_Connection(
         Logger& logger,
         const std::string& url
     );
-    ~SysbotBaseNetwork_Connection();
+    ~TcpSysbotBase_Connection();
 
     virtual std::map<ControllerType, std::set<ControllerFeature>> supported_controllers() const override;
 

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp

@@ -16,42 +16,42 @@
 
 namespace PokemonAutomation{
 
-template class InterfaceType_t<SysbotBase::SysbotBaseNetwork_Descriptor>;
+template class InterfaceType_t<SysbotBase::TcpSysbotBase_Descriptor>;
 
 namespace SysbotBase{
 
 
 
-bool SysbotBaseNetwork_Descriptor::operator==(const ControllerDescriptor& x) const{
+bool TcpSysbotBase_Descriptor::operator==(const ControllerDescriptor& x) const{
     if (typeid(*this) != typeid(x)){
         return false;
     }
-    return m_url == static_cast<const SysbotBaseNetwork_Descriptor&>(x).m_url;
+    return m_url == static_cast<const TcpSysbotBase_Descriptor&>(x).m_url;
 }
 
-std::string SysbotBaseNetwork_Descriptor::display_name() const{
+std::string TcpSysbotBase_Descriptor::display_name() const{
     return m_url;
 }
 
-void SysbotBaseNetwork_Descriptor::load_json(const JsonValue& json){
+void TcpSysbotBase_Descriptor::load_json(const JsonValue& json){
     const std::string* url = json.to_string();
     if (url == nullptr || url->empty()){
         return;
     }
     m_url = *url;
 }
-JsonValue SysbotBaseNetwork_Descriptor::to_json() const{
+JsonValue TcpSysbotBase_Descriptor::to_json() const{
     return m_url;
 }
 
 
 
-std::unique_ptr<ControllerConnection> SysbotBaseNetwork_Descriptor::open_connection(Logger& logger) const{
+std::unique_ptr<ControllerConnection> TcpSysbotBase_Descriptor::open_connection(Logger& logger) const{
     return std::unique_ptr<ControllerConnection>(
-        new SysbotBaseNetwork_Connection(logger, m_url)
+        new TcpSysbotBase_Connection(logger, m_url)
     );
 }
-std::unique_ptr<AbstractController> SysbotBaseNetwork_Descriptor::make_controller(
+std::unique_ptr<AbstractController> TcpSysbotBase_Descriptor::make_controller(
     Logger& logger,
     ControllerConnection& connection,
     ControllerType controller_type,
@@ -60,16 +60,16 @@ std::unique_ptr<AbstractController> SysbotBaseNetwork_Descriptor::make_controlle
     return std::unique_ptr<AbstractController>(
         new NintendoSwitch::ProController_SysbotBase(
             logger,
-            static_cast<SysbotBaseNetwork_Connection&>(connection),
+            static_cast<TcpSysbotBase_Connection&>(connection),
             requirements
         )
     );
 }
 
 
 
-QWidget* SysbotBaseNetwork_Descriptor::make_selector_QtWidget(ControllerSelectorWidget& parent) const{
-    return new SysbotBaseNetwork_SelectorWidget(parent, this);
+QWidget* TcpSysbotBase_Descriptor::make_selector_QtWidget(ControllerSelectorWidget& parent) const{
+    return new TcpSysbotBase_SelectorWidget(parent, this);
 }
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h

@@ -14,16 +14,16 @@ namespace SysbotBase{
 
 
 
-class SysbotBaseNetwork_Descriptor : public ControllerDescriptor{
+class TcpSysbotBase_Descriptor : public ControllerDescriptor{
 public:
-    static constexpr ControllerInterface INTERFACE_NAME = ControllerInterface::SysbotBaseNetwork;
+    static constexpr ControllerInterface INTERFACE_NAME = ControllerInterface::TcpSysbotBase;
 
 
 public:
-    SysbotBaseNetwork_Descriptor()
+    TcpSysbotBase_Descriptor()
         : ControllerDescriptor(INTERFACE_NAME)
     {}
-    SysbotBaseNetwork_Descriptor(std::string url)
+    TcpSysbotBase_Descriptor(std::string url)
         : ControllerDescriptor(INTERFACE_NAME)
         , m_url(std::move(url))
     {}

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.cpp

@@ -23,7 +23,7 @@ namespace NintendoSwitch{
 
 ProController_SysbotBase::ProController_SysbotBase(
     Logger& logger,
-    SysbotBase::SysbotBaseNetwork_Connection& connection,
+    SysbotBase::TcpSysbotBase_Connection& connection,
     const ControllerRequirements& requirements
 )
     : ProControllerWithScheduler(logger, std::chrono::milliseconds(150))

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h

@@ -29,7 +29,7 @@ class ProController_SysbotBase : public ProControllerWithScheduler{
 public:
     ProController_SysbotBase(
         Logger& logger,
-        SysbotBase::SysbotBaseNetwork_Connection& connection,
+        SysbotBase::TcpSysbotBase_Connection& connection,
         const ControllerRequirements& requirements
     );
     ~ProController_SysbotBase();
@@ -69,7 +69,7 @@ class ProController_SysbotBase : public ProControllerWithScheduler{
 
 
 private:
-    SysbotBase::SysbotBaseNetwork_Connection& m_connection;
+    SysbotBase::TcpSysbotBase_Connection& m_connection;
 
     std::string m_error_string;
 

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h

@@ -21,15 +21,15 @@ namespace SysbotBase{
 
 
 
-class SysbotBaseNetwork_SelectorWidget : public QLineEdit{
+class TcpSysbotBase_SelectorWidget : public QLineEdit{
 public:
-    SysbotBaseNetwork_SelectorWidget(
+    TcpSysbotBase_SelectorWidget(
         ControllerSelectorWidget& parent,
         const ControllerDescriptor* current
     )
         : QLineEdit(&parent)
     {
-//        cout << "SysbotBaseNetwork()" << endl;
+//        cout << "TcpSysbotBase()" << endl;
 
         QSizePolicy policy;
         policy.setHorizontalStretch(3);
@@ -39,9 +39,9 @@ class SysbotBaseNetwork_SelectorWidget : public QLineEdit{
 
         if (current == nullptr){
             std::shared_ptr<const ControllerDescriptor> descriptor =
-                parent.session().option().get_descriptor_from_cache(ControllerInterface::SysbotBaseNetwork);
+                parent.session().option().get_descriptor_from_cache(ControllerInterface::TcpSysbotBase);
             if (!descriptor){
-                descriptor.reset(new SysbotBaseNetwork_Descriptor());
+                descriptor.reset(new TcpSysbotBase_Descriptor());
             }
             parent.session().set_device(descriptor);
         }
@@ -50,7 +50,7 @@ class SysbotBaseNetwork_SelectorWidget : public QLineEdit{
         connect(
             this, &QLineEdit::editingFinished,
             &parent, [this, &parent](){
-                std::shared_ptr<const ControllerDescriptor> selected(new SysbotBaseNetwork_Descriptor(
+                std::shared_ptr<const ControllerDescriptor> selected(new TcpSysbotBase_Descriptor(
                     this->text().toStdString()
                 ));