Migrate procon and joycon to new controller input API.

Author: Mysticial

SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.cpp

@@ -13,75 +13,6 @@ namespace PokemonAutomation{
 
 
 
-struct KeyBindingCell::Data{
-    const uint32_t m_default;
-
-    mutable SpinLock m_lock;
-    uint32_t m_current;
-    std::string m_current_text;
-
-    Data(uint32_t default_value)
-        : m_default(default_value)
-        , m_current(default_value)
-    {}
-};
-
-
-
-KeyBindingCell::~KeyBindingCell(){
-
-}
-KeyBindingCell::KeyBindingCell(LockMode lock_while_program_is_running)
-    : ConfigOption(lock_while_program_is_running)
-    , m_data(CONSTRUCT_TOKEN, 0)
-{}
-
-
-KeyBindingCell::operator uint32_t() const{
-    ReadSpinLock lg(m_data->m_lock);
-    return m_data->m_current;
-}
-KeyBindingCell::operator std::string() const{
-    ReadSpinLock lg(m_data->m_lock);
-    return m_data->m_current_text;
-}
-void KeyBindingCell::set(uint32_t key){
-    {
-        ReadSpinLock lg(m_data->m_lock);
-        m_data->m_current = key;
-    }
-    report_value_changed(this);
-}
-void KeyBindingCell::set(std::string text){
-    ReadSpinLock lg(m_data->m_lock);
-    m_data->m_current_text = std::move(text);
-}
-
-
-
-void KeyBindingCell::load_json(const JsonValue& json){
-    set((uint32_t)json.to_integer_default(0));
-}
-JsonValue KeyBindingCell::to_json() const{
-    ReadSpinLock lg(m_data->m_lock);
-    return m_data->m_current;
-}
-
-void KeyBindingCell::restore_defaults(){
-    set(m_data->m_default);
-}
-
-
-
-
-
-
-
-
-
-
-
-
 struct KeyboardHidBindingCell::Data{
     const KeyboardKey m_default;
 

SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.h

@@ -15,35 +15,6 @@ namespace PokemonAutomation{
 
 
 
-class KeyBindingCell : public ConfigOption{
-public:
-    ~KeyBindingCell();
-    KeyBindingCell(LockMode lock_while_program_is_running);
-
-    operator uint32_t() const;
-    operator std::string() const;
-    void set(uint32_t key);
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-
-public:
-    //  UI Functions
-    void set(std::string text);
-
-
-private:
-    struct Data;
-    Pimpl<Data> m_data;
-};
-
-
-
 
 class KeyboardHidBindingCell : public ConfigOption{
 public:

SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <QKeyEvent>
+#include "CommonFramework/Logging/Logger.h"
 #include "ControllerInput/Keyboard/GlobalQtKeyMap.h"
 #include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h"
 #include "KeyBindingWidget.h"
@@ -17,49 +18,6 @@ namespace PokemonAutomation{
 
 
 
-ConfigWidget* KeyBindingCell::make_QtWidget(QWidget& parent){
-    return new KeyBindingCellWidget(parent, *this);
-}
-
-
-
-KeyBindingCellWidget::~KeyBindingCellWidget(){
-    m_value.remove_listener(*this);
-}
-KeyBindingCellWidget::KeyBindingCellWidget(QWidget& parent, KeyBindingCell& value)
-    : QLineEdit(&parent)
-    , ConfigWidget(value, *this)
-    , m_value(value)
-{
-    KeyBindingCellWidget::update_value();
-    m_value.add_listener(*this);
-}
-
-
-void KeyBindingCellWidget::keyPressEvent(QKeyEvent* event){
-    m_value.set(event->key());
-}
-
-
-void KeyBindingCellWidget::update_value(){
-    QKeySequence seq((Qt::Key)(uint32_t)m_value);
-//    cout << (uint32_t)m_value << endl;
-    this->setText(seq.toString());
-}
-void KeyBindingCellWidget::on_config_value_changed(void* object){
-    QMetaObject::invokeMethod(this, [this]{
-        update_value();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-
-
-
-
 ConfigWidget* KeyboardHidBindingCell::make_QtWidget(QWidget& parent){
     return new KeyboardHidBindingCellWidget(parent, *this);
 }
@@ -89,6 +47,7 @@ void KeyboardHidBindingCellWidget::keyPressEvent(QKeyEvent* event){
     ));
 
     if (iter == MAP.end()){
+        global_logger_tagged().log("Unable to map Qt::Key to HID ID: " + std::to_string(event->key()));
         return;
     }
 
@@ -100,9 +59,9 @@ void KeyboardHidBindingCellWidget::update_value(){
     const std::map<KeyboardKey, std::string>& MAP = KEYBOARDKEY_TO_STRING();
     auto iter = MAP.find(m_value);
     if (iter != MAP.end()){
-        this->setText(QString::fromStdString("HID: " + std::to_string((int)m_value) + " - " + iter->second));
+        this->setText(QString::fromStdString(std::to_string((int)m_value) + ": " + iter->second));
     }else{
-        this->setText(QString::fromStdString("HID: " + std::to_string((int)m_value)));
+        this->setText(QString::fromStdString(std::to_string((int)m_value)));
     }
 }
 void KeyboardHidBindingCellWidget::on_config_value_changed(void* object){

SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.h

@@ -15,24 +15,6 @@ namespace PokemonAutomation{
 
 
 
-class KeyBindingCellWidget : public QLineEdit, public ConfigWidget{
-public:
-    ~KeyBindingCellWidget();
-    KeyBindingCellWidget(QWidget& parent, KeyBindingCell& value);
-
-    virtual void update_value() override;
-    virtual void on_config_value_changed(void* object) override;
-
-    virtual void keyPressEvent(QKeyEvent* event) override;
-
-private:
-    KeyBindingCell& m_value;
-};
-
-
-
-
-
 class KeyboardHidBindingCellWidget : public QLineEdit, public ConfigWidget{
 public:
     ~KeyboardHidBindingCellWidget();

SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp

@@ -50,6 +50,7 @@ const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_AZERTY(){
         {Qt::Key::Key_Ccedilla,         KeyboardKey::KEY_9},    // c key -> HID 9 position
         {Qt::Key::Key_Agrave,           KeyboardKey::KEY_0},    // a key -> HID 0 position
 
+        {Qt::Key::Key_Return,           KeyboardKey::KEY_ENTER},
         {Qt::Key::Key_Enter,            KeyboardKey::KEY_ENTER},
         {Qt::Key::Key_Escape,           KeyboardKey::KEY_ESC},
         {Qt::Key::Key_Backspace,        KeyboardKey::KEY_BACKSPACE},

SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp

@@ -50,6 +50,7 @@ const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_QWERTY(){
         {Qt::Key::Key_9,                KeyboardKey::KEY_9},
         {Qt::Key::Key_0,                KeyboardKey::KEY_0},
 
+        {Qt::Key::Key_Return,           KeyboardKey::KEY_ENTER},
         {Qt::Key::Key_Enter,            KeyboardKey::KEY_ENTER},
         {Qt::Key::Key_Escape,           KeyboardKey::KEY_ESC},
         {Qt::Key::Key_Backspace,        KeyboardKey::KEY_BACKSPACE},

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.h

@@ -28,7 +28,6 @@ class KeyboardEventHandler{
     void add_listener(KeyboardListener& listener);
     void remove_listener(KeyboardListener& listener);
 
-protected:
     //  Report that the keyboard state has changed. This will be pushed to
     //  all listeners.
     void report_keyboard_command_sent(WallClock time_stamp, const ControllerState& state);
@@ -43,4 +42,4 @@ class KeyboardEventHandler{
 };
 
 }
-#endif
+#endif

SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp

@@ -7,6 +7,8 @@
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "CommonTools/Async/InterruptableCommands.tpp"
 #include "CommonTools/Async/SuperControlSession.tpp"
+#include "ControllerInput/ControllerInput.h"
+#include "ControllerInput/Keyboard/KeyboardInput_State.h"
 #include "Controllers/ControllerTypes.h"
 #include "Controllers/KeyboardInput/KeyboardInput.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
@@ -35,92 +37,73 @@ const char RightJoycon::NAME[] = "Nintendo Switch: Right Joycon";
 
 
 
-class JoyconController::KeyboardManager final :
-    public PokemonAutomation::KeyboardManager<JoyconState, JoyconDeltas>
-{
-public:
-    KeyboardManager(Logger& logger, JoyconController& controller, ControllerClass controller_class)
-        : PokemonAutomation::KeyboardManager<JoyconState, JoyconDeltas>(logger, controller)
-    {
-        std::vector<std::shared_ptr<EditableTableRow>> mapping;
-        switch (controller_class){
-        case ControllerClass::NintendoSwitch_LeftJoycon:
-            mapping = ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON0.current_refs();
-            break;
-        case ControllerClass::NintendoSwitch_RightJoycon:
-            mapping = ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON0.current_refs();
-            break;
-        default:;
-        }
-        for (const auto& deltas : mapping){
-            const JoyconKeyMapTableRow& row = static_cast<const JoyconKeyMapTableRow&>(*deltas);
-            m_mapping[(Qt::Key)(uint32_t)row.key] += row.snapshot();
-        }
-        start();
-    }
-    ~KeyboardManager(){
-        stop();
-    }
-    virtual void send_state(const ControllerState& state) override{
-        
-        const JoyconState& switch_state = static_cast<const JoyconState&>(state);
-#if 0
-        m_controller->logger().log(
-            "VirtualController: (" + button_to_string(switch_state.buttons) +
-            "), LJ(" + std::to_string(switch_state.joystick_x) + "," + std::to_string(switch_state.joystick_y) +
-            ")",
-            COLOR_DARKGREEN
-        );
-#endif
-        WriteSpinLock lg(m_lock);
-        if (m_controller == nullptr){
-            return;
-        }
-        Milliseconds ticksize = m_controller->ticksize();
-        WallClock time_stamp = current_time();
-        static_cast<JoyconController*>(m_controller)->issue_full_controller_state(
-            nullptr,
-            false,
-            ticksize == Milliseconds::zero() ? 2000ms : ticksize * 255,
-            switch_state.buttons,
-            switch_state.joystick_x,
-            switch_state.joystick_y
-        );
-        report_keyboard_command_sent(time_stamp, switch_state);
-    }
+struct JoyconController::Data{
+    std::map<KeyboardKey, JoyconDeltas> m_keyboard_mapping;
+    KeyboardEventHandler m_input_sniffer;
 };
 
 
 
+
 JoyconController::JoyconController(Logger& logger, ControllerClass controller_class)
-    : m_keyboard_manager(CONSTRUCT_TOKEN, logger, *this, controller_class)
+    : m_data(CONSTRUCT_TOKEN)
 {
-
+    std::vector<std::shared_ptr<EditableTableRow>> mapping =
+        controller_class == ControllerClass::NintendoSwitch_LeftJoycon
+            ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON.current_refs()
+            : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON.current_refs();
+
+    for (const auto& deltas : mapping){
+        const JoyconFromKeyboardTableRow& row = static_cast<const JoyconFromKeyboardTableRow&>(*deltas);
+        m_data->m_keyboard_mapping[row.key] += row.snapshot();
+    }
 }
 JoyconController::~JoyconController(){
-
-}
-void JoyconController::stop() noexcept{
-    m_keyboard_manager->stop();
 }
 
+void JoyconController::controller_input_state(const ControllerInputState& state){
 
-void JoyconController::keyboard_release_all(){
-    m_keyboard_manager->clear_state();
-}
-void JoyconController::keyboard_press(const QKeyEvent& event){
-    m_keyboard_manager->on_key_press(event);
-}
-void JoyconController::keyboard_release(const QKeyEvent& event){
-    m_keyboard_manager->on_key_release(event);
+    if (state.type() != ControllerInputType::HID_Keyboard){
+        return;
+    }
+
+    JoyconDeltas deltas;
+
+    const KeyboardInputState& lstate = static_cast<const KeyboardInputState&>(state);
+    const std::map<KeyboardKey, JoyconDeltas>& map = m_data->m_keyboard_mapping;
+
+//    cout << "keys() = " << lstate.keys().size() << endl;
+
+    for (KeyboardKey key : lstate.keys()){
+        auto iter = map.find(key);
+        if (iter != map.end()){
+            deltas += iter->second;
+        }
+    }
+
+    replace_on_next_command();
+
+    WallClock timestamp = current_time();
+
+    JoyconState controller_state;
+    deltas.to_state(controller_state);
+    issue_full_controller_state(
+        nullptr,
+        false,
+        2000ms,
+        controller_state.buttons,
+        controller_state.joystick_x,
+        controller_state.joystick_y
+    );
+
+    m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
 }
 
 void JoyconController::add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_keyboard_manager->add_listener(keyboard_listener);
+    m_data->m_input_sniffer.add_listener(keyboard_listener);
 }
-
 void JoyconController::remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_keyboard_manager->remove_listener(keyboard_listener);
+    m_data->m_input_sniffer.remove_listener(keyboard_listener);
 }