Merge branch 'main' of https://github.com/Ericzklm/Arduino-Source

Author: Ericzklm

.github/workflows/cpp-ci-serial-programs.yml

@@ -10,13 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2022, macos-13, ubuntu-24.04]
-        qt_version: ['5.12.12', '6.7.2']
+        qt_version: ['5.12.12', '6.8.1']
         include:
         - qt_version: '5.12.12'
           qt_version_major: '5'
           qt_modules: ''
 
-        - qt_version: '6.7.2'
+        - qt_version: '6.8.1'
           qt_version_major: '6'
           qt_modules: 'qtmultimedia qtserialport'
 
@@ -37,7 +37,7 @@ jobs:
       if: startsWith(matrix.os, 'mac')
       run: |
         brew install opencv
-    - uses: jurplel/install-qt-action@v3
+    - uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}

.gitignore

@@ -5,7 +5,7 @@ SerialPrograms/bin/
 # macOS hidden system file
 .DS_Store
 
-build*/
+build-*/
 
 # Qt config file on a user basis
 *.pro.user

BuildSetup/Windows-Install-Qt6.7.3-Components.png

@@ -14,56 +14,45 @@
 namespace PokemonAutomation{
 
 
-BotBaseContext::BotBaseContext(BotBase& botbase)
-    : m_botbase(botbase)
-{}
-BotBaseContext::BotBaseContext(CancellableScope& parent, BotBase& botbase)
-    : m_botbase(botbase)
-{
-    attach(parent);
-}
-BotBaseContext::~BotBaseContext(){
-    detach();
-}
 
-void BotBaseContext::wait_for_all_requests() const{
+void BotBaseControllerContext::wait_for_all_requests() const{
     m_lifetime_sanitizer.check_usage();
-    m_botbase.wait_for_all_requests(this);
+    m_controller.wait_for_all_requests(this);
 }
-void BotBaseContext::cancel_now(){
+void BotBaseControllerContext::cancel_now(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
-    m_botbase.stop_all_commands();
+    m_controller.stop_all_commands();
 }
-void BotBaseContext::cancel_lazy(){
+void BotBaseControllerContext::cancel_lazy(){
     m_lifetime_sanitizer.check_usage();
     CancellableScope::cancel(nullptr);
-    m_botbase.next_command_interrupt();
+    m_controller.next_command_interrupt();
 }
 
-bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
+bool BotBaseControllerContext::cancel(std::exception_ptr exception) noexcept{
     m_lifetime_sanitizer.check_usage();
     if (CancellableScope::cancel(std::move(exception))){
         return true;
     }
     try{
-        m_botbase.stop_all_commands();
+        m_controller.stop_all_commands();
     }catch (...){}
     return false;
 }
 
-bool BotBaseContext::try_issue_request(const BotBaseRequest& request) const{
+bool BotBaseControllerContext::try_issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    return m_botbase.try_issue_request(request, this);
+    return m_controller.try_issue_request(request, this);
 }
-void BotBaseContext::issue_request(const BotBaseRequest& request) const{
+void BotBaseControllerContext::issue_request(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    m_botbase.issue_request(request, this);
+    m_controller.issue_request(request, this);
 }
 
-BotBaseMessage BotBaseContext::issue_request_and_wait(const BotBaseRequest& request) const{
+BotBaseMessage BotBaseControllerContext::issue_request_and_wait(const BotBaseRequest& request) const{
     m_lifetime_sanitizer.check_usage();
-    return m_botbase.issue_request_and_wait(request, this);
+    return m_controller.issue_request_and_wait(request, this);
 }
 
 

BuildSetup/Windows-Install-Qt6.7.3-Custom.png

@@ -15,11 +15,14 @@ namespace PokemonAutomation{
 class Logger;
 struct BotBaseMessage;
 class BotBaseRequest;
+class BotBaseControllerContext;
 
 
 
-class BotBase{
+class BotBaseController{
 public:
+    using ContextType = BotBaseControllerContext;
+
     enum class State{
         RUNNING,
         STOPPING,
@@ -28,7 +31,7 @@ class BotBase{
     };
 
 public:
-    virtual ~BotBase() = default;
+    virtual ~BotBaseController() = default;
 
     virtual Logger& logger() = 0;
     virtual State state() const = 0;
@@ -70,29 +73,48 @@ class BotBase{
 
 
 
+class ControllerContext0 : public CancellableScope{
+public:
+    virtual void wait_for_all_requests() const = 0;
+    virtual void cancel_now() = 0;
+    virtual void cancel_lazy() = 0;
+};
+
+
 //  A wrapper for BotBase that allows for asynchronous cancelling.
-class BotBaseContext final : public CancellableScope{
+class BotBaseControllerContext final : public ControllerContext0{
+public:
+    using ControllerType = BotBaseController;
+
 public:
-    BotBaseContext(BotBase& botbase);
-    BotBaseContext(CancellableScope& parent, BotBase& botbase);
-    virtual ~BotBaseContext();
+    BotBaseControllerContext(BotBaseController& botbase)
+        : m_controller(botbase)
+    {}
+    BotBaseControllerContext(CancellableScope& parent, BotBaseController& botbase)
+        : m_controller(botbase)
+    {
+        attach(parent);
+    }
+    virtual ~BotBaseControllerContext(){
+        detach();
+    }
 
 
-    void wait_for_all_requests() const;
+    virtual void wait_for_all_requests() const override;
 
-    //  Don't use this unless you really need to.
-    BotBase& botbase() const{ return m_botbase; }
+    operator BotBaseController&() const{ return m_controller; }
+    BotBaseController& controller() const{ return m_controller; }
 
     //  Stop all commands in this context now.
-    void cancel_now();
+    virtual void cancel_now() override;
 
     //  Stop the commands in this context, but do it lazily.
     //  Still will stop new commands from being issued to the device,
     //  and will tell the device that the next command that is issued
     //  should replace the command queue.
     //  This cancel is used when you need continuity from an ongoing
     //  sequence.
-    void cancel_lazy();
+    virtual void cancel_lazy() override;
 
 
     virtual bool cancel(std::exception_ptr exception) noexcept override;
@@ -105,7 +127,7 @@ class BotBaseContext final : public CancellableScope{
 
 
 private:
-    BotBase& m_botbase;
+    BotBaseController& m_controller;
     LifetimeSanitizer m_lifetime_sanitizer;
 };
 

BuildSetup/Windows-Install-Qt6.8.0-Components.png

@@ -31,11 +31,12 @@ void MessageLogger::on_send(const BotBaseMessage& message, bool is_retransmit){
         if (message.type == PABB_MSG_REQUEST_CLOCK){
             print = false;
         }
-#if 0
+#if 1
         if (message.type == PABB_MSG_CONTROLLER_STATE){
-            pabb_controller_state body;
-            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
-            print = body.ticks >= 5;
+//            pabb_controller_state body;
+//            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
+//            print = body.ticks >= 5;
+            print = false;
         }
 #endif