Minor

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -112,13 +112,13 @@ void SerialPABotBase_Connection::update_with_capabilities(const ControllerFeatur
             break;
         }
 
-        //  Program Version
-        logger.log("Checking Firmware Version...");
-        uint32_t version = program_version(*m_botbase);
-        logger.log("Checking Firmware Version... Version = " + std::to_string(version));
+//        //  Program Version
+//        logger.log("Checking Firmware Version...");
+//        uint32_t version = program_version(*m_botbase);
+//        logger.log("Checking Firmware Version... Version = " + std::to_string(version));
 
         //  REMOVE: Temporary for migration.
-        if (m_protocol / 100 == 20210526 && version == 2023121900){
+        if (m_protocol / 100 == 20210526 && m_version == 2023121900){
             break;
         }
 
@@ -196,6 +196,9 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
         );
     }
 
+    logger.log("Checking Firmware Version...");
+    m_version = program_version(*m_botbase);
+    logger.log("Checking Firmware Version... Version = " + std::to_string(m_version));
 
     //  Controller Type
     logger.log("Reading Controller Mode...");
@@ -327,8 +330,8 @@ void SerialPABotBase_Connection::thread_body(
             error = e.message();
         }
         if (error.empty()){
-//            std::string text = "Program: " + program_name(m_program_id) + " (" + std::to_string(m_protocol) + ")";
-            std::string text = program_name(m_program_id) + " (" + std::to_string(m_protocol) + ")";
+//            std::string text = "Program: " + program_name(m_program_id) + " (" + std::to_string(m_version) + ")";
+            std::string text = program_name(m_program_id) + " (" + std::to_string(m_version) + ")";
             set_status_line0(text, theme_friendly_darkblue());
             declare_ready(mode_status);
         }else{

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h

@@ -57,6 +57,7 @@ class SerialPABotBase_Connection : public ControllerConnection{
     std::string m_device_name;
 
     uint32_t m_protocol = 0;
+    uint32_t m_version = 0;
     uint8_t m_program_id = 0;
     ControllerModeStatus m_mode_status;
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp

@@ -300,7 +300,7 @@ void ControllerWithScheduler::issue_mash_AZs(
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_A, 3*8ms, 5*8ms, 3*8ms);
+        issue_buttons(cancellable, BUTTON_A, 3*8ms, 6*8ms, 3*8ms);
         duration -= std::min(3*8ms, duration);
 
         //  We never log before the first issue to avoid delaying the critical path.
@@ -317,13 +317,13 @@ void ControllerWithScheduler::issue_mash_AZs(
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_ZL, 3*8ms, 5*8ms, 3*8ms);
+        issue_buttons(cancellable, BUTTON_ZL, 3*8ms, 6*8ms, 3*8ms);
         duration -= std::min(3*8ms, duration);
 
         if (duration <= Milliseconds::zero()){
             break;
         }
-        issue_buttons(cancellable, BUTTON_ZR, 3*8ms, 5*8ms, 3*8ms);
+        issue_buttons(cancellable, BUTTON_ZR, 3*8ms, 6*8ms, 3*8ms);
         duration -= std::min(3*8ms, duration);
     }
 }

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h

@@ -49,7 +49,7 @@ constexpr Button VALID_PRO_CONTROLLER_BUTTONS =
 
 
 //
-//  This is the generic interface a Switch pro controller.
+//  This is the generic interface to a Switch pro controller.
 //
 class ProController : public AbstractController{
 public:

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

@@ -22,7 +22,8 @@ namespace NintendoSwitch{
 
 class ProController_SysbotBase final :
     public ProController,
-    public ControllerWithScheduler{
+    public ControllerWithScheduler
+{
 public:
     using ContextType = ProControllerContext;