Adapt generator to latest statemachine changes

dziegel · Nov 29, 2023 · 6650af0 · 6650af0
1 parent 85a7d37
commit 6650af0
Show file tree

Hide file tree

Showing 13 changed files with 431 additions and 444 deletions.
diff --git a/Statemachine Test/src-gen/IoArHandler.cxx b/Statemachine Test/src-gen/IoArHandler.cxx
@@ -1,6 +1,7 @@
-#include <cpp_event_framework/Statemachine.hxx>
 #include <iostream>
 
+#include <cpp_event_framework/Statemachine.hxx>
+
 enum class EEvent
 {
     S_PNS_ArOpend_ind,
@@ -63,8 +64,6 @@ class IoArHandler
     }
 
 private:
-#include "IoArHandlerMainPrototypes.hxx"
-
     bool ready_ = false;
     bool CheckApplicationReady(IoArHandlerMain::Event)
     {
@@ -112,15 +111,15 @@ class IoArHandler
     {
         std::cout << __FUNCTION__ << std::endl;
     }
-    void StartWaitApplicationReadyTimer(IoArHandlerMain::StateRef)
+    void StartWaitApplicationReadyTimer()
     {
         std::cout << __FUNCTION__ << std::endl;
     }
-    void StopWaitApplicationReadyTimer(IoArHandlerMain::StateRef)
+    void StopWaitApplicationReadyTimer()
     {
         std::cout << __FUNCTION__ << std::endl;
     }
-    void SendApplicationReady(IoArHandlerMain::StateRef)
+    void SendApplicationReady()
     {
         std::cout << __FUNCTION__ << std::endl;
     }
@@ -136,11 +135,11 @@ class IoArHandler
     {
         std::cout << __FUNCTION__ << std::endl;
     }
-    void StartDynReconfTimer(IoArHandlerMain::StateRef)
+    void StartDynReconfTimer()
     {
         std::cout << __FUNCTION__ << std::endl;
     }
-    void StopDynReconfTimer(IoArHandlerMain::StateRef)
+    void StopDynReconfTimer()
     {
         std::cout << __FUNCTION__ << std::endl;
     }
@@ -158,12 +157,10 @@ class IoArHandler
     }
 };
 
-#include "IoArHandlerMainInstance.hxx"
-
 #define IoArHandlerMain_GET_INSTANCE_EVENT_ID(e) e
 #define IoArHandlerMain_GET_STATIC_EVENT_ID(e) EEvent::e
 
-#include "IoArHandlerMainHandlers.hxx"
+#include "IoArHandlerMainInstance.hxx"
 
 void TestIoArHandler()
 {

diff --git a/Statemachine Test/src-gen/IoArHandlerMainDeclaration.hxx b/Statemachine Test/src-gen/IoArHandlerMainDeclaration.hxx
@@ -2,8 +2,8 @@
 // Include this file in .hxx before implementation declaration
 //
 // Before including this header, add the following using declaration in your file:
-// class MyClassContainingThisStatemachine;
-// using IoArHandlerMainBase = cpp_event_framework::Statemachine<MyClassContainingThisStatemachine, const cpp_event_framework::Signal::SPtr&>;
+// class IoArHandlerMainImpl;
+// using IoArHandlerMainBase = cpp_event_framework::Statemachine<IoArHandlerMainImpl, const cpp_event_framework::Signal::SPtr&>;
 
 #pragma once
 
@@ -117,4 +117,45 @@ public:
 
 
 
+
+// State Closed
+static IoArHandlerMain::Transition ClosedHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State Open
+static IoArHandlerMain::Transition OpenHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State Parameterizing
+static IoArHandlerMain::Transition ParameterizingHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State WaitApplicationReady
+static IoArHandlerMain::Transition WaitApplicationReadyHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State WaitApplicationReadyCnf
+static IoArHandlerMain::Transition WaitApplicationReadyCnfHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State ApplicationReady
+static IoArHandlerMain::Transition ApplicationReadyHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State Ready
+static IoArHandlerMain::Transition ReadyHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DynamicReconfigurationRunning
+static IoArHandlerMain::Transition DynamicReconfigurationRunningHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DrWaitPullCnf
+static IoArHandlerMain::Transition DrWaitPullCnfHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DrWaitApplicationReadyCnfPlugSubmodule
+static IoArHandlerMain::Transition DrWaitApplicationReadyCnfPlugSubmoduleHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DrWaitApplicationReadyPlugSubmodule
+static IoArHandlerMain::Transition DrWaitApplicationReadyPlugSubmoduleHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DrPlugPrmSequence
+static IoArHandlerMain::Transition DrPlugPrmSequenceHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+// State DrWaitPlugCnf
+static IoArHandlerMain::Transition DrWaitPlugCnfHandler(IoArHandlerMain::ImplPtr impl, IoArHandlerMain::Event event);
+
+
 };
diff --git a/Statemachine Test/src-gen/IoArHandlerMainHandlers.hxx b/Statemachine Test/src-gen/IoArHandlerMainHandlers.hxx