Simplify the capabilities.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -632,9 +632,8 @@ file(GLOB MAIN_SOURCES
     Source/Controllers/SuperscalarScheduler.h
     Source/Controllers/SerialPABotBase/SerialPABotBase.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase.h
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.h
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h
     Source/Integrations/DiscordIntegrationSettings.cpp
     Source/Integrations/DiscordIntegrationSettings.h
     Source/Integrations/DiscordIntegrationTable.cpp

SerialPrograms/SerialPrograms.pro

@@ -320,7 +320,7 @@ SOURCES += \
     Source/Controllers/KeyboardInput/KeyboardStateTracker.cpp \
     Source/Controllers/NullController.cpp \
     Source/Controllers/SerialPABotBase/SerialPABotBase.cpp \
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp \
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp \
     Source/Controllers/SuperscalarScheduler.cpp \
     Source/Integrations/DiscordIntegrationSettings.cpp \
     Source/Integrations/DiscordIntegrationTable.cpp \
@@ -1454,7 +1454,7 @@ HEADERS += \
     Source/Controllers/KeyboardInput/KeyboardStateTracker.h \
     Source/Controllers/NullController.h \
     Source/Controllers/SerialPABotBase/SerialPABotBase.h \
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.h \
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h \
     Source/Controllers/SuperscalarScheduler.h \
     Source/Integrations/DiscordIntegrationSettings.h \
     Source/Integrations/DiscordIntegrationTable.h \

SerialPrograms/Source/Controllers/ControllerCapability.cpp

@@ -11,6 +11,8 @@ namespace PokemonAutomation{
 
 const char* to_string(ControllerType type){
     switch (type){
+    case ControllerType::None:
+        return "None";
     case ControllerType::NintendoSwitch_WiredProController:
         return "NintendoSwitch_WiredProController";
     case ControllerType::NintendoSwitch_WirelessProController:
@@ -45,4 +47,24 @@ const char* to_string(ControllerFeature feature){
 
 
 
+
+ControllerRequirements::ControllerRequirements(std::initializer_list<ControllerFeature> args)
+    : m_features(std::move(args))
+    , m_sanitizer("ControllerRequirements")
+{}
+
+std::string ControllerRequirements::check_compatibility(const std::set<ControllerFeature>& features) const{
+    auto scope_check = m_sanitizer.check_scope();
+
+    for (ControllerFeature feature : m_features){
+        if (features.find(feature) == features.end()){
+            return to_string(feature);
+        }
+    }
+    return "";
+}
+
+
+
+
 }

SerialPrograms/Source/Controllers/ControllerCapability.h

@@ -18,9 +18,9 @@
 #ifndef PokemonAutomation_Controllers_ControllerCapabilities_H
 #define PokemonAutomation_Controllers_ControllerCapabilities_H
 
+#include <initializer_list>
 #include <string>
 #include <set>
-#include <map>
 #include "Common/Cpp/LifetimeSanitizer.h"
 
 //#include <iostream>
@@ -58,57 +58,17 @@ const char* to_string(ControllerFeature feature);
 
 
 
-//
-//  This class is a double map.
-//  The first level is keyed on a string representing the interface type. (serial, bluetooth, etc...)
-//  The second level is a set of features for that interface type.
-//
-//  Programs will specify which interfaces they support and which features are
-//  required for each interface.
-//
-//  The list of interfaces will filter which connections are shown in the UI
-//  dropdown. The feature set will be enforced after connecting since you won't
-//  know the feature set until after talking to the controller.
-//
 class ControllerRequirements{
 public:
-    ControllerRequirements(std::initializer_list<std::map<std::string, std::set<ControllerFeature>>::value_type> args)
-        : m_map(std::move(args))
-        , m_sanitizer("ControllerRequirements")
-    {}
-
-    const std::map<std::string, std::set<ControllerFeature>>& map() const{
-        auto scope_check = m_sanitizer.check_scope();
-        return m_map;
-    }
-
-    bool contains_device(const std::string& device) const{
-        auto scope_check = m_sanitizer.check_scope();
-        return m_map.find(device) != m_map.end();
-    }
+    ControllerRequirements(std::initializer_list<ControllerFeature> args);
 
     //  Check compatibility. If compatible, returns empty string.
     //  Otherwise returns one of the missing features.
-    std::string check_compatibility(const std::string& device, const std::set<ControllerFeature>& features) const{
-        auto scope_check = m_sanitizer.check_scope();
-
-        auto iter0 = m_map.find(device);
-        if (iter0 == m_map.end()){
-            return device;
-        }
-
-        const std::set<ControllerFeature>& required = iter0->second;
-        for (ControllerFeature feature : required){
-            if (features.find(feature) == features.end()){
-                return to_string(feature);
-            }
-        }
-        return "";
-    }
+    std::string check_compatibility(const std::set<ControllerFeature>& features) const;
 
 
 private:
-    std::map<std::string, std::set<ControllerFeature>> m_map;
+    std::set<ControllerFeature> m_features;
 
     LifetimeSanitizer m_sanitizer;
 };

SerialPrograms/Source/Controllers/ControllerDescriptor.cpp

@@ -41,6 +41,12 @@ std::vector<std::shared_ptr<const ControllerDescriptor>>
 get_compatible_descriptors(const ControllerRequirements& requirements){
     std::vector<std::shared_ptr<const ControllerDescriptor>> ret;
 
+    for (const auto& controller_interface : CONTROLLER_TYPES){
+        std::vector<std::shared_ptr<const ControllerDescriptor>> list = controller_interface.second->list();
+        std::move(list.begin(), list.end(), std::back_inserter(ret));
+    }
+
+#if 0
     //  Find all the devices in common between the supported list and the
     //  required list. For each of those, enumerate all the descriptors and
     //  combine them into a single list.
@@ -51,6 +57,7 @@ get_compatible_descriptors(const ControllerRequirements& requirements){
             std::move(list.begin(), list.end(), std::back_inserter(ret));
         }
     }
+#endif
 
     return ret;
 }

SerialPrograms/Source/Controllers/ControllerDescriptor.h

@@ -16,7 +16,6 @@
 namespace PokemonAutomation{
 
 class JsonValue;
-class ControllerRequirements;
 class AbstractControllerType;
 class ControllerDescriptor;
 class ControllerConnection;

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -16,12 +16,9 @@ const char NintendoSwitch_Basic[] = "NintendoSwitch-SerialPABotBase";
 
 
 //  Defaults
-const std::pair<std::string, std::set<ControllerFeature>> OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS{
-    NintendoSwitch_Basic,
-    {
-        ControllerFeature::TickPrecise,
-        ControllerFeature::NintendoSwitch_ProController,
-    }
+const ControllerRequirements OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS{
+    ControllerFeature::TickPrecise,
+    ControllerFeature::NintendoSwitch_ProController,
 };
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.h

@@ -23,7 +23,7 @@ extern const char NintendoSwitch_Basic[];
 
 
 //  Defaults
-extern const std::pair<std::string, std::set<ControllerFeature>> OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS;
+extern const ControllerRequirements OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS;
 
 
 

…rialPABotBase/SerialPABotBase_Handle.cpp …PABotBase/SerialPABotBase_Connection.cppSerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -22,21 +22,20 @@
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h"
 #include "SerialPABotBase.h"
-#include "SerialPABotBase_Handle.h"
+#include "SerialPABotBase_Connection.h"
 
 //#include <iostream>
 //using std::cout;
 //using std::endl;
 
 namespace PokemonAutomation{
+namespace SerialPABotBase{
 
-using namespace SerialPABotBase;
 
 
 
 
-
-BotBaseHandle::BotBaseHandle(Logger& logger, const QSerialPortInfo* port)
+SerialPABotBaseConnection::SerialPABotBaseConnection(Logger& logger, const QSerialPortInfo* port)
     : m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
     , m_port(port)
 {
@@ -82,9 +81,9 @@ BotBaseHandle::BotBaseHandle(Logger& logger, const QSerialPortInfo* port)
         return;
     }
 
-    m_status_thread = std::thread(run_with_catch, "BotBaseHandle::thread_body()", [this]{ thread_body(); });
+    m_status_thread = std::thread(run_with_catch, "SerialPABotBaseConnection::thread_body()", [this]{ thread_body(); });
 }
-BotBaseHandle::~BotBaseHandle(){
+SerialPABotBaseConnection::~SerialPABotBaseConnection(){
     m_ready.store(false, std::memory_order_release);
     signal_pre_not_ready();
     if (m_botbase == nullptr){
@@ -102,7 +101,7 @@ BotBaseHandle::~BotBaseHandle(){
 }
 
 
-void BotBaseHandle::update_with_capabilities(const std::set<ControllerFeature>& capabilities){
+void SerialPABotBaseConnection::update_with_capabilities(const std::set<ControllerFeature>& capabilities){
     Logger& logger = m_logger;
 
     do{
@@ -132,16 +131,16 @@ void BotBaseHandle::update_with_capabilities(const std::set<ControllerFeature>&
 
 
 
-BotBaseController* BotBaseHandle::botbase(){
+BotBaseController* SerialPABotBaseConnection::botbase(){
     BotBaseController* ret = m_botbase.get();
     if (ret == nullptr){
-        m_logger.log("BotBaseHandle::botbase() called with null botbase...", COLOR_RED);
+        m_logger.log("SerialPABotBaseConnection::botbase() called with null botbase...", COLOR_RED);
     }
     return ret;
 }
 
 
-void BotBaseHandle::set_label_text(const std::string& text, Color color){
+void SerialPABotBaseConnection::set_label_text(const std::string& text, Color color){
     m_label = html_color_text(text, color);
 
     std::string status = m_label;
@@ -153,7 +152,7 @@ void BotBaseHandle::set_label_text(const std::string& text, Color color){
     }
     set_status(status);
 }
-void BotBaseHandle::set_uptime_text(const std::string& text, Color color){
+void SerialPABotBaseConnection::set_uptime_text(const std::string& text, Color color){
     m_uptime = html_color_text(text, color);
 
     std::string status = m_label;
@@ -170,13 +169,13 @@ void BotBaseHandle::set_uptime_text(const std::string& text, Color color){
 
 
 
-std::map<ControllerType, std::set<ControllerFeature>> BotBaseHandle::supported_controllers() const{
+std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBaseConnection::supported_controllers() const{
     std::lock_guard<std::mutex> lg(m_lock);
     return m_controllers;
 }
 
 
-std::map<ControllerType, std::set<ControllerFeature>> BotBaseHandle::read_device_specs(){
+std::map<ControllerType, std::set<ControllerFeature>> SerialPABotBaseConnection::read_device_specs(){
     Logger& logger = m_logger;
 
 
@@ -225,7 +224,7 @@ std::map<ControllerType, std::set<ControllerFeature>> BotBaseHandle::read_device
 
 
 
-void BotBaseHandle::thread_body(){
+void SerialPABotBaseConnection::thread_body(){
     using namespace PokemonAutomation;
 
     m_botbase->set_sniffer(&m_logger);
@@ -358,4 +357,5 @@ void BotBaseHandle::thread_body(){
 
 
 
+}
 }

…SerialPABotBase/SerialPABotBase_Handle.h …alPABotBase/SerialPABotBase_Connection.hSerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.h renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.h renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h

@@ -21,14 +21,14 @@
 class QSerialPortInfo;
 
 namespace PokemonAutomation{
+    class PABotBase;
+namespace SerialPABotBase{
 
-class PABotBase;
 
-
-class BotBaseHandle : public ControllerConnection{
+class SerialPABotBaseConnection : public ControllerConnection{
 public:
-    BotBaseHandle(Logger& logger, const QSerialPortInfo* port);
-    ~BotBaseHandle();
+    SerialPABotBaseConnection(Logger& logger, const QSerialPortInfo* port);
+    ~SerialPABotBaseConnection();
 
     void update_with_capabilities(const std::set<ControllerFeature>& capabilities);
 
@@ -69,5 +69,6 @@ class BotBaseHandle : public ControllerConnection{
 
 
 
+}
 }
 #endif