diff --git a/help/en/releasenotes/current-draft-note.shtml b/help/en/releasenotes/current-draft-note.shtml index 4898565cdea..3e8340442ca 100644 --- a/help/en/releasenotes/current-draft-note.shtml +++ b/help/en/releasenotes/current-draft-note.shtml @@ -468,7 +468,7 @@

Signal Systems

Signal Heads

diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A-held.gif new file mode 100644 index 00000000000..a9f3cc1b64b Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A.gif new file mode 100644 index 00000000000..4a2c1ec4377 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240C.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240C.gif new file mode 100644 index 00000000000..0def36178f8 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240C.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240D.gif new file mode 100644 index 00000000000..0336499b282 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240E.gif new file mode 100644 index 00000000000..3c36525836b Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240F.gif new file mode 100644 index 00000000000..65bdcc9d956 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240N.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240N.gif new file mode 100644 index 00000000000..f8ddb657a57 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240N.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A-held.gif new file mode 100644 index 00000000000..8b634edb8f9 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A.gif new file mode 100644 index 00000000000..97a6994d746 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240C.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240C.gif new file mode 100644 index 00000000000..cf1f953a24e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240C.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240D.gif new file mode 100644 index 00000000000..84936fd0f78 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240E.gif new file mode 100644 index 00000000000..8f1bcf97c28 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240F.gif new file mode 100644 index 00000000000..7c83020f017 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240N.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240N.gif new file mode 100644 index 00000000000..c089aece9e5 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240N.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240B.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240B.gif new file mode 100644 index 00000000000..984211bb753 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240B.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240D.gif new file mode 100644 index 00000000000..047eeb73758 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240E.gif new file mode 100644 index 00000000000..90e107c3f1e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240F.gif new file mode 100644 index 00000000000..2a3550d7a0a Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A-held.gif new file mode 100644 index 00000000000..08f48af95a7 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A.gif new file mode 100644 index 00000000000..08c4d8c0d06 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240C.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240C.gif new file mode 100644 index 00000000000..516c0e802dd Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240C.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240D.gif new file mode 100644 index 00000000000..f9a45df069f Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240E.gif new file mode 100644 index 00000000000..e032a7f0a3f Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240F.gif new file mode 100644 index 00000000000..2033e44eef8 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240G.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240G.gif new file mode 100644 index 00000000000..fad78a74d00 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240G.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240K.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240K.gif new file mode 100644 index 00000000000..39c8d3409b5 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240K.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240L.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240L.gif new file mode 100644 index 00000000000..c515c328db4 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240L.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240M.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240M.gif new file mode 100644 index 00000000000..4441ccebe13 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240M.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunar.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunar.gif new file mode 100644 index 00000000000..101e0702bac Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunar.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunarDiv.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunarDiv.gif new file mode 100644 index 00000000000..d929714255a Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunarDiv.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A-held.gif new file mode 100644 index 00000000000..3d5272f18bd Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A.gif new file mode 100644 index 00000000000..653b8978717 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-div.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-div.gif new file mode 100644 index 00000000000..dc750d656c1 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-div.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-normal.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-normal.gif new file mode 100644 index 00000000000..5c5e23a714d Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-normal.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240D.gif new file mode 100644 index 00000000000..0768b1eff9b Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240E.gif new file mode 100644 index 00000000000..99879bac6d1 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F-alt.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F-alt.gif new file mode 100644 index 00000000000..fe6ff1b6528 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F-alt.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F.gif new file mode 100644 index 00000000000..8665b6f217f Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240G.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240G.gif new file mode 100644 index 00000000000..f6a842b26a5 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240G.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240K.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240K.gif new file mode 100644 index 00000000000..8e4486fe3b8 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240K.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240L.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240L.gif new file mode 100644 index 00000000000..dcceaa04e46 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240L.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240M.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240M.gif new file mode 100644 index 00000000000..d59954b21fc Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240M.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunar.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunar.gif new file mode 100644 index 00000000000..17b82707e64 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunar.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunarDiv.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunarDiv.gif new file mode 100644 index 00000000000..dfaa3a954ee Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunarDiv.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240B.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240B.gif new file mode 100644 index 00000000000..06805018a38 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240B.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240D.gif new file mode 100644 index 00000000000..1f8997c488a Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240E.gif new file mode 100644 index 00000000000..d43b98e32f7 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F-alt.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F-alt.gif new file mode 100644 index 00000000000..ff55f7a5794 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F-alt.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F.gif new file mode 100644 index 00000000000..094071828fa Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240G.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240G.gif new file mode 100644 index 00000000000..020afd3cd8e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240G.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A-held.gif new file mode 100644 index 00000000000..e57d0e91eec Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A.gif new file mode 100644 index 00000000000..0374a7dab03 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240C.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240C.gif new file mode 100644 index 00000000000..c7556abe752 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240C.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240D.gif new file mode 100644 index 00000000000..c16ab124a5a Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240E.gif new file mode 100644 index 00000000000..6fa8b15684e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240F.gif new file mode 100644 index 00000000000..c7fe840fa1d Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240G.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240G.gif new file mode 100644 index 00000000000..8e03572596b Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240G.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-lunar.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-lunar.gif new file mode 100644 index 00000000000..5f679f8033e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-lunar.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-yellow.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-yellow.gif new file mode 100644 index 00000000000..c7c339f4bef Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-yellow.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/index.php b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/index.php new file mode 100644 index 00000000000..a61b777b9bb --- /dev/null +++ b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/index.php @@ -0,0 +1,25 @@ + + + + JMRI Icons + + +

JMRI Resources

+ + + + + + + + diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A-held.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A-held.gif new file mode 100644 index 00000000000..5765d622751 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A-held.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A.gif new file mode 100644 index 00000000000..7f444bb72ce Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240C.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240C.gif new file mode 100644 index 00000000000..75dd3af8f95 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240C.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240D.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240D.gif new file mode 100644 index 00000000000..f16b6db1d3b Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240D.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240E.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240E.gif new file mode 100644 index 00000000000..32a001db9b7 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240E.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F-alt.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F-alt.gif new file mode 100644 index 00000000000..eae567269d7 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F-alt.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F.gif new file mode 100644 index 00000000000..e7185241158 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240G.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240G.gif new file mode 100644 index 00000000000..ee458d2221e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240G.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240K.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240K.gif new file mode 100644 index 00000000000..d3b21015d0e Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240K.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240L.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240L.gif new file mode 100644 index 00000000000..4fef315e168 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240L.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M-alt.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M-alt.gif new file mode 100644 index 00000000000..6bc74e1f81f Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M-alt.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M.gif new file mode 100644 index 00000000000..7dd6d5c5cab Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-lunar.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-lunar.gif new file mode 100644 index 00000000000..de2ac1c250c Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-lunar.gif differ diff --git a/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-yellow.gif b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-yellow.gif new file mode 100644 index 00000000000..90ff1c29d11 Binary files /dev/null and b/resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-yellow.gif differ diff --git a/xml/signals/CCOR-1967/appearance-SL-1-dwarf.xml b/xml/signals/CCOR-1967/appearance-SL-1-dwarf.xml new file mode 100644 index 00000000000..2bf0b16d3f0 --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-1-dwarf.xml @@ -0,0 +1,223 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-21 + MKZ + Initial version + + + 1.1.1 + 2020-06-11 + MKZ + fix Approach aspect mapping + + + 1.1.2 + 2020-06-13 + MKZ + added Restricting to Stop aspect mapping + + + 1.2.1 + 2020-07-04 + MKZ + added Advance Approach to Clear aspectMapping, allows proceed indication for R/Y signal head + + + 1.2.2 + 2020-07-04 + MKZ + added Advance Approach to Advance Approach aspectMapping, allows proceed indication for R/Y signal head + + + 1.2.3 + 2020-07-04 + MKZ + added Advance Approach to Advance Approach Alt aspectMapping, allows proceed indication for R/Y signal head + + + 1.2.4 + 2020-07-04 + MKZ + added Advance Approach to Approach Diverging aspectMapping, allows proceed indication for R/Y signal head + + + 1.2.5 + 2020-07-04 + MKZ + added Advance Approach to Approach aspectMapping, allows proceed indication for R/Y signal head + + + + CCOR-1967 + Single head dwarf signal + http://gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + Appearances for one-head dwarf signal without other badging + + + + + Clear + green + Page 53, RULE 240E + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240E.gif + + + + Advance Approach + flashyellow + Page 54, RULE 240F Fig.6 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240F.gif + + + + Approach + yellow + Page 53, RULE 240D + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240D.gif + + + + Restricting + lunar + Page 55, RULE 240N + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240N.gif + + + + Flashing Stop and Proceed + flashred + Page 53, RULE 240A + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240C.gif + + + + Stop + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-dwarf/rule-240A-held.gif + + + + + + Clear + Clear + Advance Approach + + + + Advance Approach + Clear + Advance Approach + + + + Advance Approach Alt + Clear + Advance Approach + + + + Approach Diverging + Clear + Advance Approach + + + + Diverging Clear + Approach + + + + Diverging Clear Alt + Approach + + + + Diverging Advance Approach + Approach + + + + Diverging Approach + Approach + + + + Approach + Clear + Advance Approach + + + + Restricting + Approach + + + + Restricting Lunar + Approach + + + + Restricting Lunar Div + Approach + + + + Flashing Stop and Proceed Div + Approach + + + + Flashing Stop and Proceed + Approach + + + + Stop and Proceed + Approach + + + + Stop + Approach + Restricting + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-1-high-abs.xml b/xml/signals/CCOR-1967/appearance-SL-1-high-abs.xml new file mode 100644 index 00000000000..e1f35fb097b --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-1-high-abs.xml @@ -0,0 +1,182 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-29 + MKZ + Initial version + + + 1.1 + 2020-06-11 + MKZ + fix Approach aspect mapping + + + + CCOR-1967 + Single head absolute signal + http://gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + Appearances for one-head high-mast absolute block signal + + + + Clear + green + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240E.gif + + + + Advance Approach + flashyellow + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240F.gif + + + + Approach + yellow + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240D.gif + + + + Restricting + lunar + Page 55 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240N.gif + + + + Flashing Stop and Proceed + flashred + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240C.gif + + + + Stop + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-abs/rule-240A-held.gif + + + + + + Clear + Clear + + + + Advance Approach + Clear + + + + Advance Approach Alt + Clear + + + + Approach Diverging + Clear + + + + Diverging Clear + Approach + + + + Diverging Clear Alt + Approach + + + + Diverging Advance Approach + Approach + + + + Diverging Approach + Approach + + + + Approach + Advance Approach + Clear + + + + Restricting + Approach + + + + Restricting Lunar + Approach + + + + Restricting Lunar Div + Approach + + + + Flashing Stop and Proceed + Approach + + + + Flashing Stop and Proceed Div + Approach + + + + Stop and Proceed + Approach + + + + Stop + Approach + + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-1-high-pbs.xml b/xml/signals/CCOR-1967/appearance-SL-1-high-pbs.xml new file mode 100644 index 00000000000..75eaad87b5d --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-1-high-pbs.xml @@ -0,0 +1,164 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-21 + MKZ + Initial version + + + 1.1 + 2020-06-11 + MKZ + fix Approach aspect mapping + + + + CCOR-1967 + Single head permissive signal + http://www.gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + Appearances for one-head high-mast permissive block signal + + + + + Clear + green + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240E.gif + + + + Advance Approach + flashyellow + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240F.gif + + + + Approach + yellow + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240D.gif + + + + Stop and Proceed + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-1-high-pbs/rule-240B.gif + + + + + + Stop and Proceed + + + Stop and Proceed + + + + + + Clear + Clear + + + + Advance Approach + Clear + + + + Advance Approach Alt + Clear + + + + Approach Diverging + Clear + + + + Diverging Clear + Approach + + + + Diverging Clear Alt + Approach + + + + Diverging Advance Approach + Approach + + + + Diverging Approach + Approach + + + + Approach + Advance Approach + Clear + + + + Restricting + Approach + + + + Restricting Lunar + Approach + + + + Restricting Lunar Div + Approach + + + + Flashing Stop and Proceed Div + Approach + + + + Flashing Stop and Proceed + Approach + + + + Stop and Proceed + Approach + + + + Stop + Approach + + + + \ No newline at end of file diff --git a/xml/signals/CCOR-1967/appearance-SL-2-dwarf.xml b/xml/signals/CCOR-1967/appearance-SL-2-dwarf.xml new file mode 100644 index 00000000000..1320b0bb4dd --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-2-dwarf.xml @@ -0,0 +1,283 @@ + + + + + + + 20092010JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-30 + MKZ + Initial version + + + 1.1 + 2020-06-11 + MKZ + Revised diverging aspect mappings + + + 1.2 + 2020-07-04 + MKZ + revised Stop aspect mappings + + + 1.3.1 + 2020-07-04 + MKZ + added Flashing Stop and Proceed Div to Clear aspectMapping + + + 1.3.2 + 2020-07-04 + MKZ + added Flashing Stop and Proceed Div to Approach aspectMapping + + + 1.3.e + 2020-07-04 + MKZ + added Flashing Stop and Proceed Div to Flashing Stop and Proceed aspectMapping + + + + CCOR-1967 + Double head dwarf signal + As described in the Consolidated Code of Operating Rules, Edition of 1967. Pages 53-55 + Appearances for a two-head dwarf signal without other badging + + + + Clear + green + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240E.gif + + + + Advance Approach + flashyellow + red + Page 54, RULE 240F Fig.5 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240F.gif + + + + Approach Diverging + yellow + yellow + Page 54, RULE 240G Fig.4 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240G.gif + + + + Diverging Clear + red + green + Page 54, RULE 240M Fig.3 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240M.gif + + + + Diverging Advance Approach + red + flashyellow + Page 54, RULE 240K Fig.3 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240K.gif + + + + Diverging Approach + red + yellow + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240L.gif + + + + Approach + yellow + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240D.gif + + + + Restricting Lunar + lunar + red + Page 55, Rule 240N Fig.6 + Lunar aspect for upper head in route-signal system + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunar.gif + + + + Restricting Lunar Div + red + lunar + Page 55, Rule 240N Fig.5 + Lunar aspect for lower head in route-signal system + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240N-lunarDiv.gif + + + + Flashing Stop and Proceed + red + flashred + Page 53, Rule 240C + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240C.gif + + + + Flashing Stop and Proceed Div + red + flashred + Page 53, Rule 240C + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240C.gif + + + + Stop + red + red + Page 53, Rule 240A Fig.5 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-dwarf/rule-240A-held.gif + + + + + + Clear + Clear + Diverging Clear + Flashing Stop and Proceed Div + + + + Advance Approach + Clear + Diverging Clear + + + + Advance Approach Alt + Clear + Diverging Clear + + + + Approach Diverging + Clear + Diverging Clear + + + + Diverging Clear + Approach Diverging + Diverging Clear + + + + Diverging Clear Alt + Approach Diverging + Diverging Clear + + + + Diverging Advance Approach + Approach Diverging + Diverging Clear + + + + Diverging Approach + Approach Diverging + Diverging Advance Approach + Diverging Clear + + + + Approach + Clear + Advance Approach + Diverging Advance Approach + Diverging Clear + Flashing Stop and Proceed Div + + + + Restricting + Approach + Diverging Approach + + + + Restricting Lunar + Approach + Diverging Approach + + + + Restricting Lunar Div + Approach + Diverging Approach + + + + Flashing Stop and Proceed + Approach + Diverging Approach + Flashing Stop and Proceed Div + + + + Flashing Stop and Proceed Div + Approach + Diverging Approach + + + + Stop and Proceed + Approach + Diverging Approach + + + + Stop + Approach + Diverging Approach + Flashing Stop and Proceed + Flashing Stop and Proceed Div + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-2-high-abs.xml b/xml/signals/CCOR-1967/appearance-SL-2-high-abs.xml new file mode 100644 index 00000000000..445e8a998c0 --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-2-high-abs.xml @@ -0,0 +1,263 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-29 + MKZ + Initial version + + + 1.1.1 + 2020-06-04 + MKZ + added Clear and Diverging Clear to Approach aspectMapping + + + + CCOR-1967 + Double head absolute signal + http://gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + Appearances for a two-head absolute block signal + + + + + Clear + green + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240E.gif + + + + Advance Approach + flashyellow + red + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F.gif + + + + Advance Approach Alt + yellow + green + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240F-alt.gif + + + + Approach Diverging + yellow + yellow + Page 54, RULE 240G Fig.1 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240G.gif + + + + Diverging Clear + red + green + Page 54, RULE 240M Fig.1 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240M.gif + + + + Diverging Advance Approach + red + flashyellow + Page 54, RULE 240K Fig.1 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240K.gif + + + + Diverging Approach + red + yellow + Page 54, RULE 240L Fig.1 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240L.gif + + + + Approach + yellow + red + Page 53, RULE 240D Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240D.gif + + + + Restricting Lunar + lunar + red + Page 55, RULE 240N Fig.8 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunar.gif + + + + Restricting Lunar Div + red + lunar + Page 55, RULE240N Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240N-lunarDiv.gif + + + + Flashing Stop and Proceed + flashred + red + Page 53, RULE 240C Fig.7 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-normal.gif + + + + Flashing Stop and Proceed Div + red + flashred + Page 53, RULE240C Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240C-div.gif + + + + Stop + red + red + Page 53, RULE 240A, Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-abs/rule-240A-held.gif + + + + + + Clear + Clear + Diverging Clear + + + + Advance Approach + Clear + Diverging Clear + + + + Advance Approach Alt + Clear + Diverging Clear + + + + Approach Diverging + Clear + Diverging Clear + + + + Diverging Clear + Approach Diverging + Diverging Clear + + + + Diverging Clear Alt + Approach Diverging + Diverging Clear + + + + Diverging Advance Approach + Approach Diverging + Diverging Clear + + + + Diverging Approach + Approach Diverging + Diverging Advance Approach + + + + Approach + Advance Approach + Advance Approach Alt + Clear + Diverging Clear + Diverging Advance Approach + + + + Restricting + Approach + Diverging Approach + + + + Restricting Lunar + Approach + Diverging Approach + + + + Restricting Lunar Div + Approach + Diverging Approach + + + + Flashing Stop and Proceed + Approach + Diverging Approach + + + + Flashing Stop and Proceed Div + Approach + Diverging Approach + + + + Stop and Proceed + Approach + Diverging Approach + + + + Stop + Approach + Diverging Approach + Flashing Stop and Proceed Div + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-2-high-pbs.xml b/xml/signals/CCOR-1967/appearance-SL-2-high-pbs.xml new file mode 100644 index 00000000000..aae4bab5824 --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-2-high-pbs.xml @@ -0,0 +1,177 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-29 + MKZ + Initial version + + + + CCOR-1967 + Double head permissive block signal + http://www.gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + Appearances for a two-head permissive block signal + + + + Clear + green + red + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240E.gif + + + + Advance Approach + flashyellow + red + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F.gif + + + + Advance Approach Alt + yellow + green + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240F-alt.gif + + + + Approach Diverging + yellow + yellow + Page 54 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240G.gif + + + + Approach + yellow + red + Page 53, RULE 240D + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240D.gif + + + + Stop and Proceed + red + red + Page 53, RULE 240B Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-high-pbs/rule-240B.gif + + + + + + Stop and Proceed + + + Stop and Proceed + + + + + + Clear + Clear + + + + Advance Approach + Clear + + + + Advance Approach Alt + Clear + + + + Approach Diverging + Clear + + + + Diverging Clear + Approach Diverging + + + + Diverging Clear Alt + Approach Diverging + + + + Diverging Advance Approach + Approach Diverging + + + + Diverging Approach + Approach Diverging + + + + Approach + Advance Approach + Advance Approach Alt + + + + Restricting + Approach + + + + Restricting Lunar + Approach + + + + Restricting Lunar Div + Approach + + + + Flashing Stop and Proceed + Approach + + + + Flashing Stop and Proceed Div + Approach + + + + Stop and Proceed + Approach + + + + Stop + Approach + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-2-low.xml b/xml/signals/CCOR-1967/appearance-SL-2-low.xml new file mode 100644 index 00000000000..f1f526509ab --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-2-low.xml @@ -0,0 +1,251 @@ + + + + + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-30 + MKZ + Initial version + + + 1.1 + 2020-07-04 + MKZ + added Clear to Approach aspectMapping + + + + CCOR-1967 + Double head signal A-C + As described in The Consolidated Code of Operating Rules, Edition of 1967. Pages 53-55 + Appearances for a two-head absolute block signal without middle arm + + + + Clear + green + red + Page 53, Rule 240E + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240E.gif + + + + Advance Approach + flashyellow + red + Page 54, Rule 240F + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240F.gif + + + + Approach Diverging + yellow + yellow + Page 54, Rule 240G + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240G.gif + + + + Approach + yellow + red + Page 53, Rule 240D + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240D.gif + + + + Restricting + red + yellow + Page 55, Rule 240N + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-yellow.gif + + + + Restricting Lunar + red + lunar + Page 55, Rule 240N + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-lunar.gif + + + + Restricting Lunar Div + red + lunar + Page 55, Rule 240N + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240N-lunar.gif + + + + Flashing Stop and Proceed + red + flashred + Page 53, RULE 240C + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240C.gif + + + + Flashing Stop and Proceed Div + red + flashred + Page 53, RULE 240C Fig.3 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240C.gif + + + + Stop + red + red + Page 53, RULE 240A + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-2-low/rule-240A-held.gif + + + + + + Clear + Clear + Restricting + Restricting Lunar Div + + + + Advance Approach + Clear + Restricting + Restricting Lunar Div + + + + Advance Approach Alt + Clear + Restricting + Restricting Lunar Div + + + + Approach Diverging + Clear + Restricting + Restricting Lunar Div + + + + Diverging Clear + Approach Diverging + Restricting + Restricting Lunar Div + + + + Diverging Clear Alt + Approach Diverging + Restricting + Restricting Lunar Div + + + + Diverging Advance Approach + Approach Diverging + Restricting + Restricting Lunar Div + + + + Diverging Approach + Approach Diverging + Restricting + Restricting Lunar Div + + + + Approach + Clear + Advance Approach + Restricting + Restricting Lunar Div + + + + Restricting + Approach + Restricting + Restricting Lunar Div + + + + Restricting Lunar + Approach + Restricting + Restricting Lunar Div + + + + Restricting Lunar Div + Approach + Restricting + Restricting Lunar Div + + + + Flashing Stop and Proceed + Approach + Restricting + Restricting Lunar Div + + + + Flashing Stop and Proceed Div + Approach + Restricting + Restricting Lunar Div + + + + Stop and Proceed + Approach + Restricting + Restricting Lunar Div + + + + Stop + Approach + Restricting + Restricting Lunar Div + + + + diff --git a/xml/signals/CCOR-1967/appearance-SL-3-high.xml b/xml/signals/CCOR-1967/appearance-SL-3-high.xml new file mode 100644 index 00000000000..ae65b3145c8 --- /dev/null +++ b/xml/signals/CCOR-1967/appearance-SL-3-high.xml @@ -0,0 +1,308 @@ + + + + + + + 2019 + JMRI + + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-29 + MKZ + Initial version + + + 1.1 + 2020-06-09 + MKZ + fix Approach aspect mapping + + + + CCOR-1967 + Triple head signal + As described in The Consolidated Code of Operating Rules, Edition of 1967. Pages 53-55 + Appearances for a three-head absolute block signal + + + + + Clear + green + red + red + Page 53, RULE 240E + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240E.gif + + + + Advance Approach + flashyellow + red + red + Page 54, RULE 240F Fig.4 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F.gif + + + + Advance Approach Alt + yellow + green + red + Page 54, RULE 240F Fig.10 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240F-alt.gif + + + + Approach Diverging + yellow + yellow + red + Page 54, RULE 240G Fig.3 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240G.gif + + + + Diverging Clear + red + green + red + Page 54, RULE 240M Fig.2 + Diverging aspect for medium-speed route + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M.gif + + + + Diverging Clear Alt + red + red + green + Page 54, RULE 240M Fig.4 + Diverging aspect for low-speed route + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240M-alt.gif + + + + Diverging Advance Approach + red + flashyellow + red + Page 54, RULE 240K Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240K.gif + + + + Diverging Approach + red + yellow + red + Page 54, RULE 240L Fig.2 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240L.gif + + + + Approach + yellow + red + red + Page 53, RULE 240D Fig.4 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240D.gif + + + + Restricting + red + red + yellow + Page 55, RULE 240N + Restricting aspect with lower-head yellow displayed + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-yellow.gif + + + + Restricting Lunar + red + red + lunar + Page 55, RULE 240N + Restricting aspect with lower Lunar displayed + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-lunar.gif + + + + Restricting Lunar Div + red + red + lunar + Page 55, RULE 240N + Duplicate aspect due to route-signaling system + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240N-lunar.gif + + + + Flashing Stop and Proceed + red + red + flashred + Page 53 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240C.gif + + + + Flashing Stop and Proceed Div + red + red + flashred + Page 53 + Duplicate aspect due to route-signaling system + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240C.gif + + + + Stop + red + red + red + Page 53, RULE 240A Fig.4 + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A.gif + + + + + + Stop + + + Flashing Stop and Proceed + + + Stop + preference:resources/icons/smallschematics/aspects/CCOR-1967/SL-3-high/rule-240A-held.gif + + + + + + Clear + Clear + Diverging Clear + Diverging Clear Alt + + + + Advance Approach + Clear + Diverging Clear + Diverging Clear Alt + + + + Advance Approach Alt + Clear + Diverging Clear + Diverging Clear Alt + + + + Approach Diverging + Clear + Diverging Clear + Diverging Clear Alt + + + + Diverging Clear + Approach Diverging + Diverging Clear + Diverging Clear Alt + + + + Diverging Clear Alt + Approach Diverging + Diverging Clear + Diverging Clear Alt + + + + Diverging Advance Approach + Approach Diverging + Diverging Clear + Diverging Clear Alt + + + + Diverging Approach + Approach Diverging + Diverging Advance Approach + + + + Approach + Advance Approach + Advance Approach Alt + Diverging Advance Approach + + + + Restricting + Approach + Diverging Approach + + + + Restricting Lunar + Approach + Diverging Approach + + + + Restricting Lunar Div + Approach + Diverging Approach + + + + Flashing Stop and Proceed + Approach + Diverging Approach + + + + Flashing Stop and Proceed Div + Approach + Diverging Approach + + + + Stop and Proceed + Approach + Diverging Approach + + + + Stop + Approach + Diverging Approach + Restricting + Restricting Lunar + Restricting Lunar Div + + + + \ No newline at end of file diff --git a/xml/signals/CCOR-1967/aspects.xml b/xml/signals/CCOR-1967/aspects.xml new file mode 100644 index 00000000000..587a04f0acb --- /dev/null +++ b/xml/signals/CCOR-1967/aspects.xml @@ -0,0 +1,226 @@ + + + + + CCOR-1967 + 1967 + www.gn-npjointarchive.org/GN_Misc/ccor_1967.pdf + + + 2019 + JMRI + + + + + MarkZiebell + cpunclejoe@gmail.com + + + + + + 1 + 2019-12-21 + MKZ + Initial version + + + 2.1 + 2020-07-02 + MKZ + added Medium speed element to Diverging Clear + + + + + + + Stop + Rule 240A + Stop. + Page 53 + Stop + Stop + Either + + + + Stop and Proceed + Rule 240B + Stop before any part of train or engine passes the signal then proceed at restricted speed through the entire block. + Page 53 + Restricted + Restricted + Either + + + + Flashing Stop and Proceed + Rule 240C + Stop. Block occupied. Proceed at restricted speed. + Page 53, RULE 240C + Slow + Restricted + Normal + + + + Flashing Stop and Proceed Div + Rule 240C + Stop. Block occupied. Proceed at restricted speed. + Page 53, RULE 240C Fig.2 + Unofficial Name to provide for Diverging aspect in route-signal system + Slow + Restricted + Diverging + + + + Approach + Rule 240D + Proceed prepared to stop before any part of train or engine passes the next signal. Trains exceeding 40 MPH must immediately reduce to that speed. + Page 53 + Normal + Stop + Normal + + + + Clear + Rule 240E + Proceed. + Page 53 + Maximum + Maximum + Normal + + + + Advance Approach + Rule 240F + Proceed prepared to pass next signal at not exceeding 40 miles per hour. + Page 54 + Maximum + Normal + Normal + + + + Advance Approach Alt + Rule 240F + Proceed prepared to pass next signal at not exceeding 40 miles per hour. + Page 54, RULE 240F Figs. 9,10 + Alternate Advance Approach aspect + Maximum + Normal + Normal + + + + Approach Diverging + Rule 240G + Approach next signal prepared to proceed on diverging route at prescribed speed. + Page 54 + Normal + Limited + Normal + + + + Diverging Clear + Rule 240M + Proceed on diverging route at prescribed speed. + Page 54 + Diverging indication for medium speed route, in route-signaling system + Limited + Medium + Maximum + Diverging + + + + Diverging Clear Alt + Rule 240M + Proceed on diverging route at prescribed speed. + Page 54, RULE 240M Fig.4 + Diverging indication for lower speed route, in route-signaling system + Alternate Diverging Clear aspect for lower-speed route + Medium + Slow + Maximum + Diverging + + + + Diverging Advance Approach + Rule 240K + Proceed on diverging route at prescribed speed prepared to pass next signal at not exceeding 40 MPH. + Page 54 + Limited + Normal + Diverging + + + + Diverging Approach + Rule 240L + Proceed on diverging route at prescribed speed prepared to stop before any part of train or engine passes the next signal. + Page 54 + Limited + Stop + Diverging + + + + Restricting + Rule 240N + Proceed at restricted speed. + Page 55, RULE 240N + Slow + Restricted + Restricted + Either + + + + Restricting Lunar + Rule 240N + Proceed at restricted speed. + Page 55 RULE 240N Figs. 6, 8 + Unofficial Name for restricting indication on normal route, in route-signaling system + Unofficial Name to provide for Normal aspect in route-signal system + Slow + Restricted + Normal + + + + Restricting Lunar Div + Rule 240N + Proceed at restricted speed. + Page 55 RULE 240N Figs. 2-5 + Unofficial Name for restricting indication on diverging route, in route-signaling system + Unofficial Name to provide for Diverging aspect in route-signal system + Slow + Restricted + Diverging + + + + + + + + + + + + + + + + diff --git a/xml/signals/CCOR-1967/index.shtml b/xml/signals/CCOR-1967/index.shtml new file mode 100644 index 00000000000..6eb324ef3a6 --- /dev/null +++ b/xml/signals/CCOR-1967/index.shtml @@ -0,0 +1,52 @@ + + + + +JMRI: CCOR-1967 Signaling Definition + + + + + + + + + + + + +
+
+ +

+JMRI: CCOR-1967 Signaling Definition +

+ +

This directory contains signaling definitions corresponding to +the Consolidated Code of Operating Rules, Edition of 1967. Pages 53-55 +BLOCK AND INTERLOCKING SIGNALS (Excpet on Burlington Lines, Northern Pacific Ry., and S.P.&S. Ry.)

+ +

+See the +aspect page. + +

+Signal Mast definitions: +

+ +
+
+ + + diff --git a/xml/signals/index.shtml b/xml/signals/index.shtml index 3645ff07d7d..e9e35917a8c 100644 --- a/xml/signals/index.shtml +++ b/xml/signals/index.shtml @@ -19,7 +19,7 @@
-

+

JMRI: Signal System Definitions

@@ -36,7 +36,7 @@ The available definitions include:
basic -
A non-prototypical set of aspects and appearances that most +
A non-prototypical set of aspects and appearances that most model railroaders will understand easily.
AAR-1946 @@ -52,13 +52,13 @@ The available definitions include:
B&O-1980
1980 B&O CPL and semaphore - +
B&O-2009
2009 B&O (CSX) Color Position Lights - +
B&O-Semaphore
1969 B&O Semaphore masts only (works with B&O-2009 CPL) - +
BN-1989
1989 October Burlington Northern @@ -71,6 +71,9 @@ The available definitions include:
C&O-1980
Chessie System 1980 rule book for the C&O RR. +
CCOR-1967 +
Based up CCOR 1967 rulebook, as referenced. +
CFL-2014
Current info for Luxemburg in 2014 @@ -86,12 +89,12 @@ The available definitions include: CSD-1962-mechaniky – SZDC-2015-zakladni -
ČSD – Československé státní dráhy – Czechoslovakia signal definition 1962
+
ČSD – Československé státní dráhy – Czechoslovakia signal definition 1962
CSD-1962-zakladni – basic signals – Set 0
CSD-1962-cestova – intermediate signals – Set 1
CSD-1962-vlozena – embedded signals and hump yard signals – Set 2
CSD-1962-mechaniky – mechanical signals – Set 4
- SŽDC – Správa železniční dopravní cesty – Czech signal definition 2015
+ SŽDC – Správa železniční dopravní cesty – Czech signal definition 2015
SZDC-2015-zakladni – basic signals – Set 3
CSX-1998 @@ -101,7 +104,7 @@ The available definitions include:
CSX-2014-Chessie
CSX 2014 rule book (former Chessie rules) - +
DB HV 1969
1969 Deutsche Bundesbahn "Einheitsbauform" Home Signal/Distant signal (Hauptsignal/Vorsignal) system revision
@@ -140,13 +143,13 @@ The available definitions include:
1965 Rio Grande Rules of the Operating Department
SLSF-1973 -
1973 SLSF (Frisco) rules +
1973 SLSF (Frisco) rules
Missing some icons, not finished.
SOU-1981
1981 N&W - Southern Railway - +
SPTCO-1930
Southern Pacific Railway and Transportation Company 1930 rule book