Begin unwinding the ClientSource/ directory.

Mysticial · Mysticial · commit f17a7edf9b1c · 2025-09-28T20:21:01.000-07:00
diff --git a/ClientSource/Connection/PABotBaseConnection.cpp b/ClientSource/Connection/PABotBaseConnection.cpp
@@ -6,7 +6,6 @@
 
 #include "Common/CRC32.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
-#include "ClientSource/Libraries/Logging.h"
 #include "ClientSource/Libraries/MessageConverter.h"
 #include "BotBaseMessage.h"
 #include "PABotBaseConnection.h"
diff --git a/ClientSource/Connection/PABotBaseConnection.h b/ClientSource/Connection/PABotBaseConnection.h
@@ -16,10 +16,10 @@
 
 #include <memory>
 #include <deque>
+#include "Common/Cpp/SerialConnection/StreamInterface.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
 #include "BotBase.h"
 #include "MessageSniffer.h"
-#include "StreamInterface.h"
 
 namespace PokemonAutomation{
 
diff --git a/ClientSource/Libraries/Logging.cpp b/ClientSource/Libraries/Logging.cpp
diff --git a/ClientSource/Libraries/Logging.h b/ClientSource/Libraries/Logging.h
diff --git a/Common/Cpp/PanicDump.cpp b/Common/Cpp/PanicDump.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Libraries/Logging.h"
 #include "PrettyPrint.h"
 #include "PanicDump.h"
 
diff --git a/Common/Cpp/SerialConnection/SerialConnection.cpp b/Common/Cpp/SerialConnection/SerialConnection.cpp
@@ -0,0 +1,23 @@
+/*  Serial Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Time.h"
+#include "SerialConnection.h"
+
+namespace PokemonAutomation{
+
+
+std::mutex serial_logging_lock;
+
+
+void serial_debug_log(const std::string& msg){
+    std::lock_guard<std::mutex> lg(serial_logging_lock);
+    std::cout << current_time_to_str() << " - " << msg << std::endl;
+}
+
+
+}
diff --git a/Common/Cpp/SerialConnection/SerialConnection.h b/Common/Cpp/SerialConnection/SerialConnection.h
diff --git a/Common/Cpp/SerialConnection/SerialConnectionPOSIX.h b/Common/Cpp/SerialConnection/SerialConnectionPOSIX.h
@@ -20,6 +20,10 @@
 
 namespace PokemonAutomation{
 
+void serial_debug_log(const std::string& msg);
+
+
+
 class SerialConnection : public StreamConnection{
 public:
     //  UTF-8
diff --git a/Common/Cpp/SerialConnection/SerialConnectionWinAPI.h b/Common/Cpp/SerialConnection/SerialConnectionWinAPI.h
@@ -12,16 +12,20 @@
 #include <thread>
 #include <windows.h>
 #include "Common/Compiler.h"
+#include "Common/Cpp/Time.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Unicode.h"
 #include "Common/Cpp/PanicDump.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "ClientSource/Libraries/Logging.h"
+//#include "Common/Cpp/Concurrency/SpinPause.h"
 #include "StreamInterface.h"
 
 namespace PokemonAutomation{
 
+void serial_debug_log(const std::string& msg);
+
+
+
 class SerialConnection : public StreamConnection{
 public:
     //  UTF-8
@@ -121,7 +125,7 @@ class SerialConnection : public StreamConnection{
     void process_error(const std::string& message){
         m_errors++;
         if (m_errors < 100 || m_errors % 1000 == 0){
-            log(message);
+            serial_debug_log(message);
         }
 
         std::string clear_error;
@@ -134,7 +138,7 @@ class SerialConnection : public StreamConnection{
         }
 
         if (m_errors < 100 || m_errors % 1000 == 0){
-            log(clear_error);
+            serial_debug_log(clear_error);
         }
     }
 
diff --git a/Common/Cpp/SerialConnection/StreamInterface.h b/Common/Cpp/SerialConnection/StreamInterface.h
diff --git a/Common/Cpp/Time.cpp b/Common/Cpp/Time.cpp
@@ -6,12 +6,48 @@
 
 #include <ctime>
 //#include <format>
+#include "Common/Cpp/PrettyPrint.h"
 #include "Time.h"
 
 namespace PokemonAutomation{
 
 
 
+std::string current_time_to_str(){
+    //  Based off of: https://stackoverflow.com/questions/15957805/extract-year-month-day-etc-from-stdchronotime-point-in-c
+
+    using namespace std;
+    using namespace std::chrono;
+    typedef duration<int, ratio_multiply<hours::period, ratio<24> >::type> days;
+    system_clock::time_point now = system_clock::now();
+    system_clock::duration tp = now.time_since_epoch();
+    days d = duration_cast<days>(tp);
+    tp -= d;
+    hours h = duration_cast<hours>(tp);
+    tp -= h;
+    minutes m = duration_cast<minutes>(tp);
+    tp -= m;
+    seconds s = duration_cast<seconds>(tp);
+    tp -= s;
+    auto micros = 1000000 * tp.count() * system_clock::duration::period::num / system_clock::duration::period::den;
+    time_t tt = system_clock::to_time_t(now);
+//    tm utc_tm = *gmtime(&tt);
+    tm local_tm = *localtime(&tt);
+
+    std::ostringstream ss;
+    ss << local_tm.tm_year + 1900 << '-';
+    ss << tostr_padded(2, local_tm.tm_mon + 1) << '-';
+    ss << tostr_padded(2, local_tm.tm_mday) << ' ';
+    ss << tostr_padded(2, local_tm.tm_hour) << ':';
+    ss << tostr_padded(2, local_tm.tm_min) << ':';
+    ss << tostr_padded(2, local_tm.tm_sec) << '.';
+    ss << tostr_padded(6, micros);
+
+    return ss.str();
+}
+
+
+
 uint16_t current_year(){
 #if 0
     //  This requires C++20. (https://stackoverflow.com/a/58152002)
diff --git a/Common/Cpp/Time.h b/Common/Cpp/Time.h
@@ -21,6 +21,7 @@ using Seconds = std::chrono::seconds;
 inline WallClock current_time(){
     return std::chrono::system_clock::now();
 }
+std::string current_time_to_str();
 
 
 uint16_t current_year();
diff --git a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <QString>
-#include "ClientSource/Libraries/Logging.h"
+#include "Common/Cpp/Time.h"
 #include "Logger.h"
 
 #include <iostream>
diff --git a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp
@@ -6,7 +6,7 @@
 
 #include <QFile>
 #include <QSaveFile>
-#include "ClientSource/Libraries/Logging.h"
+#include "Common/Cpp/Time.h"
 #include "StatsDatabase.h"
 
 #include <iostream>
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp
@@ -10,8 +10,8 @@
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PanicDump.h"
 #include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/SerialConnection/SerialConnection.h"
 #include "ClientSource/Libraries/MessageConverter.h"
-#include "ClientSource/Connection/SerialConnection.h"
 #include "ClientSource/Connection/PABotBase.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
@@ -38,7 +38,6 @@
 #include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
 #include "CommonTools/ImageMatch/ExactImageMatcher.h"
 #include "TestProgramComputer.h"
-#include "ClientSource/Libraries/Logging.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 
 #include "Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h"
diff --git a/SerialPrograms/SourceFiles.cmake b/SerialPrograms/SourceFiles.cmake
@@ -18,12 +18,6 @@ file(GLOB MAIN_SOURCES
     ../ClientSource/Connection/PABotBase.h
     ../ClientSource/Connection/PABotBaseConnection.cpp
     ../ClientSource/Connection/PABotBaseConnection.h
-    ../ClientSource/Connection/SerialConnection.h
-    ../ClientSource/Connection/SerialConnectionPOSIX.h
-    ../ClientSource/Connection/SerialConnectionWinAPI.h
-    ../ClientSource/Connection/StreamInterface.h
-    ../ClientSource/Libraries/Logging.cpp
-    ../ClientSource/Libraries/Logging.h
     ../ClientSource/Libraries/MessageConverter.cpp
     ../ClientSource/Libraries/MessageConverter.h
     ../Common/CRC32.cpp
@@ -167,6 +161,11 @@ file(GLOB MAIN_SOURCES
     ../Common/Cpp/Rectangle.tpp
     ../Common/Cpp/RecursiveThrottler.h
     ../Common/Cpp/SIMDDebuggers.h
+    ../Common/Cpp/SerialConnection/SerialConnection.cpp
+    ../Common/Cpp/SerialConnection/SerialConnection.h
+    ../Common/Cpp/SerialConnection/SerialConnectionPOSIX.h
+    ../Common/Cpp/SerialConnection/SerialConnectionWinAPI.h
+    ../Common/Cpp/SerialConnection/StreamInterface.h
     ../Common/Cpp/Sockets/AbstractClientSocket.h
     ../Common/Cpp/Sockets/ClientSocket.cpp
     ../Common/Cpp/Sockets/ClientSocket.h
