Skip to content

Commit 9b7e4a9

Browse files
committed
Several Fixes and Improvements
Fixed: - #2 - #3 - Drivetrain Speed Input Type - Lightbox Warning Light Label - Request Master on Spawn Label - Passenger Interfaces Namings Other Changes - Removed DRLs - A bit of cleaning up in the MCs
1 parent c6f8555 commit 9b7e4a9

8 files changed

+2415
-3554
lines changed

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

+233-431
Large diffs are not rendered by default.

Drivetrain Group/SRC-TCP [RO Interface] Drivetrain (Brakes Only) v1_3.xml

+129-309
Large diffs are not rendered by default.

Lighting Group/SRC-TCP [Extender] Lightbox.xml

+56-126
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<microprocessor name="SRC-TCP [Extender] Lightbox" description="Interacts with TCP Lighting Interface to control train lights" width="3" length="5" id_counter="612" id_counter_node="51" sym2="4" sym3="2" sym4="8191" sym5="8194" sym6="9508" sym7="1184" sym8="3232" sym9="11636" sym10="16388" sym11="65528" sym12="16384" sym13="8192">
2+
<microprocessor name="SRC-TCP [Extender] Lightbox" description="Interacts with TCP Lighting Interface to control train lights" width="3" length="4" id_counter="612" id_counter_node="51" 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="38" component_id="554">
55
<node label="Interface" mode="1" type="5" description="Communicates with lighting interface"/>
@@ -35,40 +35,30 @@
3535
</node>
3636
</n>
3737
<n id="45" component_id="568">
38-
<node label="Work Lights" description="Connects to work lights (optional, can be renamed)">
38+
<node label="Work Lights" description="Connects to Work Lights (Optional)">
3939
<position z="1"/>
4040
</node>
4141
</n>
4242
<n id="46" component_id="570">
43-
<node label="Warning Lights" description="Connects to warning lights (optional, can be renamed)">
43+
<node label="Hazard Lights" description="Connects to Hazard Lights (Optional)">
4444
<position z="2"/>
4545
</node>
4646
</n>
4747
<n id="47" component_id="572">
48-
<node label="Decorative Lights" description="Connects to decorative lighting (optional, can be renamed)">
48+
<node label="Decorative Lights" description="Connects to Decorative Lights (Optional)">
4949
<position z="3"/>
5050
</node>
5151
</n>
5252
<n id="48" component_id="575">
53-
<node label="Front RGB" type="5" description="Front RGB lights. Displays DRL/Headlights/Taillights">
53+
<node label="Front RGB" type="5" description="Front RGB Lights. Combined Headlights/Taillights">
5454
<position x="1"/>
5555
</node>
5656
</n>
5757
<n id="49" component_id="578">
58-
<node label="Rear RGB" type="5" description="Rear RGB Lights. Displays DRL/Headlights/Taillights">
58+
<node label="Rear RGB" type="5" description="Rear RGB Lights. Combined Headlights/Taillights">
5959
<position x="2"/>
6060
</node>
6161
</n>
62-
<n id="50" component_id="597">
63-
<node label="DRL Front" description="Daytime Running Lights Front">
64-
<position x="1" z="4"/>
65-
</node>
66-
</n>
67-
<n id="51" component_id="599">
68-
<node label="DRL Rear" description="Daytime Running Lights Rear">
69-
<position x="2" z="4"/>
70-
</node>
71-
</n>
7262
</nodes>
7363
<group>
7464
<data>
@@ -92,18 +82,6 @@
9282
<in3 component_id="592"/>
9383
</object>
9484
</c>
95-
<c type="29">
96-
<object id="581" i="1">
97-
<pos x="-1.25" y="2"/>
98-
<in1 component_id="554"/>
99-
</object>
100-
</c>
101-
<c type="29">
102-
<object id="582" i="2">
103-
<pos x="-1.25" y="1.5"/>
104-
<in1 component_id="554"/>
105-
</object>
106-
</c>
10785
<c type="29">
10886
<object id="583" i="3">
10987
<pos x="-1.25" y="0.75"/>
@@ -194,18 +172,6 @@
194172
<in1 component_id="554"/>
195173
</object>
196174
</c>
197-
<c type="44">
198-
<object id="602" l="DRL Front" on="ON" off="OFF">
199-
<pos x="2.25" y="2"/>
200-
<in1 component_id="581"/>
201-
</object>
202-
</c>
203-
<c type="44">
204-
<object id="603" l="DRL Rear" on="ON" off="OFF">
205-
<pos x="2.25" y="1.5"/>
206-
<in1 component_id="582"/>
207-
</object>
208-
</c>
209175
<c type="44">
210176
<object id="604" l="Front Headlights" on="ON" off="OFF">
211177
<pos x="2.25" y="0.75"/>
@@ -264,7 +230,7 @@
264230
<components_bridge>
265231
<c type="4">
266232
<object id="554">
267-
<pos x="-3" y="2"/>
233+
<pos x="-3" y="0.75"/>
268234
</object>
269235
</c>
270236
<c type="1">
@@ -333,18 +299,6 @@
333299
<in1 component_id="579"/>
334300
</object>
335301
</c>
336-
<c type="1">
337-
<object id="597">
338-
<pos x="0.5" y="2"/>
339-
<in1 component_id="581"/>
340-
</object>
341-
</c>
342-
<c type="1">
343-
<object id="599">
344-
<pos x="0.5" y="1.5"/>
345-
<in1 component_id="582"/>
346-
</object>
347-
</c>
348302
</components_bridge>
349303
<groups/>
350304
<component_states>
@@ -360,122 +314,106 @@
360314
<in2 component_id="591"/>
361315
<in3 component_id="592"/>
362316
</c1>
363-
<c2 id="581" i="1">
364-
<pos x="-1.25" y="2"/>
365-
<in1 component_id="554"/>
366-
</c2>
367-
<c3 id="582" i="2">
368-
<pos x="-1.25" y="1.5"/>
369-
<in1 component_id="554"/>
370-
</c3>
371-
<c4 id="583" i="3">
317+
<c2 id="583" i="3">
372318
<pos x="-1.25" y="0.75"/>
373319
<in1 component_id="554"/>
374-
</c4>
375-
<c5 id="584" i="4">
320+
</c2>
321+
<c3 id="584" i="4">
376322
<pos x="-1.25" y="0.25"/>
377323
<in1 component_id="554"/>
378-
</c5>
379-
<c6 id="585" i="5">
324+
</c3>
325+
<c4 id="585" i="5">
380326
<pos x="-1.25" y="-0.5"/>
381327
<in1 component_id="554"/>
382-
</c6>
383-
<c7 id="586" i="6">
328+
</c4>
329+
<c5 id="586" i="6">
384330
<pos x="-1.25" y="-1"/>
385331
<in1 component_id="554"/>
386-
</c7>
387-
<c8 id="587" i="7">
332+
</c5>
333+
<c6 id="587" i="7">
388334
<pos x="-1.25" y="-1.75"/>
389335
<in1 component_id="554"/>
390-
</c8>
391-
<c9 id="588" i="8">
336+
</c6>
337+
<c7 id="588" i="8">
392338
<pos x="-1.25" y="-2.25"/>
393339
<in1 component_id="554"/>
394-
</c9>
395-
<c10 id="589" i="9">
340+
</c7>
341+
<c8 id="589" i="9">
396342
<pos x="-1.25" y="-3"/>
397343
<in1 component_id="554"/>
398-
</c10>
399-
<c11 id="590">
344+
</c8>
345+
<c9 id="590">
400346
<pos x="-1.25" y="-5"/>
401347
<in1 component_id="554"/>
402-
</c11>
403-
<c12 id="591" i="1">
348+
</c9>
349+
<c10 id="591" i="1">
404350
<pos x="-1.25" y="-5.5"/>
405351
<in1 component_id="554"/>
406-
</c12>
407-
<c13 id="592" i="2">
352+
</c10>
353+
<c11 id="592" i="2">
408354
<pos x="-1.25" y="-6"/>
409355
<in1 component_id="554"/>
410-
</c13>
411-
<c14 id="593" i="3">
356+
</c11>
357+
<c12 id="593" i="3">
412358
<pos x="-1.25" y="-6.75"/>
413359
<in1 component_id="554"/>
414-
</c14>
415-
<c15 id="594" i="4">
360+
</c12>
361+
<c13 id="594" i="4">
416362
<pos x="-1.25" y="-7.25"/>
417363
<in1 component_id="554"/>
418-
</c15>
419-
<c16 id="595" i="5">
364+
</c13>
365+
<c14 id="595" i="5">
420366
<pos x="-1.25" y="-7.75"/>
421367
<in1 component_id="554"/>
422-
</c16>
423-
<c17 id="600" i="10">
368+
</c14>
369+
<c15 id="600" i="10">
424370
<pos x="-1.25" y="-3.5"/>
425371
<in1 component_id="554"/>
426-
</c17>
427-
<c18 id="601" i="11">
372+
</c15>
373+
<c16 id="601" i="11">
428374
<pos x="-1.25" y="-4"/>
429375
<in1 component_id="554"/>
430-
</c18>
431-
<c19 id="602" l="DRL Front" on="ON" off="OFF">
432-
<pos x="2.25" y="2"/>
433-
<in1 component_id="581"/>
434-
</c19>
435-
<c20 id="603" l="DRL Rear" on="ON" off="OFF">
436-
<pos x="2.25" y="1.5"/>
437-
<in1 component_id="582"/>
438-
</c20>
439-
<c21 id="604" l="Front Headlights" on="ON" off="OFF">
376+
</c16>
377+
<c17 id="604" l="Front Headlights" on="ON" off="OFF">
440378
<pos x="2.25" y="0.75"/>
441379
<in1 component_id="583"/>
442-
</c21>
443-
<c22 id="605" l="Rear Headlights" on="ON" off="OFF">
380+
</c17>
381+
<c18 id="605" l="Rear Headlights" on="ON" off="OFF">
444382
<pos x="2.25" y="0.25"/>
445383
<in1 component_id="584"/>
446-
</c22>
447-
<c23 id="606" l="Front Taillights" on="ON" off="OFF">
384+
</c18>
385+
<c19 id="606" l="Front Taillights" on="ON" off="OFF">
448386
<pos x="2.25" y="-0.5"/>
449387
<in1 component_id="585"/>
450-
</c23>
451-
<c24 id="607" l="Rear Taillights" on="ON" off="OFF">
388+
</c19>
389+
<c20 id="607" l="Rear Taillights" on="ON" off="OFF">
452390
<pos x="2.25" y="-1"/>
453391
<in1 component_id="586"/>
454-
</c24>
455-
<c25 id="608" l="Front Highbeams" on="ON" off="OFF">
392+
</c20>
393+
<c21 id="608" l="Front Highbeams" on="ON" off="OFF">
456394
<pos x="2.25" y="-1.75"/>
457395
<in1 component_id="587"/>
458-
</c25>
459-
<c26 id="609" l="Rear Highbeams" on="ON" off="OFF">
396+
</c21>
397+
<c22 id="609" l="Rear Highbeams" on="ON" off="OFF">
460398
<pos x="2.25" y="-2.25"/>
461399
<in1 component_id="588"/>
462-
</c26>
463-
<c27 id="610" l="Work Lights" on="ON" off="OFF">
400+
</c22>
401+
<c23 id="610" l="Work Lights" on="ON" off="OFF">
464402
<pos x="2.25" y="-3"/>
465403
<in1 component_id="589"/>
466-
</c27>
467-
<c28 id="611" l="Warning Lights" on="ON" off="OFF">
404+
</c23>
405+
<c24 id="611" l="Warning Lights" on="ON" off="OFF">
468406
<pos x="2.25" y="-3.5"/>
469407
<in1 component_id="600"/>
470-
</c28>
471-
<c29 id="612" l="Decorative Lights" on="ON" off="OFF">
408+
</c24>
409+
<c25 id="612" l="Decorative Lights" on="ON" off="OFF">
472410
<pos x="2.25" y="-4"/>
473411
<in1 component_id="601"/>
474-
</c29>
412+
</c25>
475413
</component_states>
476414
<component_bridge_states>
477415
<c0 id="554">
478-
<pos x="-3" y="2"/>
416+
<pos x="-3" y="0.75"/>
479417
</c0>
480418
<c1 id="556">
481419
<pos x="0.5" y="0.75"/>
@@ -521,14 +459,6 @@
521459
<pos x="2.25" y="-6.5"/>
522460
<in1 component_id="579"/>
523461
</c11>
524-
<c12 id="597">
525-
<pos x="0.5" y="2"/>
526-
<in1 component_id="581"/>
527-
</c12>
528-
<c13 id="599">
529-
<pos x="0.5" y="1.5"/>
530-
<in1 component_id="582"/>
531-
</c13>
532462
</component_bridge_states>
533463
<group_states/>
534464
</group>

0 commit comments

Comments
 (0)