Renaming + more robust waits.

Author: Mysticial

Common/Cpp/StreamConnections/PollingStreamConnections.h

@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include "StreamInterface.h"
 
-#ifdef PABB2_ENABLE
+#ifdef PABB2_FIRMWARE
 #include "PabbTime.h"
 #else
 #include "Common/Cpp/Time.h"

Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp

@@ -196,7 +196,7 @@ bool ReliableStreamConnectionFW::run_recv_events(const WallDuration& timeout) no
         m_parser.reset();
         m_stream_coalescer.reset();
         m_stream_coalescer.push_packet(0);
-#ifdef PABB2_ENABLE
+#ifdef PABB2_FIRMWARE
         issue_reset_to_all();
 #endif
         send_oob_packet_empty(

Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h

@@ -16,7 +16,7 @@
 #define PABB2_ReliableConnectionFW_POLL_MS      50
 #endif
 
-#ifdef PABB2_ENABLE
+#ifdef PABB2_FIRMWARE
 #include "PabbTime.h"
 #include "LocalMutex.h"
 #include "Tools/ResetListener.h"
@@ -32,7 +32,7 @@ namespace PABotBase2{
 
 class ReliableStreamConnectionFW final
     : public ReliableStreamConnectionPolling
-#ifdef PABB2_ENABLE
+#ifdef PABB2_FIRMWARE
     , public ResetRunner
 #endif
 {

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -39,7 +39,7 @@ namespace PokemonAutomation{
 #endif
 
 #ifndef PA_VERSION_PATCH
-#define PA_VERSION_PATCH 10
+#define PA_VERSION_PATCH 11
 #endif
 
 const bool IS_BETA_VERSION = PA_IS_BETA;

SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp

@@ -67,6 +67,7 @@ bool SerialPABotBase2_Connection::cancel(std::exception_ptr exception) noexcept{
         if (rts){
             rts = false;
             m_unreliable_connection->set_control_state(dtr, rts);
+            naked_wait(50ms);
             Mutex lock;
             ConditionVariable cv;
             WallClock deadline = current_time() + 50ms;
@@ -77,23 +78,14 @@ bool SerialPABotBase2_Connection::cancel(std::exception_ptr exception) noexcept{
         if (!dtr){
             dtr = false;
             m_unreliable_connection->set_control_state(dtr, rts);
-            Mutex lock;
-            ConditionVariable cv;
-            WallClock deadline = current_time() + 50ms;
-            std::unique_lock<Mutex> lg(lock);
-            cv.wait_until(lg, deadline, [=]{ return current_time() >= deadline; });
+            naked_wait(50ms);
         }
 #endif
+        naked_wait(50ms);
     }catch (...){
 //        cout << "exception thrown" << endl;
     }
 
-    Mutex lock;
-    ConditionVariable cv;
-    WallClock deadline = current_time() + 50ms;
-    std::unique_lock<Mutex> lg(lock);
-    cv.wait_until(lg, deadline, [=]{ return current_time() >= deadline; });
-
     return false;
 }
 
@@ -106,6 +98,14 @@ ControllerType SerialPABotBase2_Connection::refresh_controller_type(){
 }
 
 
+
+void SerialPABotBase2_Connection::naked_wait(WallDuration duration){
+    Mutex lock;
+    ConditionVariable cv;
+    WallClock deadline = current_time() + duration;
+    std::unique_lock<Mutex> lg(lock);
+    cv.wait_until(lg, deadline, [=]{ return current_time() >= deadline; });
+}
 bool SerialPABotBase2_Connection::open_serial_port(){
     {
         std::string text = "Opening serial port...";

SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h

@@ -35,6 +35,8 @@ class SerialPABotBase2_Connection final : public PABotBase2::Connection{
 
 
 private:
+    void naked_wait(WallDuration duration);
+
     bool open_serial_port();
     bool try_connect_to_device(WallDuration timeout);
     bool connect_to_device();