More PABB2.

Author: Mysticial

Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp

@@ -104,6 +104,8 @@ bool ReliableStreamConnectionFW::run_events(){
         return iterate_retransmits();
     }
 
+    m_packets_received++;
+
     //  Check the packet status.
     switch (packet->magic_number){
     case PABB2_PacketParser_RESULT_VALID:

Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h

@@ -38,6 +38,9 @@ class ReliableStreamConnectionFW final : public ReliableStreamConnectionPolling{
 public:
     ReliableStreamConnectionFW(UnreliableStreamConnectionPolling& unreliable_connection);
 
+    size_t packets_received() const{
+        return m_packets_received;
+    }
     bool has_unacked_sends() const{
         return m_reliable_sender.slots_used() != 0;
     }
@@ -97,6 +100,8 @@ class ReliableStreamConnectionFW final : public ReliableStreamConnectionPolling{
     PacketParser m_parser;
     StreamCoalescer m_stream_coalescer;
 
+    size_t m_packets_received = 0;
+
     WallClock m_last_retransmit;
 
     bool m_reset_flag = false;

Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h

@@ -36,6 +36,8 @@ typedef uint8_t pabb_ProgramID;
 #define PABB_PID_PABOTBASE_Pico1W_UART                      0x21
 #define PABB_PID_PABOTBASE_Pico2W_USB                       0x22
 #define PABB_PID_PABOTBASE_Pico2W_UART                      0x23
+#define PABB_PID_PABOTBASE_Pico1                            0x24
+#define PABB_PID_PABOTBASE_Pico2                            0x25
 
 
 //

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -56,9 +56,11 @@ const std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>>& SUPPORTED_VERSIONS(
 
 const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES2(){
     static const std::map<pabb_ProgramID, uint32_t> database{
-        {PABB_PID_UNSPECIFIED,                  2026041100},
-        {PABB_PID_PABOTBASE_ESP32,              2026041100},
-        {PABB_PID_PABOTBASE_ESP32S3,            2026041100},
+        {PABB_PID_UNSPECIFIED,              2026041100},
+        {PABB_PID_PABOTBASE_ESP32,          2026041100},
+        {PABB_PID_PABOTBASE_ESP32S3,        2026041100},
+        {PABB_PID_PABOTBASE_Pico1,          2026041100},
+        {PABB_PID_PABOTBASE_Pico2,          2026041100},
     };
     return database;
 }

SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h

@@ -70,8 +70,7 @@ class PABotBase2_JoyCon :
 
 public:
     virtual bool cancel_all_commands(WallDuration timeout) override{
-        PABotBase2_Controller::cancel_all_commands(timeout);
-        return true;
+        return PABotBase2_Controller::cancel_all_commands(timeout);
     }
     virtual void replace_on_next_command() override{
         PABotBase2_Controller::replace_on_next_command();

SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h

@@ -67,8 +67,7 @@ class PABotBase2_ProController final :
 
 public:
     virtual bool cancel_all_commands(WallDuration timeout) override{
-        PABotBase2_Controller::cancel_all_commands(timeout);
-        return true;
+        return PABotBase2_Controller::cancel_all_commands(timeout);
     }
     virtual void replace_on_next_command() override{
         PABotBase2_Controller::replace_on_next_command();

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp

@@ -211,9 +211,7 @@ void CommandRow::set_focus(bool focused){
         if (controller != nullptr && allow_controller_input()){
             try{
                 controller->cancel_all_commands();
-            }catch (InvalidConnectionStateException&){
-            }catch (OperationCancelledException&){
-            }
+            }catch (...){}
         }
     }
     if (m_last_known_focus == focused){