diff --git a/resources/schlage.svg b/resources/schlage.svg
index 4c6c808..2f7ad6e 100644
--- a/resources/schlage.svg
+++ b/resources/schlage.svg
@@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="210mm"
@@ -16,29 +17,6 @@
id="svg61366"
inkscape:version="0.92.1 r"
sodipodi:docname="schlage.svg">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,282 +591,505 @@
+ inkscape:label="Layer 1">
+
-
+
-
+
-
+
-
+
-
+
+ inkscape:connector-curvature="0"
+ d="m 60.978331,159.31771 -3.31e-4,-1.51539 -0.955139,-2.032 v -0.25395 l 0.955139,-0.42334 -3.34e-4,-4.48733 h -0.954805 v 3.64067 l -0.954797,0.50788 -6.4e-5,1.27012 0.88666,1.86266 v 0.254 l -0.886596,0.42335 v 0.75365 z"
+ style="fill:#008000;stroke:none;stroke-width:0.08;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="warding_c" />
5 pin
- 6 pin
- C
- E
- F
- G
+ y="73.625519"
+ x="8.2682285"
+ id="tspan63671"
+ sodipodi:role="line">5 pin
+ 6 pin
+ C
+ E
+ F
+ G
+ inkscape:connector-curvature="0"
+ d="m 77.881135,150.6057 v 4.31799 l -0.3673,0.67733 v 0.254 l -0.58769,0.0847 v 0.59266 l 0.58769,0.254 v 0.59267 l 0.3673,0.762 v 1.17666 h -1.91 v -0.41465 l 0.8081,-0.33867 v -0.42334 l -0.22039,-0.254 v -0.762 l -0.58771,-0.84667 v -0.508 l 0.22038,-0.254 v -0.762 l 0.66114,-0.0847 v -4.06398 z"
+ style="fill:#008000;stroke:none;stroke-width:0.08;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="warding_ce" />
+ style="fill:#008000;stroke:#000000;stroke-width:0.08061625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="warding_ef" />
-
+
-
+
-
+
+ inkscape:connector-curvature="0"
+ d="m 97.814683,184.10852 0.0025,0.7098 0.495186,1.016 v 0.254 l -0.006,0.66721 c -0.006,0.101 0.0308,0.20757 0.12201,0.31748 l 0.308288,0.36998 3.33e-4,0.50004 h -1.910111 v -1.09271 l 0.990361,-0.42333 v -0.42334 l -0.990361,-0.762 v -0.67733 l 0.565907,-1.016 -0.212226,-0.33865 0.141515,-0.508 0.565902,-0.254 v -3.21734 h 0.848902 l -2.22e-4,3.38667 -0.587908,1.14594 c -0.0956,0.11269 -0.20495,0.2353 -0.333998,0.34558 z"
+ style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.08061636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="warding_k" />
H
+ x="71.171883"
+ id="tspan63671-2-1"
+ sodipodi:role="line">H
J
+ x="86.177689"
+ id="tspan63671-2-1-5"
+ sodipodi:role="line">J
K
+ x="94.720825"
+ id="tspan65362"
+ sodipodi:role="line">K
+ inkscape:connector-curvature="0"
+ d="m 87.129281,210.30035 -0.3673,-0.254 v -1.27 l -0.73461,-1.27 v -0.67734 l 0.44077,-0.254 0.66114,-0.762 2e-5,-3.89466 h -1.02844 l -2e-5,3.72533 -0.88153,1.86267 0.95499,1.18533 v 0.84667 l -0.95499,0.42333 v 0.66937 h 1.91 z"
+ style="fill:#008000;stroke:#000000;stroke-width:0.08215091;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="warding_l" />
L
+ x="83.700836"
+ id="tspan63671-2-1-5-6"
+ sodipodi:role="line">L
CE
- CE
+ EF
+ x="102.00618"
+ id="tspan63671-2-17-5"
+ sodipodi:role="line">EF
FG
- FG
+ These images taken fromThese images taken fromthe ILCO key blank directorythe ILCO key blank directoryhttps://www.imlss.com/images/pdf/KBD12.pdfhttps://www.imlss.com/images/pdf/KBD12.pdfpage 233
+ y="39.568203"
+ x="7.7881703"
+ sodipodi:role="line">page 233
-
+
+ d="M 59.342302,86.782747 V 114.7451 h 0.2873 V 86.782747 Z m -4.005864,-0.0197 V 114.7254 h 0.287294 V 86.763057 Z m -1.55603,0.0182 V 114.74359 H 54.0677 V 86.781247 Z m -1.556032,-0.0454 V 114.6982 h 0.287293 V 86.735847 Z m -4.533956,0.009 v 27.962313 h 0.287295 V 86.744827 Z m -1.675877,0.0119 V 114.7191 h 0.287294 V 86.756727 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.51999996;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.05451274;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ id="engrave_6pin" />
+
+ CP
+
+
+
+
+ CEP
+
+
+
+ EFP
+
+
+
+ FP
+
+
+
+ FGP
+
+
+
+ EP
+
+
+
+
+ LP
+
+
+
+ JP
+
+
+
+ HP
+
+
+ These image taken from Primus service manualPage 24
diff --git a/scad/schlage_primus.scad b/scad/schlage_primus.scad
index 9ed0358..67799ad 100644
--- a/scad/schlage_primus.scad
+++ b/scad/schlage_primus.scad
@@ -40,7 +40,7 @@ module side_bit_milling(cut_locations, bitting="") {
module schlage_primus(bitting="",
outline_name="6-pin",
- warding_name="C") {
+ warding_name="CP") {
name = "Schlage Primus Classic";
@@ -64,26 +64,24 @@ module schlage_primus(bitting="",
// TODO add primus keyways
- wardings_k = ["C",
- "CE",
- "E",
- "EF",
- "F",
- "FG",
- "H",
- "J",
- "K",
- "L"];
- wardings_v = [warding_c_points,
- warding_ce_points,
- warding_e_points,
- warding_ef_points,
- warding_f_points,
- warding_fg_points,
- warding_h_points,
- warding_j_points,
- warding_k_points,
- warding_l_points];
+ wardings_k = ["CP",
+ "CEP",
+ "EP",
+ "EFP",
+ "FP",
+ "FGP",
+ "HP",
+ "JP",
+ "LP"];
+ wardings_v = [warding_cp_points,
+ warding_cep_points,
+ warding_ep_points,
+ warding_efp_points,
+ warding_fp_points,
+ warding_fgp_points,
+ warding_hp_points,
+ warding_jp_points,
+ warding_lp_points];
outline_param = key_lkup(outlines_k, outlines_v, outline_name);
outline_points = outline_param[0];
@@ -126,5 +124,5 @@ module schlage_primus(bitting="",
// Defaults
bitting="";
outline="6-pin";
-warding="C";
+warding="CP";
schlage_primus(bitting, outline, warding);