updated fsm

MyRobotLab · Apr 2, 2024 · 3964a1a · 3964a1a
1 parent e895087
commit 3964a1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/main/java/org/myrobotlab/service/FiniteStateMachine.java b/src/main/java/org/myrobotlab/service/FiniteStateMachine.java
@@ -197,7 +197,8 @@ public void fire(String event) {
       stateMachine.send(event);
       current = stateMachine.getCurrent();
 
-      log.info("fired event ({}) -> ({}) moves to ({})", event, last == null ? null : last.getName(), current == null ? null : current.getName());
+      log.info("fired event ({}) -> ({}) moves to ({})", event, last == null ? null : last.getName(),
+          current == null ? null : current.getName());
 
       if (last != null && !last.equals(current)) {
         StateChange stateChange = new StateChange(current.getName(), event);
@@ -254,13 +255,6 @@ public StateChange publishStateChange(StateChange stateChange) {
     return stateChange;
   }
 
-  @Override
-  public FiniteStateMachineConfig getConfig() {
-    super.getConfig();
-    config.current = getState();
-    return config;
-  }
-
   @Override
   public FiniteStateMachineConfig apply(FiniteStateMachineConfig c) {
     super.apply(c);
@@ -280,8 +274,8 @@ public FiniteStateMachineConfig apply(FiniteStateMachineConfig c) {
     }
 
     // setCurrent
-    if (c.current != null) {
-      setCurrent(c.current);
+    if (c.start != null) {
+      setCurrent(c.start);
     }
 
     return c;

diff --git a/src/main/java/org/myrobotlab/service/config/FiniteStateMachineConfig.java b/src/main/java/org/myrobotlab/service/config/FiniteStateMachineConfig.java
@@ -23,7 +23,7 @@ public Transition(String from, String event, String to) {
 
   public List<Transition> transitions = new ArrayList<>();
 
-  public String current = null;
+  public String start = null;
 
 
 }