Fix keyboard race-condition. Clear more PLA programs for SBB.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -25,7 +25,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 51;
-const int PROGRAM_VERSION_PATCH = 9;
+const int PROGRAM_VERSION_PATCH = 10;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp

@@ -121,7 +121,7 @@ CollapsibleGroupBox* make_panel_header(
         case PokemonAutomation::FasterIfTickPrecise::MUCH_FASTER:
             text = html_color_text(
                 "(This program does not have any special controller requirements. "
-                "However, it is strongly recommended to use a tick-precise controller as the program will run much faster.)",
+                "However, it is strongly recommended to use a tick-precise controller as the program will run much faster and/or more reliably.)",
                 COLOR_DARKGREEN
             );
             break;

SerialPrograms/Source/Controllers/KeyboardInput/GlobalQtKeyMap.cpp

@@ -22,13 +22,13 @@ void QtKeyMap::record(const QKeyEvent& event){
     m_map[native_key].insert(qkey);
 }
 
-const std::set<Qt::Key>* QtKeyMap::get_QtKeys(uint32_t native_key) const{
+std::set<Qt::Key> QtKeyMap::get_QtKeys(uint32_t native_key) const{
     ReadSpinLock lg(m_lock);
     auto iter = m_map.find(native_key);
-    if (iter == m_map.end()){
-        return nullptr;
+    if (iter != m_map.end()){
+        return iter->second;
     }
-    return &iter->second;
+    return {};
 }
 
 

SerialPrograms/Source/Controllers/KeyboardInput/GlobalQtKeyMap.h

@@ -26,7 +26,7 @@ class QtKeyMap{
 
     void record(const QKeyEvent& event);
 
-    const std::set<Qt::Key>* get_QtKeys(uint32_t native_key) const;
+    std::set<Qt::Key> get_QtKeys(uint32_t native_key) const;
 
 
 private:

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp

@@ -53,11 +53,8 @@ class ProController::KeyboardManager : public KeyboardInputController{
         ControllerDeltas deltas;
         const QtKeyMap& qkey_map = QtKeyMap::instance();
         for (uint32_t native_key : pressed_keys){
-            const std::set<Qt::Key>* qkeys = qkey_map.get_QtKeys(native_key);
-            if (qkeys == nullptr){
-                continue;
-            }
-            for (Qt::Key qkey : *qkeys){
+            std::set<Qt::Key> qkeys = qkey_map.get_QtKeys(native_key);
+            for (Qt::Key qkey : qkeys){
                 auto iter = m_mapping.find(qkey);
                 if (iter != m_mapping.end()){
                     deltas += iter->second;

SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp

@@ -36,7 +36,8 @@ LeapGrinder_Descriptor::LeapGrinder_Descriptor()
         "Shake trees and ores to grind tasks",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 class LeapGrinder_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp

@@ -47,7 +47,8 @@ BurmyFinder_Descriptor::BurmyFinder_Descriptor()
         "Check nearby trees for a possible Shiny, Alpha or Alpha Shiny Burmy",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::FASTER
     )
 {}
 class BurmyFinder_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp

@@ -31,7 +31,8 @@ PostMMOSpawnReset_Descriptor::PostMMOSpawnReset_Descriptor()
         "Constantly reset the spawn after MMO finishes.",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 class PostMMOSpawnReset_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{

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

@@ -37,7 +37,8 @@ ShinyHuntCustomPath_Descriptor::ShinyHuntCustomPath_Descriptor()
         "Repeatedly travel on a custom path to shiny hunt " + STRING_POKEMON + " around it.",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController,},
+        FasterIfTickPrecise::FASTER
     )
 {}
 class ShinyHuntCustomPath_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{