rename ControllerCategory to ControllerClass. adjust when timestamp is taken. refactor JsonObject operator!=. refactor button_to_code_string() and button_to_string().

jw098 · jw098 · commit ef97a19a9221 · 2025-09-20T15:27:15.000-07:00
diff --git a/Common/Cpp/Json/JsonObject.h b/Common/Cpp/Json/JsonObject.h
@@ -23,7 +23,7 @@ class JsonObject{
         return dump() == x.dump();
     }
     bool operator!=(const JsonObject& x){
-        return dump() != x.dump();
+        return !(*this == *this);
     }
 private:
     //  Private to avoid accidental copying.
diff --git a/SerialPrograms/Source/Controllers/Controller.h b/SerialPrograms/Source/Controllers/Controller.h
@@ -20,7 +20,7 @@ namespace PokemonAutomation{
 class RecursiveThrottler;
 enum class ControllerType;
 enum class ControllerPerformanceClass;
-enum class ControllerCategory;
+enum class ControllerClass;
 
 
 
@@ -66,7 +66,7 @@ class AbstractController{
 
     virtual const char* name() = 0;
     virtual ControllerType controller_type() const = 0;
-    virtual ControllerCategory controller_category() const = 0;
+    virtual ControllerClass controller_class() const = 0;
     virtual ControllerPerformanceClass performance_class() const = 0;
 
     //  If the controller is polled at a fixed interval, this is that interval.
diff --git a/SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp b/SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp
@@ -32,12 +32,12 @@ const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS{
     {ControllerType::NintendoSwitch2_RightJoycon,           "NS2: Right Joycon"},
 };
 
-const EnumStringMap<ControllerCategory>& CONTROLLER_CATEGORY_STRINGS(){
-    static EnumStringMap<ControllerCategory> database{
-        {ControllerCategory::NONE,                                  "none"},
-        {ControllerCategory::LEFT_JOYCON,                           "left-joycon"},
-        {ControllerCategory::RIGHT_JOYCON,                          "right-joycon"},
-        {ControllerCategory::PRO_CONTROLLER,                        "pro-controller"},
+const EnumStringMap<ControllerClass>& CONTROLLER_CLASS_STRINGS(){
+    static EnumStringMap<ControllerClass> database{
+        {ControllerClass::NONE,                                  "none"},
+        {ControllerClass::LEFT_JOYCON,                           "left-joycon"},
+        {ControllerClass::RIGHT_JOYCON,                          "right-joycon"},
+        {ControllerClass::PRO_CONTROLLER,                        "pro-controller"},
     };
     return database;
 }
diff --git a/SerialPrograms/Source/Controllers/ControllerTypeStrings.h b/SerialPrograms/Source/Controllers/ControllerTypeStrings.h
@@ -16,7 +16,7 @@ namespace PokemonAutomation{
 
 extern const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS;
 extern const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS;
-const EnumStringMap<ControllerCategory>& CONTROLLER_CATEGORY_STRINGS();
+const EnumStringMap<ControllerClass>& CONTROLLER_CLASS_STRINGS();
 
 
 
diff --git a/SerialPrograms/Source/Controllers/ControllerTypes.h b/SerialPrograms/Source/Controllers/ControllerTypes.h
@@ -44,7 +44,7 @@ enum class ControllerPerformanceClass{
     SysbotBase,
 };
 
-enum class ControllerCategory{
+enum class ControllerClass{
     NONE,
     LEFT_JOYCON,
     RIGHT_JOYCON,
diff --git a/SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.h b/SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.h
@@ -21,7 +21,7 @@ class KeyboardEventHandler{
     KeyboardEventHandler();
     virtual ~KeyboardEventHandler();
 
-     struct KeyboardListener{
+    struct KeyboardListener{
         virtual void on_keyboard_command_sent(WallClock time_stamp, const ControllerState& state) = 0;
         virtual void on_keyboard_command_stopped(WallClock time_stamp) = 0;
     };
diff --git a/SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h b/SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h
@@ -126,11 +126,11 @@ class KeyboardManager : public KeyboardInputController, public KeyboardEventHand
         deltas.to_state(static_cast<StateType&>(state));
     }
     virtual void cancel_all_commands() override{
-        WallClock time_stamp = current_time();
         WriteSpinLock lg(m_lock);
         if (m_controller == nullptr){
             return;
         }
+        WallClock time_stamp = current_time();
         m_controller->cancel_all_commands();
         report_keyboard_command_stopped(time_stamp);
     }
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h
@@ -53,8 +53,8 @@ class SerialPABotBase_Keyboard final :
     virtual ControllerType controller_type() const override{
         return ControllerType::HID_Keyboard;
     }
-    virtual ControllerCategory controller_category() const override{
-        return ControllerCategory::KEYBOARD;
+    virtual ControllerClass controller_class() const override{
+        return ControllerClass::KEYBOARD;
     }
     virtual ControllerPerformanceClass performance_class() const override{
         return ControllerPerformanceClass::SerialPABotBase_Wired;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp
@@ -72,31 +72,12 @@ const EnumStringMap<Button> BUTTON_CODE_STRINGS{
 
 std::string button_to_string(Button button){
     std::string str;
-    if (button & BUTTON_Y)          str += BUTTON_STRINGS.get_string(BUTTON_Y) + " ";
-    if (button & BUTTON_B)          str += BUTTON_STRINGS.get_string(BUTTON_B) + " ";
-    if (button & BUTTON_A)          str += BUTTON_STRINGS.get_string(BUTTON_A) + " ";
-    if (button & BUTTON_X)          str += BUTTON_STRINGS.get_string(BUTTON_X) + " ";
-    if (button & BUTTON_L)          str += BUTTON_STRINGS.get_string(BUTTON_L) + " ";
-    if (button & BUTTON_R)          str += BUTTON_STRINGS.get_string(BUTTON_R) + " ";
-    if (button & BUTTON_ZL)         str += BUTTON_STRINGS.get_string(BUTTON_ZL) + " ";
-    if (button & BUTTON_ZR)         str += BUTTON_STRINGS.get_string(BUTTON_ZR) + " ";
-    if (button & BUTTON_MINUS)      str += BUTTON_STRINGS.get_string(BUTTON_MINUS) + " ";
-    if (button & BUTTON_PLUS)       str += BUTTON_STRINGS.get_string(BUTTON_PLUS) + " ";
-    if (button & BUTTON_LCLICK)     str += BUTTON_STRINGS.get_string(BUTTON_LCLICK) + " ";
-    if (button & BUTTON_RCLICK)     str += BUTTON_STRINGS.get_string(BUTTON_RCLICK) + " ";
-    if (button & BUTTON_HOME)       str += BUTTON_STRINGS.get_string(BUTTON_HOME) + " ";
-    if (button & BUTTON_CAPTURE)    str += BUTTON_STRINGS.get_string(BUTTON_CAPTURE) + " ";
-    if (button & BUTTON_GR)         str += BUTTON_STRINGS.get_string(BUTTON_GR) + " ";
-    if (button & BUTTON_GL)         str += BUTTON_STRINGS.get_string(BUTTON_GL) + " ";
-    if (button & BUTTON_UP)         str += BUTTON_STRINGS.get_string(BUTTON_UP) + " ";
-    if (button & BUTTON_RIGHT)      str += BUTTON_STRINGS.get_string(BUTTON_RIGHT) + " ";
-    if (button & BUTTON_DOWN)       str += BUTTON_STRINGS.get_string(BUTTON_DOWN) + " ";
-    if (button & BUTTON_LEFT)       str += BUTTON_STRINGS.get_string(BUTTON_LEFT) + " ";
-    if (button & BUTTON_LEFT_SL)    str += BUTTON_STRINGS.get_string(BUTTON_LEFT_SL) + " ";
-    if (button & BUTTON_LEFT_SR)    str += BUTTON_STRINGS.get_string(BUTTON_LEFT_SR) + " ";
-    if (button & BUTTON_RIGHT_SL)   str += BUTTON_STRINGS.get_string(BUTTON_RIGHT_SL) + " ";
-    if (button & BUTTON_RIGHT_SR)   str += BUTTON_STRINGS.get_string(BUTTON_RIGHT_SR) + " ";
-    if (button & BUTTON_C)          str += BUTTON_STRINGS.get_string(BUTTON_C) + " ";
+    for (auto iter = BUTTON_STRINGS.begin(); iter != BUTTON_STRINGS.end(); ++iter){
+        if (iter->first & button){
+            str += iter->second + " ";
+        }
+    }
+
     if (str.empty()){
         str = BUTTON_STRINGS.get_string(BUTTON_NONE);
     }
@@ -119,36 +100,18 @@ Button string_to_button(std::string multi_button_string){
 
 std::string button_to_code_string(Button button){
     std::string str;
-    if (button & BUTTON_Y)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_Y) + " | ";
-    if (button & BUTTON_B)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_B) + " | ";
-    if (button & BUTTON_A)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_A) + " | ";
-    if (button & BUTTON_X)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_X) + " | ";
-    if (button & BUTTON_L)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_L) + " | ";
-    if (button & BUTTON_R)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_R) + " | ";
-    if (button & BUTTON_ZL)         str += BUTTON_CODE_STRINGS.get_string(BUTTON_ZL) + " | ";
-    if (button & BUTTON_ZR)         str += BUTTON_CODE_STRINGS.get_string(BUTTON_ZR) + " | ";
-    if (button & BUTTON_MINUS)      str += BUTTON_CODE_STRINGS.get_string(BUTTON_MINUS) + " | ";
-    if (button & BUTTON_PLUS)       str += BUTTON_CODE_STRINGS.get_string(BUTTON_PLUS) + " | ";
-    if (button & BUTTON_LCLICK)     str += BUTTON_CODE_STRINGS.get_string(BUTTON_LCLICK) + " | ";
-    if (button & BUTTON_RCLICK)     str += BUTTON_CODE_STRINGS.get_string(BUTTON_RCLICK) + " | ";
-    if (button & BUTTON_HOME)       str += BUTTON_CODE_STRINGS.get_string(BUTTON_HOME) + " | ";
-    if (button & BUTTON_CAPTURE)    str += BUTTON_CODE_STRINGS.get_string(BUTTON_CAPTURE) + " | ";
-    if (button & BUTTON_GR)         str += BUTTON_CODE_STRINGS.get_string(BUTTON_GR) + " | ";
-    if (button & BUTTON_GL)         str += BUTTON_CODE_STRINGS.get_string(BUTTON_GL) + " | ";
-    if (button & BUTTON_UP)         str += BUTTON_CODE_STRINGS.get_string(BUTTON_UP) + " | ";
-    if (button & BUTTON_RIGHT)      str += BUTTON_CODE_STRINGS.get_string(BUTTON_RIGHT) + " | ";
-    if (button & BUTTON_DOWN)       str += BUTTON_CODE_STRINGS.get_string(BUTTON_DOWN) + " | ";
-    if (button & BUTTON_LEFT)       str += BUTTON_CODE_STRINGS.get_string(BUTTON_LEFT) + " | ";
-    if (button & BUTTON_LEFT_SL)    str += BUTTON_CODE_STRINGS.get_string(BUTTON_LEFT_SL) + " | ";
-    if (button & BUTTON_LEFT_SR)    str += BUTTON_CODE_STRINGS.get_string(BUTTON_LEFT_SR) + " | ";
-    if (button & BUTTON_RIGHT_SL)   str += BUTTON_CODE_STRINGS.get_string(BUTTON_RIGHT_SL) + " | ";
-    if (button & BUTTON_RIGHT_SR)   str += BUTTON_CODE_STRINGS.get_string(BUTTON_RIGHT_SR) + " | ";
-    if (button & BUTTON_C)          str += BUTTON_CODE_STRINGS.get_string(BUTTON_C) + " | ";
+    std::string logical_or = " | ";
+    for (auto iter = BUTTON_CODE_STRINGS.begin(); iter != BUTTON_CODE_STRINGS.end(); ++iter){
+        if (iter->first & button){
+            str += iter->second + logical_or;
+        }
+    }
+    
     if (str.empty()){
         str = BUTTON_CODE_STRINGS.get_string(BUTTON_NONE);
     }
-    if (str.substr(str.size() - 3) == " | "){
-        str = str.substr(0, str.size() - 3);
+    if (str.substr(str.size() - logical_or.size()) == logical_or){ // remove trailing " | "
+        str = str.substr(0, str.size() - logical_or.size());
     }
     return str;
 }
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.cpp
@@ -57,7 +57,7 @@ class JoyconController::KeyboardManager final :
         stop();
     }
     virtual void send_state(const ControllerState& state) override{
-        WallClock time_stamp = current_time();
+        
         const JoyconState& switch_state = static_cast<const JoyconState&>(state);
 #if 0
         m_controller->logger().log(
@@ -72,6 +72,7 @@ class JoyconController::KeyboardManager final :
             return;
         }
         Milliseconds ticksize = m_controller->ticksize();
+        WallClock time_stamp = current_time();
         static_cast<JoyconController*>(m_controller)->issue_full_controller_state(
             nullptr,
             switch_state.buttons,
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_Joycon.h
@@ -191,8 +191,8 @@ class LeftJoycon : public JoyconController{
     virtual const char* name() override{
         return NAME;
     };
-    virtual ControllerCategory controller_category() const override{
-        return ControllerCategory::LEFT_JOYCON;
+    virtual ControllerClass controller_class() const override{
+        return ControllerClass::LEFT_JOYCON;
     }    
 };
 class RightJoycon : public JoyconController{
@@ -203,8 +203,8 @@ class RightJoycon : public JoyconController{
     virtual const char* name() override{
         return NAME;
     };
-    virtual ControllerCategory controller_category() const override{
-        return ControllerCategory::RIGHT_JOYCON;
+    virtual ControllerClass controller_class() const override{
+        return ControllerClass::RIGHT_JOYCON;
     } 
 };
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp
@@ -50,8 +50,7 @@ class ProController::KeyboardManager final :
     ~KeyboardManager(){
         stop();
     }
-    virtual void send_state(const ControllerState& state) override{
-        WallClock time_stamp = current_time();
+    virtual void send_state(const ControllerState& state) override{        
         const ProControllerState& switch_state = static_cast<const ProControllerState&>(state);
 
 #if 0
@@ -69,6 +68,7 @@ class ProController::KeyboardManager final :
             return;
         }
         Milliseconds ticksize = m_controller->ticksize();
+        WallClock time_stamp = current_time();
         static_cast<ProController*>(m_controller)->issue_full_controller_state(
             nullptr,
             ticksize == Milliseconds::zero() ? 2000ms : ticksize * 255,
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h
@@ -66,8 +66,8 @@ class ProController : public AbstractController{
     virtual const char* name() override{
         return NAME;
     };
-    virtual ControllerCategory controller_category() const override{
-        return ControllerCategory::PRO_CONTROLLER;
+    virtual ControllerClass controller_class() const override{
+        return ControllerClass::PRO_CONTROLLER;
     }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp
@@ -74,7 +74,7 @@ RecordKeyboardController::RecordKeyboardController()
 
 void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     AbstractControllerContext context(scope, env.console.controller());
-    ControllerCategory controller_category = env.console.controller().controller_category();
+    ControllerClass controller_class = env.console.controller().controller_class();
 
     if (MODE == Mode::RECORD){
         // check if given file name already exists. If it does, throw an error so we don't overwrite it.
@@ -90,7 +90,7 @@ void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, Canc
             context.wait_until_cancel();
         }catch (ProgramCancelledException&){
 
-            JsonValue json = controller_history_to_json(env.console.logger(), controller_category);
+            JsonValue json = controller_history_to_json(env.console.logger(), controller_class);
             json.dump(output_json_filename);
             m_controller_history.clear();
 
@@ -105,7 +105,7 @@ void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, Canc
         
     }else if (MODE == Mode::REPLAY){
         JsonValue json = load_json_file(std::string(FILE_NAME) + ".json");
-        json_to_pbf_actions(env, scope, json, controller_category);
+        json_to_pbf_actions(env, scope, json, controller_class);
 
 
     }else if (MODE == Mode::CONVERT_JSON_TO_CODE){
@@ -121,23 +121,23 @@ void json_to_cpp_code(Logger& logger, const JsonValue& json, const std::string&
     try{
         const JsonObject& obj = json.to_object_throw();
 
-        std::string controller_category_string = obj.get_string_throw("controller_category");
-        cout << controller_category_string << endl;
-        ControllerCategory controller_category = CONTROLLER_CATEGORY_STRINGS().get_enum(controller_category_string);
+        std::string controller_class_string = obj.get_string_throw("controller_class");
+        cout << controller_class_string << endl;
+        ControllerClass controller_class = CONTROLLER_CLASS_STRINGS().get_enum(controller_class_string);
 
         const JsonArray& history_json = obj.get_array_throw("history");
 
         std::string output_text;
-        switch (controller_category){
-        case ControllerCategory::PRO_CONTROLLER:
+        switch (controller_class){
+        case ControllerClass::PRO_CONTROLLER:
             output_text = json_to_cpp_code_pro_controller(history_json);
             break;
-        case ControllerCategory::LEFT_JOYCON:
-        case ControllerCategory::RIGHT_JOYCON:
+        case ControllerClass::LEFT_JOYCON:
+        case ControllerClass::RIGHT_JOYCON:
             output_text = json_to_cpp_code_joycon(history_json);
             break;
         default:
-            // generate empty text if ControllerCategory is not one of the above
+            // generate empty text if ControllerClass is not one of the above
             break;
         }
 
@@ -257,34 +257,34 @@ std::string json_to_cpp_code_joycon(const JsonArray& history){
 }
 
 
-void json_to_pbf_actions(SingleSwitchProgramEnvironment& env, CancellableScope& scope, const JsonValue& json, ControllerCategory controller_category){
+void json_to_pbf_actions(SingleSwitchProgramEnvironment& env, CancellableScope& scope, const JsonValue& json, ControllerClass controller_class){
     try{
         const JsonObject& obj = json.to_object_throw();
 
-        std::string controller_category_string = obj.get_string_throw("controller_category");
-        ControllerCategory controller_category_json = CONTROLLER_CATEGORY_STRINGS().get_enum(controller_category_string);
-        if (controller_category_json != controller_category){
-            throw UserSetupError(env.logger(), "Controller category in the JSON file does not match your current selected controller.");
+        std::string controller_class_string = obj.get_string_throw("controller_class");
+        ControllerClass controller_class_json = CONTROLLER_CLASS_STRINGS().get_enum(controller_class_string);
+        if (controller_class_json != controller_class){
+            throw UserSetupError(env.logger(), "Controller class in the JSON file does not match your current selected controller.");
         }
 
         const JsonArray& history_json = obj.get_array_throw("history");
 
-        switch (controller_category){
-        case ControllerCategory::PRO_CONTROLLER:
+        switch (controller_class){
+        case ControllerClass::PRO_CONTROLLER:
         {
             ProControllerContext context(scope, env.console.controller<ProController>());
             json_to_pbf_actions_pro_controller(context, history_json);
             break;
         }
-        case ControllerCategory::LEFT_JOYCON:
-        case ControllerCategory::RIGHT_JOYCON:
+        case ControllerClass::LEFT_JOYCON:
+        case ControllerClass::RIGHT_JOYCON:
         {
             JoyconContext context(scope, env.console.controller<JoyconController>());
             json_to_pbf_actions_joycon(context, history_json);
             break;
         }
         default:
-            // do nothing if the ControllerCategory is not one of the above.
+            // do nothing if the ControllerClass is not one of the above.
             break;
         }
 
@@ -524,7 +524,7 @@ void json_to_joycon_state(
 
 }
 
-JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, ControllerCategory controller_category){
+JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, ControllerClass controller_class){
     if (m_controller_history.size() < 2){
         // throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "RecordKeyboardController:: m_controller_history should have at least two entries, start and stop.");
         logger.log("RecordKeyboardController:: We expected m_controller_history to have at least two entries, start and stop. Aborting.", COLOR_RED);
@@ -593,7 +593,7 @@ JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, C
     
     
     JsonObject json_result;
-    json_result["controller_category"] = CONTROLLER_CATEGORY_STRINGS().get_string(controller_category);
+    json_result["controller_class"] = CONTROLLER_CLASS_STRINGS().get_string(controller_class);
     json_result["history"] = JsonValue(std::move(json_array));
 
     return json_result;
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h
@@ -67,7 +67,7 @@ std::string json_to_cpp_code_pro_controller(const JsonArray& history_json);
 std::string json_to_cpp_code_joycon(const JsonArray& history);
 
 // given the json, with the controller history, run the controller actions using the pbf functions.
-void json_to_pbf_actions(SingleSwitchProgramEnvironment& env, CancellableScope& scope, const JsonValue& json, ControllerCategory controller_category);
+void json_to_pbf_actions(SingleSwitchProgramEnvironment& env, CancellableScope& scope, const JsonValue& json, ControllerClass controller_class);
 void json_to_pbf_actions_pro_controller(ProControllerContext& context, const JsonArray& history);
 void json_to_pbf_actions_joycon(JoyconContext& context, const JsonArray& history);
 
@@ -94,7 +94,7 @@ class RecordKeyboardController : public SingleSwitchProgramInstance, public Keyb
 
     // convert m_controller_history to json
     // remove adjacent duplicate controller states.
-    JsonValue controller_history_to_json(Logger& logger, ControllerCategory controller_category);
+    JsonValue controller_history_to_json(Logger& logger, ControllerClass controller_class);
 
 
     // Examples for JsonObject controller_state:

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class JsonObject{`
`23`	`23`	`return dump() == x.dump();`
`24`	`24`	`}`
`25`	`25`	`bool operator!=(const JsonObject& x){`
`26`		`- return dump() != x.dump();`
	`26`	`+ return !(this == this);`
`27`	`27`	`}`
`28`	`28`	`private:`
`29`	`29`	`// Private to avoid accidental copying.`
Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ class KeyboardManager : public KeyboardInputController, public KeyboardEventHand`
`126`	`126`	`deltas.to_state(static_cast<StateType&>(state));`
`127`	`127`	`}`
`128`	`128`	`virtual void cancel_all_commands() override{`
`129`		`- WallClock time_stamp = current_time();`
`130`	`129`	`WriteSpinLock lg(m_lock);`
`131`	`130`	`if (m_controller == nullptr){`
`132`	`131`	`return;`
`133`	`132`	`}`
	`133`	`+ WallClock time_stamp = current_time();`
`134`	`134`	`m_controller->cancel_all_commands();`
`135`	`135`	`report_keyboard_command_stopped(time_stamp);`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ class SerialPABotBase_Keyboard final :`
`53`	`53`	`virtual ControllerType controller_type() const override{`
`54`	`54`	`return ControllerType::HID_Keyboard;`
`55`	`55`	`}`
`56`		`- virtual ControllerCategory controller_category() const override{`
`57`		`- return ControllerCategory::KEYBOARD;`
	`56`	`+ virtual ControllerClass controller_class() const override{`
	`57`	`+ return ControllerClass::KEYBOARD;`
`58`	`58`	`}`
`59`	`59`	`virtual ControllerPerformanceClass performance_class() const override{`
`60`	`60`	`return ControllerPerformanceClass::SerialPABotBase_Wired;`