Disable logging of keyboard commands.

Author: Mysticial

SerialPrograms/Source/Controllers/Controller.h

@@ -218,7 +218,11 @@ class ControllerContext final : public CancellableScope{
 public:
     using ControllerType = Type;
 
+
 public:
+    virtual ~ControllerContext(){
+        detach();
+    }
     ControllerContext(ControllerType& controller)
         : m_controller(controller)
     {}
@@ -233,10 +237,9 @@ class ControllerContext final : public CancellableScope{
     {
         attach(context);
     }
-    virtual ~ControllerContext(){
-        detach();
-    }
 
+
+public:
     ControllerType* operator->(){
         m_lifetime_sanitizer.check_usage();
         return &m_controller;
@@ -245,6 +248,8 @@ class ControllerContext final : public CancellableScope{
     operator ControllerType&() const{ return m_controller; }
     ControllerType& controller() const{ return m_controller; }
 
+
+public:
     void wait_for_all_requests() const{
         auto scope = m_lifetime_sanitizer.check_scope();
         m_controller.wait_for_all(this);

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.cpp

@@ -27,17 +27,21 @@ int register_message_converters_HID_Keyboard(){
             if (body.size() != sizeof(pabb_Message_Command_HID_Keyboard_State)){ ss << "(invalid size)" << std::endl; return ss.str(); }
             const auto* params = (const pabb_Message_Command_HID_Keyboard_State*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
+            ss << ", milliseconds = " << params->milliseconds;
 
+            //  Do not log the contents of the command due to privacy concerns.
+            //  (people entering passwords)
+#if 0
             ss << std::hex;
             ss << ", 0x" << params->report.key[0];
             ss << ", 0x" << params->report.key[1];
             ss << ", 0x" << params->report.key[2];
             ss << ", 0x" << params->report.key[3];
             ss << ", 0x" << params->report.key[4];
             ss << ", 0x" << params->report.key[5];
-
             ss << std::dec;
-            ss << ", milliseconds = " << params->milliseconds;
+#endif
+
             return ss.str();
         }
     );

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.cpp

@@ -72,6 +72,10 @@ int register_message_converters_NS1_WirelessControllers(){
             const auto* params = (const pabb_Message_Command_NS1_WirelessController_Buttons*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
             ss << ", milliseconds = " << params->milliseconds;
+
+            //  Do not log the contents of the command due to privacy concerns.
+            //  (people entering passwords)
+
             return ss.str();
         }
     );
@@ -88,6 +92,10 @@ int register_message_converters_NS1_WirelessControllers(){
             const auto* params = (const pabb_Message_Command_NS1_WirelessController_FullState*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
             ss << ", milliseconds = " << params->milliseconds;
+
+            //  Do not log the contents of the command due to privacy concerns.
+            //  (people entering passwords)
+
             return ss.str();
         }
     );

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.cpp

@@ -8,7 +8,7 @@
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS2_WiredController.h"
 #include "ClientSource/Libraries/MessageConverter.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+//#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
@@ -28,7 +28,9 @@ int register_message_converters_NS2_WiredController(){
             if (body.size() != sizeof(pabb_Message_Command_NS2_WiredController_State)){ ss << "(invalid size)" << std::endl; return ss.str(); }
             const auto* params = (const pabb_Message_Command_NS2_WiredController_State*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
+            ss << ", milliseconds = " << params->milliseconds;
 
+#if 0
             uint32_t buttons = params->report.buttons0;
             buttons |= (uint32_t)params->report.buttons1 << 8;
             if (params->report.dpad_byte & 0x80){
@@ -39,7 +41,8 @@ int register_message_converters_NS2_WiredController(){
 
             ss << ", LJ = (" << (int)params->report.left_joystick_x << "," << (int)params->report.left_joystick_y << ")";
             ss << ", RJ = (" << (int)params->report.right_joystick_x << "," << (int)params->report.right_joystick_y << ")";
-            ss << ", milliseconds = " << params->milliseconds;
+#endif
+
             return ss.str();
         }
     );

SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp

@@ -62,6 +62,8 @@ void KeyboardControllerWithScheduler::issue_keys(
     }
     execute_schedule(cancellable, schedule);
     if (m_logging_throttler){
+        //  Do not log the contents of the command due to privacy concerns.
+        //  (people entering passwords)
         m_logger.log(
             "issue_keys(): "
             "delay = " + std::to_string(delay.count()) + "ms" +

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp

@@ -238,6 +238,9 @@ void ControllerWithScheduler::issue_full_controller_state(
     }
     execute_schedule(cancellable, schedule);
     if (m_logging_throttler){
+        //  Do not log the contents of the command due to privacy concerns.
+        //  (people entering passwords)
+#if 0
         m_logger.log(
             "issue_controller_state(): (" + button_to_string(button) +
             "), dpad(" + dpad_to_string(position) +
@@ -246,6 +249,12 @@ void ControllerWithScheduler::issue_full_controller_state(
             "), hold = " + std::to_string(hold.count()) + "ms",
             COLOR_DARKGREEN
         );
+#else
+        m_logger.log(
+            "issue_controller_state(): hold = " + std::to_string(hold.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+#endif
     }
 }