Skip to content

Commit 6a1d95b

Browse files
committed
Bugfixes, Improvements and Features
- Passenger Lighting decoding moved to module - RO Drivetrain now has input to disable parking brake - Exterior Lighting - removed unused functionality - Drivetrain stuck issues fixed - Several label renamings
1 parent 13496e3 commit 6a1d95b

14 files changed

+614
-777
lines changed

Decouple Group/SRC-TCP [Module] Decouple v1_0.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<node label="Hub slot/Main Input" type="5" description="Outputs information to Hub/Main"/>
66
</n>
77
<n id="20" component_id="268">
8-
<node label="Main Both" mode="1" type="5" description="Connects to Main Both in order to receive information from other cars">
8+
<node label="Main Both" mode="1" type="5" description="Connects to Main Both for information from other cars">
99
<position x="1"/>
1010
</node>
1111
</n>

Decouple Group/SRC-TCP [RO Module] Decouple v1_0.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<microprocessor name="SRC-TCP [RO Module] Decouple v1.0" description="Communicates with main and decouple interface." width="2" length="1" id_counter="413" id_counter_node="36" sym2="4" sym3="2" sym4="8191" sym5="8194" sym6="9508" sym7="1184" sym8="3232" sym9="11636" sym10="16388" sym11="65528" sym12="16384" sym13="8192">
33
<nodes>
44
<n id="20" component_id="268">
5-
<node label="Main Both" mode="1" type="5" description="Connects to Main Both in order to receive information from other cars"/>
5+
<node label="Main Both" mode="1" type="5" description="Connects to Main Both for information from other cars"/>
66
</n>
77
<n id="31" component_id="313">
88
<node label="Module - Interface" type="5" description="Communicates with Drivetrain Interface">

Drivetrain Group/SRC-TCP [Interface] Drivetrain v1_3.xml

+23-11
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
</node>
2626
</n>
2727
<n id="37" component_id="340">
28-
<node label="Slip" mode="1" description="Slip input from Bogie">
28+
<node label="Slip" mode="1" description="Slip input from the wheels">
2929
<position x="2" z="1"/>
3030
</node>
3131
</n>
3232
<n id="41" component_id="293">
33-
<node label="Current Speed (m/s)" mode="1" type="1" description="Current speed in (m/s, directional)">
33+
<node label="Speed" mode="1" type="1" description="Current speed (m/s, directional)">
3434
<position x="4"/>
3535
</node>
3636
</n>
3737
<n id="42" component_id="299">
38-
<node label="Wheel RPS" mode="1" type="1" description="RPS at the wheels">
38+
<node label="Wheel RPS" mode="1" type="1" description="RPS at the wheels (from torque meter)">
3939
<position x="4" z="1"/>
4040
</node>
4141
</n>
@@ -258,7 +258,7 @@
258258
</object>
259259
</c>
260260
<c type="44">
261-
<object id="268" l="ABS" on="ENABLED" off="DISABLED">
261+
<object id="268" l="ABS" on="Enabled" off="Disabled">
262262
<pos x="2.25" y="-17.5"/>
263263
<in1 component_id="265"/>
264264
</object>
@@ -351,18 +351,24 @@ if on then
351351
end
352352
353353
if slip then
354-
--rst=true
355354
b=clamp(b-0.05,0.05,1)
356355
else
357-
--rst=false
358356
b=clamp(b+0.001,0.05,1)
359357
end
360358
361-
thrTemp=piVal:run(target*b,current,-1,1,2.5*a,rst)
359+
if target &lt; 0 then
360+
thrTemp=piVal:run(target*b,current,-1,0,2.5*a,rst)
361+
elseif target &gt; 0 then
362+
thrTemp=piVal:run(target*b,current,0,1,2.5*a,rst)
363+
end
364+
365+
--thrTemp=piVal:run(target*b,current,-1,1,2.5*a,rst)
362366
if abs(current) &gt; abs(target)+3 then
363367
thr=0
368+
rst=true
364369
else
365370
thr=thrTemp
371+
rst=false
366372
end
367373
else
368374
thr=0
@@ -698,7 +704,7 @@ end'>
698704
<c30 id="265" n="ABS" on="On" off="Off" v="true">
699705
<pos x="2.25" y="-17"/>
700706
</c30>
701-
<c31 id="268" l="ABS" on="ENABLED" off="DISABLED">
707+
<c31 id="268" l="ABS" on="Enabled" off="Disabled">
702708
<pos x="2.25" y="-17.5"/>
703709
<in1 component_id="265"/>
704710
</c31>
@@ -777,18 +783,24 @@ if on then
777783
end
778784
779785
if slip then
780-
--rst=true
781786
b=clamp(b-0.05,0.05,1)
782787
else
783-
--rst=false
784788
b=clamp(b+0.001,0.05,1)
785789
end
786790
787-
thrTemp=piVal:run(target*b,current,-1,1,2.5*a,rst)
791+
if target &lt; 0 then
792+
thrTemp=piVal:run(target*b,current,-1,0,2.5*a,rst)
793+
elseif target &gt; 0 then
794+
thrTemp=piVal:run(target*b,current,0,1,2.5*a,rst)
795+
end
796+
797+
--thrTemp=piVal:run(target*b,current,-1,1,2.5*a,rst)
788798
if abs(current) &gt; abs(target)+3 then
789799
thr=0
800+
rst=true
790801
else
791802
thr=thrTemp
803+
rst=false
792804
end
793805
else
794806
thr=0

Drivetrain Group/SRC-TCP [Module] Drivetrain v1_0.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<node label="Hub slot/Main Input" type="5" description="Outputs information to Hub/Main"/>
66
</n>
77
<n id="20" component_id="268">
8-
<node label="Main Both" mode="1" type="5" description="Connects to Main Both in order to receive information from other cars">
8+
<node label="Main Both" mode="1" type="5" description="Connects to Main Both for information from other cars">
99
<position x="1"/>
1010
</node>
1111
</n>

0 commit comments

Comments
 (0)