formats and Y2 macs untouched

key_formats.c

@@ -4,7 +4,6 @@
 const KeyFormat all_formats[] = {
     {.manufacturer = "Kwikset",
      .format_name = "KW1",
-
      .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
      .first_pin_inch = 0.247,
      .last_pin_inch = 0.847,
@@ -49,8 +48,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.060,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will
-     // make 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.312,
      .deepest_depth_inch = 0.186,
      .depth_step_inch = 0.014,
@@ -68,8 +66,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.276,
      .deepest_depth_inch = 0.171,
      .depth_step_inch = 0.015,
@@ -87,8 +84,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.283,
      .deepest_depth_inch = 0.173,
      .depth_step_inch = 0.016,
@@ -100,20 +96,19 @@ const KeyFormat all_formats[] = {
     {.manufacturer = "Yale",
      .format_name = "Y2",
      .format_link = ".025",
-     .first_pin_inch = 0.200,
-     .last_pin_inch = 1.025,
-     .pin_increment_inch = 0.165,
+     .first_pin_inch = 0.250,
+     .last_pin_inch = 1.095,
+     .pin_increment_inch = 0.185,
      .pin_num = 6,
      .pin_width_inch = 0.054,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.320,
      .deepest_depth_inch = 0.145,
      .depth_step_inch = 0.025,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
-     .macs = 5,
+     .macs = 9,
      .clearance = 4},
 
     {.manufacturer = "Yale",
@@ -125,8 +120,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.246,
      .deepest_depth_inch = 0.167,
      .depth_step_inch = 0.020,
@@ -144,8 +138,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.063,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.328, // double check
      .deepest_depth_inch = 0.148,
      .depth_step_inch = 0.020,
@@ -163,8 +156,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.304,
      .deepest_depth_inch = 0.191,
      .depth_step_inch = 0.012,
@@ -182,8 +174,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.047,
      .elbow_inch = 0.1,
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.343,
      .deepest_depth_inch = 0.217,
      .depth_step_inch = 0.014,
@@ -276,8 +267,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.201, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.354,
      .deepest_depth_inch = 0.254,
      .depth_step_inch = 0.025,
@@ -298,8 +288,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.205, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.315,
      .deepest_depth_inch = 0.161,
      .depth_step_inch = 0.026,
@@ -320,8 +309,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.297, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.339,
      .deepest_depth_inch = 0.197,
      .depth_step_inch = 0.047,
@@ -341,8 +329,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.258,
      .deepest_depth_inch = 0.198,
      .depth_step_inch = 0.020,
@@ -362,8 +349,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.295,
      .deepest_depth_inch = 0.236,
      .depth_step_inch = 0.020,
@@ -384,8 +370,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.051,
      .elbow_inch = 0.081, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.318,
      .deepest_depth_inch = 0.206,
      .depth_step_inch = 0.025,
@@ -405,8 +390,7 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .elbow_inch = 0.126, // this should be equal to first pin inch for tip
      // stopped key line
-     .drill_angle = 90, // This should actually be 100 but the current resolution will make
-     // 100 degrees very ugly and unsuable
+     .drill_angle = 90,
      .uncut_depth_inch = 0.260,
      .deepest_depth_inch = 0.181,
      .depth_step_inch = 0.040,