Просмотр исходного кода

Revert "fixed sfic"

This reverts commit cce75909726568c4b73e873046737468bf930025.
zinongli 1 год назад
Родитель
Сommit
a79aeffdf8
1 измененных файлов с 32 добавлено и 47 удалено
  1. 32 47
      key_formats.c

+ 32 - 47
key_formats.c

@@ -4,7 +4,6 @@
 const KeyFormat all_formats[] = {
 const KeyFormat all_formats[] = {
     {.manufacturer = "Kwikset",
     {.manufacturer = "Kwikset",
      .format_name = "KW1",
      .format_name = "KW1",
-
      .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
      .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
      .first_pin_inch = 0.247,
      .first_pin_inch = 0.247,
      .last_pin_inch = 0.847,
      .last_pin_inch = 0.847,
@@ -49,15 +48,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.060,
      .pin_width_inch = 0.060,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.312,
      .deepest_depth_inch = 0.186,
      .deepest_depth_inch = 0.186,
      .depth_step_inch = 0.014,
      .depth_step_inch = 0.014,
      .min_depth_ind = 0,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .max_depth_ind = 9,
      .macs = 6,
      .macs = 6,
-     .clearance = 8},
+     .clearance = 7},
 
 
     {.manufacturer = "Master Lock",
     {.manufacturer = "Master Lock",
      .format_name = "M1",
      .format_name = "M1",
@@ -68,15 +66,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.276,
      .deepest_depth_inch = 0.171,
      .deepest_depth_inch = 0.171,
      .depth_step_inch = 0.015,
      .depth_step_inch = 0.015,
      .min_depth_ind = 0,
      .min_depth_ind = 0,
      .max_depth_ind = 7,
      .max_depth_ind = 7,
      .macs = 7,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 6},
 
 
     {.manufacturer = "American",
     {.manufacturer = "American",
      .format_name = "AM7",
      .format_name = "AM7",
@@ -87,15 +84,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.283,
      .deepest_depth_inch = 0.173,
      .deepest_depth_inch = 0.173,
      .depth_step_inch = 0.016,
      .depth_step_inch = 0.016,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 8,
      .max_depth_ind = 8,
      .macs = 7,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 5},
 
 
     {.manufacturer = "Yale",
     {.manufacturer = "Yale",
      .format_name = "Y2",
      .format_name = "Y2",
@@ -106,15 +102,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.054,
      .pin_width_inch = 0.054,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.320,
      .deepest_depth_inch = 0.145,
      .deepest_depth_inch = 0.145,
      .depth_step_inch = 0.025,
      .depth_step_inch = 0.025,
      .min_depth_ind = 0,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .max_depth_ind = 9,
      .macs = 9,
      .macs = 9,
-     .clearance = 1},
+     .clearance = 4},
 
 
     {.manufacturer = "Yale",
     {.manufacturer = "Yale",
      .format_name = "Y11",
      .format_name = "Y11",
@@ -125,15 +120,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.246,
      .deepest_depth_inch = 0.167,
      .deepest_depth_inch = 0.167,
      .depth_step_inch = 0.020,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 5,
      .max_depth_ind = 5,
      .macs = 7,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 3},
 
 
     {.manufacturer = "Sargent",
     {.manufacturer = "Sargent",
      .format_name = "S22",
      .format_name = "S22",
@@ -144,15 +138,14 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.063,
      .pin_width_inch = 0.063,
      .elbow_inch = 0.1,
      .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
      .uncut_depth_inch = 0.328, // double check
      .deepest_depth_inch = 0.148,
      .deepest_depth_inch = 0.148,
      .depth_step_inch = 0.020,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 10,
      .max_depth_ind = 10,
      .macs = 7,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 5},
 
 
     {.manufacturer = "National",
     {.manufacturer = "National",
      .format_name = "NA25",
      .format_name = "NA25",
@@ -163,8 +156,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.304,
      .deepest_depth_inch = 0.191,
      .deepest_depth_inch = 0.191,
      .depth_step_inch = 0.012,
      .depth_step_inch = 0.012,
@@ -182,8 +174,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.047,
      .pin_width_inch = 0.047,
      .elbow_inch = 0.1,
      .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,
      .uncut_depth_inch = 0.343,
      .deepest_depth_inch = 0.217,
      .deepest_depth_inch = 0.217,
      .depth_step_inch = 0.014,
      .depth_step_inch = 0.014,
@@ -262,7 +253,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 6,
      .max_depth_ind = 6,
      .macs = 5,
      .macs = 5,
-     .clearance = 8},
+     .clearance = 3},
 
 
     {.manufacturer = "Ford",
     {.manufacturer = "Ford",
      .format_name = "H75",
      .format_name = "H75",
@@ -276,15 +267,14 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.201, // this should be equal to first pin inch for tip
      .elbow_inch = 0.201, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.354,
      .deepest_depth_inch = 0.254,
      .deepest_depth_inch = 0.254,
      .depth_step_inch = 0.025,
      .depth_step_inch = 0.025,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 5,
      .max_depth_ind = 5,
      .macs = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 2},
 
 
     {.manufacturer = "Chevrolet",
     {.manufacturer = "Chevrolet",
      .format_name = "B102",
      .format_name = "B102",
@@ -298,15 +288,14 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.205, // this should be equal to first pin inch for tip
      .elbow_inch = 0.205, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.315,
      .deepest_depth_inch = 0.161,
      .deepest_depth_inch = 0.161,
      .depth_step_inch = 0.026,
      .depth_step_inch = 0.026,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .max_depth_ind = 4,
      .macs = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 2},
 
 
     {.manufacturer = "Dodge",
     {.manufacturer = "Dodge",
      .format_name = "Y159",
      .format_name = "Y159",
@@ -320,15 +309,14 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.297, // this should be equal to first pin inch for tip
      .elbow_inch = 0.297, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.339,
      .deepest_depth_inch = 0.197,
      .deepest_depth_inch = 0.197,
      .depth_step_inch = 0.047,
      .depth_step_inch = 0.047,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .max_depth_ind = 4,
      .macs = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 1},
 
 
     {.manufacturer = "Kawasaki",
     {.manufacturer = "Kawasaki",
      .format_name = "KA14",
      .format_name = "KA14",
@@ -341,15 +329,14 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.258,
      .deepest_depth_inch = 0.198,
      .deepest_depth_inch = 0.198,
      .depth_step_inch = 0.020,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .max_depth_ind = 4,
      .macs = 4,
      .macs = 4,
-     .clearance = 0},
+     .clearance = 3},
 
 
     {.manufacturer = "Yamaha",
     {.manufacturer = "Yamaha",
      .format_name = "YM63",
      .format_name = "YM63",
@@ -362,36 +349,35 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      .elbow_inch = 0.1, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.295,
      .deepest_depth_inch = 0.236,
      .deepest_depth_inch = 0.236,
      .depth_step_inch = 0.020,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .max_depth_ind = 4,
      .macs = 4,
      .macs = 4,
-     .clearance = 0},
+     .clearance = 3},
 
 
     {.manufacturer = "Best (A2)",
     {.manufacturer = "Best (A2)",
      .format_name = "SFIC",
      .format_name = "SFIC",
+     .sides = 2,
      .stop = 2,
      .stop = 2,
      .format_link = "C3",
      .format_link = "C3",
-     .first_pin_inch = 0.250,
-     .last_pin_inch = 0.998,
+     .first_pin_inch = 0.170,
+     .last_pin_inch = 1.067,
      .pin_increment_inch = 0.149,
      .pin_increment_inch = 0.149,
      .pin_num = 6,
      .pin_num = 6,
      .pin_width_inch = 0.051,
      .pin_width_inch = 0.051,
      .elbow_inch = 0.081, // this should be equal to first pin inch for tip
      .elbow_inch = 0.081, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.318,
      .deepest_depth_inch = 0.206,
      .deepest_depth_inch = 0.206,
      .depth_step_inch = 0.025,
      .depth_step_inch = 0.025,
      .min_depth_ind = 0,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .max_depth_ind = 9,
      .macs = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 3},
 
 
     {.manufacturer = "RV (FIC,GL,Bauer)",
     {.manufacturer = "RV (FIC,GL,Bauer)",
      .format_name = "RV",
      .format_name = "RV",
@@ -404,12 +390,11 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.039,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.126, // this should be equal to first pin inch for tip
      .elbow_inch = 0.126, // this should be equal to first pin inch for tip
      // stopped key line
      // 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,
      .uncut_depth_inch = 0.260,
      .deepest_depth_inch = 0.181,
      .deepest_depth_inch = 0.181,
      .depth_step_inch = 0.040,
      .depth_step_inch = 0.040,
      .min_depth_ind = 1,
      .min_depth_ind = 1,
      .max_depth_ind = 3,
      .max_depth_ind = 3,
      .macs = 3,
      .macs = 3,
-     .clearance = 0}};
+     .clearance = 1}};