More ESP32 work.

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -78,6 +78,7 @@ const std::map<
         {PABB_PID_PABOTBASE_ESP32, {
             {ControllerType::NintendoSwitch_WirelessProController, {
                 ControllerFeature::QueryCommandQueueSize,
+                ControllerFeature::NintendoSwitch_ProController,
             }},
             {ControllerType::NintendoSwitch_LeftJoycon, {
                 ControllerFeature::QueryCommandQueueSize,

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp

@@ -67,9 +67,11 @@ std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
 ) const{
     switch (controller_type){
     case ControllerType::NintendoSwitch_WiredProController:
+    case ControllerType::NintendoSwitch_WirelessProController:
         return std::unique_ptr<AbstractController>(
             new NintendoSwitch::ProController_SerialPABotBase(
                 logger,
+                controller_type,
                 static_cast<SerialPABotBase_Connection&>(connection),
                 requirements
             )

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController_SerialPABotBase.cpp

@@ -33,6 +33,7 @@ PA_FORCE_INLINE Type milliseconds_to_ticks_8ms(Type milliseconds){
 
 ProController_SerialPABotBase::ProController_SerialPABotBase(
     Logger& logger,
+    ControllerType controller_type,
     SerialPABotBase::SerialPABotBase_Connection& connection,
     const ControllerRequirements& requirements
 )
@@ -47,12 +48,12 @@ ProController_SerialPABotBase::ProController_SerialPABotBase(
     //  Check compatibility.
 
     const std::map<ControllerType, std::set<ControllerFeature>>& controllers = connection.supported_controllers();
-    auto iter = controllers.find(ControllerType::NintendoSwitch_WiredProController);
+    auto iter = controllers.find(controller_type);
 
     std::string missing_feature;
     do{
         if (iter == controllers.end()){
-            missing_feature = "NintendoSwitch_WiredProController";
+            missing_feature = CONTROLLER_TYPE_STRINGS.get_string(controller_type);
             break;
         }
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController_SerialPABotBase.h

@@ -23,6 +23,7 @@ class ProController_SerialPABotBase final : public ProControllerWithScheduler{
 public:
     ProController_SerialPABotBase(
         Logger& logger,
+        ControllerType controller_type,
         SerialPABotBase::SerialPABotBase_Connection& connection,
         const ControllerRequirements& requirements
     );

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp

@@ -22,7 +22,7 @@ SnapshotDumper_Descriptor::SnapshotDumper_Descriptor()
         "Periodically take screenshots.",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 

SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp

@@ -63,7 +63,7 @@ BoxSorting_Descriptor::BoxSorting_Descriptor()
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
         {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
-        )
+    )
 {}
 struct BoxSorting_Descriptor::Stats : public StatsTracker{
     Stats()

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp

@@ -36,7 +36,7 @@ ShinyHuntLakeTrio_Descriptor::ShinyHuntLakeTrio_Descriptor()
         "Shiny hunt the lake trio legendaries.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 std::unique_ptr<StatsTracker> ShinyHuntLakeTrio_Descriptor::make_stats() const{

SerialPrograms/Source/Tests/PokemonLA_Tests.cpp

@@ -493,7 +493,12 @@ int test_pokemonLA_shinySoundDetector(const std::vector<AudioSpectrum>& spectrum
     auto& logger = global_logger_command_line();
     DummyBotBase botbase(logger);
     SerialPABotBase::SerialPABotBase_Connection connection(logger, nullptr);
-    ProController_SerialPABotBase controller(logger, connection, {});
+    ProController_SerialPABotBase controller(
+        logger,
+        ControllerType::NintendoSwitch_WiredProController,
+        connection,
+        {}
+    );
     DummyVideoFeed video_feed;
     DummyVideoOverlay video_overlay;
     DummyAudioFeed audio_feed;