Update FSM

Ensure transition to stop state only happens at end of sequence and that start only happens when stopped.

Update FSM
Ensure transition to stop state only happens at end of sequence and that start only happens when stopped.
f7b7c9a0 · Tom Levens · e502f504 · f7b7c9a0
Commit f7b7c9a0 authored Feb 23, 2023 by Tom Levens
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

Fsm.vhd hdl/ffpg/rtl/DelayedPulseGenerator/Fsm.vhd +8 -6

No files found.
--- a/hdl/ffpg/rtl/DelayedPulseGenerator/Fsm.vhd
+++ b/hdl/ffpg/rtl/DelayedPulseGenerator/Fsm.vhd
@@ -70,16 +70,14 @@ architecture syn of Fsm is
        return to_unsigned(t_State'pos(State), 3);
    end function;
-    constant c_ResetState: t_State := s_Stop;
+    signal State: t_State := s_Stop;
-    signal State: t_State := c_ResetState;
 begin
    pFsmTransitions: process (Clk_ik) is begin
        if rising_edge(Clk_ik) then
            if Reset_ir = '1' then
-                State <= c_ResetState;
+                State <= s_Stop;
            else
                State <= State;
                if ModeLoad_i = '1' then
@@ -94,6 +92,10 @@ begin
                else
                    -- separate states
                    case State is
+                        when s_Stop =>
+                            if (ModeLoad_i = '1') and (Mode_i /= e_ModeStop) then
+                                State <= s_WaitForTrigger;
+                            end if;
                        when s_WaitForTrigger =>
                            if Trigger_i = '1' then
                                State <= s_Generating;
@@ -103,11 +105,11 @@ begin
                                State <= s_Outputting;
                            end if;
                        when s_Outputting =>
-                            if (StreamReset_i = '1') and (Mode_i = e_ModeSingle) then
+                            if (StreamReset_i = '1') and ((Mode_i = e_ModeSingle) or (Mode_i = e_ModeStop)) then
                                State <= s_Stop;
                            end if;
                        when others =>
-                            State <= c_ResetState;
+                            State <= s_Stop;
                    end case;
                end if;
            end if;