Disable keyboard command logging for sbb2 and sbb3. Enable keyboard FCE parallelism.

Author: Mysticial

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp

@@ -134,7 +134,11 @@ class Keyboard::KeyboardManager final : public PokemonAutomation::KeyboardInputC
         if (m_controller == nullptr){
             return;
         }
-        m_controller->issue_keys(nullptr, 2000ms, 2000ms, 0ms, local_state.keys);
+        m_controller->issue_keys(
+            nullptr,
+            2000ms, 2000ms, 0ms,
+            std::vector<KeyboardKey>(local_state.keys.begin(), local_state.keys.end())
+        );
     }
 
 

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h

@@ -9,7 +9,7 @@
 #ifndef PokemonAutomation_StandardHid_Keyboard_H
 #define PokemonAutomation_StandardHid_Keyboard_H
 
-#include <set>
+#include <vector>
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "Controllers/Controller.h"
 #include "StandardHid_Keyboard_ControllerButtons.h"
@@ -59,7 +59,7 @@ class Keyboard : public AbstractController{
     virtual void issue_keys(
         const Cancellable* cancellable,
         Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
-        const std::set<KeyboardKey>& keys
+        const std::vector<KeyboardKey>& keys
     ) = 0;
 
 

SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp

@@ -23,7 +23,7 @@ void KeyboardControllerWithScheduler::issue_key(
             cancellable->throw_if_cancelled();
         }
         m_scheduler.issue_to_resource(
-            schedule, std::make_unique<KeyboardCommand>(key),
+            schedule, std::make_unique<KeyboardCommand>(key, m_seqnum++),
             delay, hold, cooldown
         );
     }
@@ -41,7 +41,7 @@ void KeyboardControllerWithScheduler::issue_key(
 void KeyboardControllerWithScheduler::issue_keys(
     const Cancellable* cancellable,
     Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
-    const std::set<KeyboardKey>& keys
+    const std::vector<KeyboardKey>& keys
 ){
     SuperscalarScheduler::Schedule schedule;
     std::lock_guard<std::mutex> lg0(m_issue_lock);
@@ -54,7 +54,7 @@ void KeyboardControllerWithScheduler::issue_keys(
         }
         for (KeyboardKey key : keys){
             m_scheduler.issue_to_resource(
-                schedule, std::make_unique<KeyboardCommand>(key),
+                schedule, std::make_unique<KeyboardCommand>(key, m_seqnum++),
                 WallDuration::zero(), hold, cooldown
             );
         }

SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h

@@ -26,12 +26,19 @@ struct KeyboardControllerState{
 
 class KeyboardCommand : public SchedulerResource{
 public:
-    KeyboardCommand(KeyboardKey key)
+    KeyboardCommand(KeyboardKey key, uint64_t seqnum)
         : SchedulerResource((size_t)key)
+        , m_seqnum(seqnum)
     {}
     KeyboardKey key() const{
         return (KeyboardKey)id;
     }
+    uint64_t seqnum() const{
+        return m_seqnum;
+    }
+
+private:
+    uint64_t m_seqnum;
 };
 
 
@@ -52,8 +59,11 @@ class KeyboardControllerWithScheduler : public PokemonAutomation::ControllerWith
     void issue_keys(
         const Cancellable* cancellable,
         Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
-        const std::set<KeyboardKey>& keys
+        const std::vector<KeyboardKey>& keys
     );
+
+private:
+    uint64_t m_seqnum = 0;
 };
 
 

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.cpp

@@ -109,38 +109,15 @@ void SerialPABotBase_Keyboard::execute_state(
     const Cancellable* cancellable,
     const SuperscalarScheduler::ScheduleEntry& entry
 ){
-    std::set<KeyboardKey> state;
+    std::map<KeyboardKey, uint64_t> state;
     for (const auto& item : entry.state){
-        KeyboardKey key = static_cast<const KeyboardCommand&>(*item).key();
+        const KeyboardCommand& key = static_cast<const KeyboardCommand&>(*item);
 //        cout << (int)key << endl;
-        state.insert(key);
+        state.emplace(key.key(), key.seqnum());
     }
 
 //    cout << "last = " << m_last_state.size() << ", now = " << state.size() << endl;
 
-    //  Last State: Remove keys that are no longer pressed.
-    //  Current State: Remove keys that were already pressed.
-    for (auto iterL = m_last_state.begin(); iterL != m_last_state.end();){
-        auto iterS = state.find(iterL->second);
-        if (iterS == state.end()){
-            iterL = m_last_state.erase(iterL);
-        }else{
-            state.erase(iterS);
-            ++iterL;
-        }
-    }
-
-    //  Add the new keys to the state.
-    for (KeyboardKey key : state){
-        m_last_state.emplace(current_time(), key);
-    }
-
-    //  Get a searchable set of all currently pressed keys.
-    state.clear();
-    for (const auto& item : m_last_state){
-        state.insert(item.second);
-    }
-
     //  Add the modifier keys.
     pabb_HID_Keyboard_State report = {};
     if (state.contains(KeyboardKey::KEY_LEFT_CTRL)){
@@ -176,18 +153,46 @@ void SerialPABotBase_Keyboard::execute_state(
         report.modifiers |= 1 << 7;
     }
 
+    //  Last State: Remove keys that are no longer pressed.
+    //  Current State: Remove keys that were already pressed.
+    for (auto iterL = m_last_state.begin(); iterL != m_last_state.end();){
+        auto iterS = state.find(iterL->second);
+        if (iterS == state.end()){
+            iterL = m_last_state.erase(iterL);
+        }else{
+            state.erase(iterS);
+            ++iterL;
+        }
+    }
+
+    //  Add the new keys to the state.
+    for (const auto& key : state){
+        m_last_state.emplace(key.second, key.first);
+    }
+
+    //  Get a searchable set of all currently pressed keys.
+    state.clear();
+    for (const auto& item : m_last_state){
+        state.emplace(item.second, item.first);
+    }
+
 //    cout << "modifiers = " << (int)report.modifiers << endl;
 
     //  Add the remaining keys.
-    auto iter = state.begin();
+    auto iter = m_last_state.begin();
     for (size_t c = 0; c < 6; c++){
-        if (iter == state.end()){
+        if (iter == m_last_state.end()){
             break;
         }
-        report.key[c] = *iter;
+        report.key[c] = iter->second;
         ++iter;
     }
 
+//    cout << m_last_state.size() << endl;
+    if (m_last_state.size() > 6){
+        m_logger.log("Unable to send more than 6 simultaneous keyboard presses due to HID limitation.", COLOR_RED);
+    }
+
     //  Divide the controller state into smaller chunks that fit into the report
     //  duration.
     Milliseconds time_left = std::chrono::duration_cast<Milliseconds>(entry.duration);

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h

@@ -90,7 +90,7 @@ class SerialPABotBase_Keyboard final :
     virtual void issue_keys(
         const Cancellable* cancellable,
         Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
-        const std::set<KeyboardKey>& keys
+        const std::vector<KeyboardKey>& keys
     ) override{
         KeyboardControllerWithScheduler::issue_keys(cancellable, delay, hold, cooldown, keys);
     }
@@ -131,7 +131,7 @@ class SerialPABotBase_Keyboard final :
     mutable SpinLock m_error_lock;
     std::string m_error_string;
 
-    std::multimap<WallClock, KeyboardKey> m_last_state;
+    std::map<uint64_t, KeyboardKey> m_last_state;
 
     std::unique_ptr<SerialPABotBase::ControllerStatusThread> m_status_thread;
 };

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

@@ -286,9 +286,13 @@ void ProController_SysbotBase3::execute_state(
 
     m_connection.write_data(message);
 
+    //  Do not log the contents of the command due to privacy concerns.
+    //  (people entering passwords)
+#if 0
     if (GlobalSettings::instance().LOG_EVERYTHING){
         m_logger.log("sys-botbase3: " + message);
     }
+#endif
 }
 
 

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

@@ -264,9 +264,13 @@ void ProController_SysbotBase::send_diff(
 //    cout << message << endl;
     m_connection.write_data(message);
 
+    //  Do not log the contents of the command due to privacy concerns.
+    //  (people entering passwords)
+#if 0
     if (GlobalSettings::instance().LOG_EVERYTHING){
         m_logger.log("sys-botbase: " + message);
     }
+#endif
 }
 
 

SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp

@@ -75,7 +75,7 @@ DigitEntryTimingsOption::DigitEntryTimingsOption(bool switch2)
         "48 ms"
     )
     , COOLDOWN(
-        "<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
+        "<b>Cooldown:</b><br>Do not reuse a button until this long after it is reused.<br>"
         "<font color=\"red\">Controller timing variation will be added to this number.</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
         "24 ms"
@@ -117,7 +117,7 @@ KeyboardEntryTimingsOption::KeyboardEntryTimingsOption(bool switch2)
         "48 ms"
     )
     , COOLDOWN(
-        "<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
+        "<b>Cooldown:</b><br>Do not reuse a button until this long after it is reused.<br>"
         "<font color=\"red\">Controller timing variation will be added to this number.</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
         "24 ms"
@@ -137,6 +137,11 @@ KeyboardControllerTimingsOption::KeyboardControllerTimingsOption()
         LockMode::UNLOCK_WHILE_RUNNING,
         GroupOption::EnableMode::ALWAYS_ENABLED, true
     )
+    , PARLLELIZE(
+        "<b>Parallel Entry:</b><br>Allow characters to be entered in parallel if possible.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        PreloadSettings::instance().DEVELOPER_MODE
+    )
     , TIME_UNIT(
         "<b>Time Unit:</b><br>Timesteps should increment in multiples of this unit.",
         LockMode::UNLOCK_WHILE_RUNNING,
@@ -145,14 +150,15 @@ KeyboardControllerTimingsOption::KeyboardControllerTimingsOption()
     , HOLD(
         "<b>Hold:</b><br>Duration to hold each key press down.",
         LockMode::UNLOCK_WHILE_RUNNING,
-        "48 ms"
+        "40 ms"
     )
     , COOLDOWN(
-        "<b>Hold:</b><br>Do not reuse a key until this long after it is reused.",
+        "<b>Cooldown:</b><br>Do not reuse a key until this long after it is reused.",
         LockMode::UNLOCK_WHILE_RUNNING,
         "24 ms"
     )
 {
+    PA_ADD_OPTION(PARLLELIZE);
     PA_ADD_OPTION(TIME_UNIT);
     PA_ADD_OPTION(HOLD);
     PA_ADD_OPTION(COOLDOWN);

SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h

@@ -60,6 +60,7 @@ class KeyboardControllerTimingsOption : public GroupOption{
     KeyboardControllerTimingsOption();
 
 public:
+    BooleanCheckBoxOption PARLLELIZE;
     MillisecondsOption TIME_UNIT;
     MillisecondsOption HOLD;
     MillisecondsOption COOLDOWN;