Refactor.

Author: Mysticial

ClientSource/Connection/PABotBase.cpp

@@ -39,7 +39,7 @@ PABotBase::PABotBase(
 )
     : PABotBaseConnection(logger, std::move(connection))
     , m_logger(logger)
-    , m_max_pending_requests(PABB_DEVICE_QUEUE_SIZE)
+    , m_max_pending_requests(PABB_DEVICE_MINIMUM_QUEUE_SIZE)
     , m_send_seq(1)
     , m_retransmit_delay(retransmit_delay)
     , m_last_ack(current_time())

ClientSource/Connection/PABotBase.h

@@ -41,15 +41,14 @@ namespace PokemonAutomation{
 
 
 class PABotBase : public BotBaseController, private PABotBaseConnection{
-//    static const size_t MAX_PENDING_REQUESTS = PABB_DEVICE_QUEUE_SIZE;
     static const seqnum_t MAX_SEQNUM_GAP = (seqnum_t)-1 >> 2;
 
 public:
     PABotBase(
         Logger& logger,
         std::unique_ptr<StreamConnection> connection,
         MessageLogger* message_logger = nullptr,
-        std::chrono::milliseconds retransmit_delay = std::chrono::milliseconds(PABB_RETRANSMIT_DELAY_MILLIS)
+        std::chrono::milliseconds retransmit_delay = std::chrono::milliseconds(100)
     );
     virtual ~PABotBase();
 

Common/SerialPABotBase/SerialPABotBase_Protocol.h

@@ -139,48 +139,11 @@ extern "C" {
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-//  This macro isn't part of the protocol. But it specifies the size of the
-//  command queue on the device. This can be used as a hint by the client to
-//  avoid overloading the device. This has no effect on correctness since the
-//  device will automatically drop commands when the command queue fills up or
-//  if it can't process serial messages quickly enough.
-
-//  Must be a power-of-two.
-#if __AVR_ATmega16U2__
-#define PABB_DEVICE_QUEUE_SIZE          8
-#elif __AVR_ATmega32U4__ || __AVR_AT90USB1286__
-#define PABB_DEVICE_QUEUE_SIZE          64
-#else
-#define PABB_DEVICE_QUEUE_SIZE          4
-#endif
-
-//  Client code should first assume the queue size is only 4. It can optionally
-//  query for the actual queue size using PABB_MSG_REQUEST_QUEUE_SIZE.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-//  Protocol Version:
-//
-//      Backwards incompatible changes will increase by 100 or more.
-//      Backwards compatible changes will increase by 1.
-//
-//      (version / 100) must be the same on both server and client.
-//      (version % 100) may differ though client may apply restrictions.
-//
-#define PABB_PROTOCOL_VERSION           2023121900
-
-//  Program versioning doesn't matter. It's just for informational purposes.
-#define PABB_PROGRAM_VERSION            2023121900
-
 #define PABB_BAUD_RATE                  115200
-#define PABB_RETRANSMIT_DELAY_MILLIS    80
-
-//  This limit of 12 is only for AVR8. ESP32 will go much larger. So we ignore
-//  this number and allow large messages on the computer side.
-#define PABB_MAX_MESSAGE_SIZE           12
 #define PABB_PROTOCOL_OVERHEAD          (2 + sizeof(uint32_t))
-#define PABB_MAX_PACKET_SIZE            (PABB_MAX_MESSAGE_SIZE + PABB_PROTOCOL_OVERHEAD)
+
+//  Must be a power-of-two.
+#define PABB_DEVICE_MINIMUM_QUEUE_SIZE  4
 
 typedef uint32_t seqnum_t;
 

NativePrograms/DeviceFramework/SerialPABotBase_Parameters.h

@@ -0,0 +1,48 @@
+/*  Serial PABotBase Parameters
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Parameters_H
+#define PokemonAutomation_SerialPABotBase_Parameters_H
+
+
+//  Protocol Version:
+//
+//      Backwards incompatible changes will increase by 100 or more.
+//      Backwards compatible changes will increase by 1.
+//
+//      (version / 100) must be the same on both server and client.
+//      (version % 100) may differ though client may apply restrictions.
+//
+#define PABB_PROTOCOL_VERSION           2023121900
+
+//  Program versioning doesn't matter. It's just for informational purposes.
+#define PABB_PROGRAM_VERSION            2023121900
+
+#define PABB_RETRANSMIT_DELAY_MILLIS    80
+
+#define PABB_MAX_MESSAGE_SIZE           12
+#define PABB_MAX_PACKET_SIZE            (PABB_MAX_MESSAGE_SIZE + PABB_PROTOCOL_OVERHEAD)
+
+
+
+//  This macro isn't part of the protocol. But it specifies the size of the
+//  command queue on the device. This can be used as a hint by the client to
+//  avoid overloading the device. This has no effect on correctness since the
+//  device will automatically drop commands when the command queue fills up or
+//  if it can't process serial messages quickly enough.
+
+//  Must be a power-of-two.
+#if __AVR_ATmega16U2__
+#define PABB_DEVICE_QUEUE_SIZE          8
+#elif __AVR_ATmega32U4__ || __AVR_AT90USB1286__
+#define PABB_DEVICE_QUEUE_SIZE          64
+#else
+#define PABB_DEVICE_QUEUE_SIZE          4
+#endif
+
+
+
+#endif

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -105,6 +105,8 @@ const std::map<
                 ControllerFeature::NintendoSwitch_DateSkip,
             }},
         }},
+    }},
+    {2025031600, {
         {PABB_PID_PABOTBASE_ESP32, {
             {ControllerType::NintendoSwitch_WirelessProController, {
                 ControllerFeature::TickPrecise,

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -168,15 +168,15 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
         throw SerialProtocolException(
             logger, PA_CURRENT_FUNCTION,
             "Incompatible protocol. Device: " + std::to_string(m_protocol) + "<br>"
-            "Please install the .hex that came with this version of the program."
+            "Please install the firmware that came with this version of the program."
         );
     }
     --protocol_iter;
     if (protocol_iter->first < m_protocol / 100 * 100){
         throw SerialProtocolException(
             logger, PA_CURRENT_FUNCTION,
             "Incompatible protocol. Device: " + std::to_string(m_protocol) + "<br>"
-            "Please install the .hex that came with this version of the program."
+            "Please install the firmware that came with this version of the program."
         );
     }
 
@@ -192,7 +192,7 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
         throw SerialProtocolException(
             logger, PA_CURRENT_FUNCTION,
             "Unrecognized Program ID: " + std::to_string(m_program_id) + "<br>"
-            "Please install the .hex that came with this version of the program."
+            "Please install the firmware that came with this version of the program."
         );
     }
 

SerialPrograms/Source/Tests/TestUtils.h

@@ -60,7 +60,7 @@ class DummyBotBase : public BotBaseController{
     virtual Logger& logger() override { return m_logger; }
 
     virtual State state() const override { return State::RUNNING; }
-    virtual size_t queue_limit() const override { return PABB_DEVICE_QUEUE_SIZE; }
+    virtual size_t queue_limit() const override { return PABB_DEVICE_MINIMUM_QUEUE_SIZE; }
 
     virtual void notify_all() override{}