TA147

Index Commits Files Refs

commit d57cb9fe25af3ba2444ed3631deaf9401602aa57
parent 67cc52d2af62d0a31a4d4e734f960d5aa4cd9129
Author: Martin Kloeckner <mjkloeckner@gmail.com>
Date:   Fri, 17 Apr 2026 17:38:38 -0300

Fix semaphores having different timings

Diffstat:
M
tps/1/src/Makefile
 | 
2
+-
M
tps/1/src/intersection_ctrl.vhd
 | 
2
+-
M
tps/1/statechart/statechart.ysc
 | 
4
++--

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tps/1/src/Makefile b/tps/1/src/Makefile
@@ -15,7 +15,7 @@ elaborate: analyze
     $(GHDL) -e $(TOP)
 
 run: elaborate
-    $(GHDL) -r $(TOP) --vcd=$(WAVEFORM_FILE) --stop-time=100ms
+    $(GHDL) -r $(TOP) --vcd=$(WAVEFORM_FILE) --stop-time=200ms
 
 clean:
     rm -f *.o *.cf $(TOP) $(TOP).vcd
diff --git a/tps/1/src/intersection_ctrl.vhd b/tps/1/src/intersection_ctrl.vhd
@@ -49,7 +49,7 @@ begin
             ms_tick_cnt <= ms_tick_cnt + 1;
             case state is
                 when state_0 =>
-                    if ms_tick_cnt = (RED_TIME_MS - 2*YEL_TIME_MS) then
+                    if ms_tick_cnt = RED_TIME_MS then
 
                         ms_tick_cnt <= (others => '0');
                         state <= state_1;
diff --git a/tps/1/statechart/statechart.ysc b/tps/1/statechart/statechart.ysc
@@ -12,7 +12,7 @@
         <outgoingTransitions xmi:id="_uN0VYDqZEfG2H8hrWiFWzA" specification="after YEL_TIME_MS ms" target="_rUIygDqZEfG2H8hrWiFWzA"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_Kij5kDh6EfG1qtRGopny_Q" name="state_0" incomingTransitions="_R00mQDh6EfG1qtRGopny_Q _vbaw8DqZEfG2H8hrWiFWzA">
-        <outgoingTransitions xmi:id="_TPUOUDh6EfG1qtRGopny_Q" specification="after (RED_TIME_MS - 2*YEL_TIME_MS) ms" target="_gjGOAzh5EfG1qtRGopny_Q"/>
+        <outgoingTransitions xmi:id="_TPUOUDh6EfG1qtRGopny_Q" specification="after RED_TIME_MS ms" target="_gjGOAzh5EfG1qtRGopny_Q"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_qmJrLDqZEfG2H8hrWiFWzA" name="state_4" incomingTransitions="_u6z-QDqZEfG2H8hrWiFWzA">
         <outgoingTransitions xmi:id="_VMV_gDqaEfG2H8hrWiFWzA" specification="after YEL_TIME_MS ms" target="_qmK5QDqZEfG2H8hrWiFWzA"/>
@@ -172,7 +172,7 @@
     <edges xmi:id="_TPWqkDh6EfG1qtRGopny_Q" type="Transition" element="_TPUOUDh6EfG1qtRGopny_Q" source="_KijSgDh6EfG1qtRGopny_Q" target="_gjIqXDh5EfG1qtRGopny_Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_TPXRoTh6EfG1qtRGopny_Q" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_TPXRojh6EfG1qtRGopny_Q" fontName="Monospace" fontHeight="8"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TPX4sDh6EfG1qtRGopny_Q" x="7" y="-47"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TPX4sDh6EfG1qtRGopny_Q" x="-2" y="-24"/>
       </children>
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_TPWqkTh6EfG1qtRGopny_Q" routing="Rectilinear" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_TPXRoDh6EfG1qtRGopny_Q" fontName="Verdana"/>