From 2e906d51edefa62baeb519065c2a2b28c97c83cc Mon Sep 17 00:00:00 2001
From: HonestLocksmith <haertle@msn.com>
Date: Fri, 17 Jan 2025 13:08:22 -0700
Subject: [PATCH 1/7] Updated yale to .019 system

---
 key_formats.c | 87 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index c2ccbf9..939b488 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -48,14 +48,15 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.060,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will
+     // make 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.312,
      .deepest_depth_inch = 0.186,
      .depth_step_inch = 0.014,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 6,
-     .clearance = 7},
+     .clearance = 8},
 
     {.manufacturer = "Master Lock",
      .format_name = "M1",
@@ -66,14 +67,15 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.276,
      .deepest_depth_inch = 0.171,
      .depth_step_inch = 0.015,
      .min_depth_ind = 0,
      .max_depth_ind = 7,
      .macs = 7,
-     .clearance = 6},
+     .clearance = 8},
 
     {.manufacturer = "American",
      .format_name = "AM7",
@@ -84,32 +86,34 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.283,
      .deepest_depth_inch = 0.173,
      .depth_step_inch = 0.016,
      .min_depth_ind = 1,
      .max_depth_ind = 8,
      .macs = 7,
-     .clearance = 5},
+     .clearance = 8},
 
     {.manufacturer = "Yale",
      .format_name = "Y2",
-     .format_link = ".025",
-     .first_pin_inch = 0.250,
-     .last_pin_inch = 1.095,
-     .pin_increment_inch = 0.185,
+     .format_link = "C57",
+     .first_pin_inch = 0.200,
+     .last_pin_inch = 1.025,
+     .pin_increment_inch = 0.165,
      .pin_num = 6,
      .pin_width_inch = 0.054,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.320,
-     .deepest_depth_inch = 0.145,
-     .depth_step_inch = 0.025,
+     .deepest_depth_inch = 0.149,
+     .depth_step_inch = 0.019,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 9,
-     .clearance = 4},
+     .clearance = 1},
 
     {.manufacturer = "Yale",
      .format_name = "Y11",
@@ -120,14 +124,15 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.246,
      .deepest_depth_inch = 0.167,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .max_depth_ind = 5,
      .macs = 7,
-     .clearance = 3},
+     .clearance = 8},
 
     {.manufacturer = "Sargent",
      .format_name = "S22",
@@ -138,14 +143,15 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.063,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.328, // double check
      .deepest_depth_inch = 0.148,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .max_depth_ind = 10,
      .macs = 7,
-     .clearance = 5},
+     .clearance = 8},
 
     {.manufacturer = "National",
      .format_name = "NA25",
@@ -156,7 +162,8 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.039,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.304,
      .deepest_depth_inch = 0.191,
      .depth_step_inch = 0.012,
@@ -174,7 +181,8 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.047,
      .elbow_inch = 0.1,
-     .drill_angle = 90,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.343,
      .deepest_depth_inch = 0.217,
      .depth_step_inch = 0.014,
@@ -253,7 +261,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 6,
      .macs = 5,
-     .clearance = 3},
+     .clearance = 8},
 
     {.manufacturer = "Ford",
      .format_name = "H75",
@@ -267,14 +275,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.354,
      .deepest_depth_inch = 0.254,
      .depth_step_inch = 0.025,
      .min_depth_ind = 1,
      .max_depth_ind = 5,
      .macs = 5,
-     .clearance = 2},
+     .clearance = 0},
 
     {.manufacturer = "Chevrolet",
      .format_name = "B102",
@@ -288,14 +297,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.315,
      .deepest_depth_inch = 0.161,
      .depth_step_inch = 0.026,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 5,
-     .clearance = 2},
+     .clearance = 0},
 
     {.manufacturer = "Dodge",
      .format_name = "Y159",
@@ -309,14 +319,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.339,
      .deepest_depth_inch = 0.197,
      .depth_step_inch = 0.047,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 5,
-     .clearance = 1},
+     .clearance = 0},
 
     {.manufacturer = "Kawasaki",
      .format_name = "KA14",
@@ -329,14 +340,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.258,
      .deepest_depth_inch = 0.198,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 4,
-     .clearance = 3},
+     .clearance = 0},
 
     {.manufacturer = "Yamaha",
      .format_name = "YM63",
@@ -349,14 +361,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.295,
      .deepest_depth_inch = 0.236,
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 4,
-     .clearance = 3},
+     .clearance = 0},
 
     {.manufacturer = "Best (A2)",
      .format_name = "SFIC",
@@ -369,14 +382,15 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.318,
      .deepest_depth_inch = 0.206,
      .depth_step_inch = 0.025,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
-     .macs = 5,
-     .clearance = 3},
+     .macs = 7,
+     .clearance = 0},
 
     {.manufacturer = "RV (FIC,GL,Bauer)",
      .format_name = "RV",
@@ -389,11 +403,12 @@ 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,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.260,
      .deepest_depth_inch = 0.181,
      .depth_step_inch = 0.040,
      .min_depth_ind = 1,
      .max_depth_ind = 3,
      .macs = 3,
-     .clearance = 1}};
+     .clearance = 0}};

From 4e2f610e28f0e775e4c2347483b377aff78d35a4 Mon Sep 17 00:00:00 2001
From: HonestLocksmith <haertle@msn.com>
Date: Sun, 19 Jan 2025 02:29:42 -0700
Subject: [PATCH 2/7] Added M2, WR5, AB3, RO3, L1, DA34, KK8, fixes

---
 key_formats.c | 215 +++++++++++++++++++++++++++++++++++++++++---------
 key_formats.h |   2 +-
 2 files changed, 177 insertions(+), 40 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index 939b488..2a74d71 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -4,7 +4,7 @@
 const KeyFormat all_formats[] = {
     {.manufacturer = "Kwikset",
      .format_name = "KW1",
-     .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
+     .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf", // C31
      .first_pin_inch = 0.247,
      .last_pin_inch = 0.847,
      .pin_increment_inch = 0.15,
@@ -22,7 +22,7 @@ const KeyFormat all_formats[] = {
 
     {.manufacturer = "Schlage",
      .format_name = "SC4",
-     .format_link = "https://lsamichigan.org/Tech/SCHLAGE_KeySpecs.pdf",
+     .format_link = "https://lsamichigan.org/Tech/SCHLAGE_KeySpecs.pdf", // C45
      .first_pin_inch = 0.231,
      .last_pin_inch = 1.012,
      .pin_increment_inch = 0.1562,
@@ -39,6 +39,24 @@ const KeyFormat all_formats[] = {
      .macs = 7,
      .clearance = 8},
 
+    {.manufacturer = "Weiser",
+     .format_name = "WR5",
+     .format_link = "C50",
+     .first_pin_inch = 0.237,
+     .last_pin_inch = 0.861,
+     .pin_increment_inch = 0.156,
+     .pin_num = 5,
+     .pin_width_inch = 0.079,
+     .elbow_inch = 0.15,
+     .drill_angle = 90,
+     .uncut_depth_inch = 0.315,
+     .deepest_depth_inch = 0.153,
+     .depth_step_inch = 0.018,
+     .min_depth_ind = 0,
+     .max_depth_ind = 9,
+     .macs = 7,
+     .clearance = 7},
+
     {.manufacturer = "Arrow",
      .format_name = "AR4",
      .format_link = "C2",
@@ -55,8 +73,27 @@ const KeyFormat all_formats[] = {
      .depth_step_inch = 0.014,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
-     .macs = 6,
-     .clearance = 8},
+     .macs = 7,
+     .clearance = 7},
+
+    {.manufacturer = "Abus",
+     .format_name = "AB3    ",
+     .format_link = "C112",
+     .first_pin_inch = 0.157,
+     .last_pin_inch = 0.768,
+     .pin_increment_inch = 0.122,
+     .pin_num = 6,
+     .pin_width_inch = 0.025,
+     .elbow_inch = 0.1,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
+     .uncut_depth_inch = 0.254,
+     .deepest_depth_inch = 0.152,
+     .depth_step_inch = 0.025,
+     .min_depth_ind = 1,
+     .max_depth_ind = 5,
+     .macs = 5,
+     .clearance = 3},
 
     {.manufacturer = "Master Lock",
      .format_name = "M1",
@@ -75,7 +112,26 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 7,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 6},
+
+    {.manufacturer = "Master Lock",
+     .format_name = "M2",
+     .format_link = "C34",
+     .first_pin_inch = 0.136,
+     .last_pin_inch = 0.508,
+     .pin_increment_inch = 0.124,
+     .pin_num = 4,
+     .pin_width_inch = 0.031,
+     .elbow_inch = 0.1,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will make
+     // 100 degrees very ugly and unsuable
+     .uncut_depth_inch = 0.210,
+     .deepest_depth_inch = 0.120,
+     .depth_step_inch = 0.015,
+     .min_depth_ind = 0,
+     .max_depth_ind = 6,
+     .macs = 5,
+     .clearance = 4},
 
     {.manufacturer = "American",
      .format_name = "AM7",
@@ -94,7 +150,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 8,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 5},
 
     {.manufacturer = "Yale",
      .format_name = "Y2",
@@ -113,11 +169,11 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 9,
-     .clearance = 1},
+     .clearance = 4},
 
     {.manufacturer = "Yale",
      .format_name = "Y11",
-     .format_link = "CX55",
+     .format_link = "C55",
      .first_pin_inch = 0.124,
      .last_pin_inch = 0.502,
      .pin_increment_inch = 0.095,
@@ -131,8 +187,8 @@ const KeyFormat all_formats[] = {
      .depth_step_inch = 0.020,
      .min_depth_ind = 1,
      .max_depth_ind = 5,
-     .macs = 7,
-     .clearance = 8},
+     .macs = 5,
+     .clearance = 3},
 
     {.manufacturer = "Sargent",
      .format_name = "S22",
@@ -151,7 +207,26 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 10,
      .macs = 7,
-     .clearance = 8},
+     .clearance = 5},
+
+    {.manufacturer = "National",
+     .format_name = "RO3",
+     .format_link = "C37",
+     .first_pin_inch = 0.156,
+     .last_pin_inch = 0.525,
+     .pin_increment_inch = 0.093,
+     .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
+     .uncut_depth_inch = 0.250,
+     .deepest_depth_inch = 0.175,
+     .depth_step_inch = 0.025,
+     .min_depth_ind = 1,
+     .max_depth_ind = 4,
+     .macs = 5,
+     .clearance = 3},
 
     {.manufacturer = "National",
      .format_name = "NA25",
@@ -191,19 +266,37 @@ const KeyFormat all_formats[] = {
      .macs = 7,
      .clearance = 8},
 
+    {.manufacturer = "Lockwood",
+     .format_name = "L1",
+     .format_link = "C28",
+     .first_pin_inch = 0.276,
+     .last_pin_inch = 0.902,
+     .pin_increment_inch = 0.153,
+     .pin_num = 5,
+     .pin_width_inch = 0.063,
+     .elbow_inch = 0.1,
+     .drill_angle = 90,
+     .uncut_depth_inch = 0.320,
+     .deepest_depth_inch = 0.158,
+     .depth_step_inch = 0.018,
+     .min_depth_ind = 0,
+     .max_depth_ind = 9,
+     .macs = 9,
+     .clearance = 6},
+
     {.manufacturer = "Lockwood",
      .format_name = "LW4",
-     .format_link = "",
-     .first_pin_inch = 0.245,
-     .last_pin_inch = 0.870,
-     .pin_increment_inch = 0.1562,
+     .format_link = "CX57",
+     .first_pin_inch = 0.240,
+     .last_pin_inch = 0.865,
+     .pin_increment_inch = 0.156,
      .pin_num = 5,
-     .pin_width_inch = 0.031,
+     .pin_width_inch = 0.047,
      .elbow_inch = 0.1,
      .drill_angle = 90,
-     .uncut_depth_inch = 0.344,
-     .deepest_depth_inch = 0.203,
-     .depth_step_inch = 0.014,
+     .uncut_depth_inch = 0.337,
+     .deepest_depth_inch = 0.202,
+     .depth_step_inch = 0.015,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 9,
@@ -211,17 +304,17 @@ const KeyFormat all_formats[] = {
 
     {.manufacturer = "Lockwood",
      .format_name = "LW5",
-     .format_link = "",
-     .first_pin_inch = 0.245,
-     .last_pin_inch = 1.0262,
+     .format_link = "CX57",
+     .first_pin_inch = 0.240,
+     .last_pin_inch = 1.0222,
      .pin_increment_inch = 0.1562,
      .pin_num = 6,
      .pin_width_inch = 0.031,
      .elbow_inch = 0.1,
      .drill_angle = 90,
-     .uncut_depth_inch = 0.344,
-     .deepest_depth_inch = 0.203,
-     .depth_step_inch = 0.014,
+     .uncut_depth_inch = 0.337,
+     .deepest_depth_inch = 0.202,
+     .depth_step_inch = 0.015,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 9,
@@ -261,7 +354,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 6,
      .macs = 5,
-     .clearance = 8},
+     .clearance = 3},
 
     {.manufacturer = "Ford",
      .format_name = "H75",
@@ -283,13 +376,13 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 2},
 
     {.manufacturer = "Chevrolet",
      .format_name = "B102",
      .sides = 2,
      .stop = 2,
-     .format_link = "",
+     .format_link = "CF215",
      .first_pin_inch = 0.205,
      .last_pin_inch = 1.037,
      .pin_increment_inch = 0.093,
@@ -305,7 +398,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 2},
 
     {.manufacturer = "Dodge",
      .format_name = "Y159",
@@ -326,8 +419,52 @@ const KeyFormat all_formats[] = {
      .depth_step_inch = 0.047,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
+     .macs = 4,
+     .clearance = 1},
+
+    {.manufacturer = "Nissan",
+     .format_name = "DA34",
+     .sides = 2,
+     .stop = 2,
+     .format_link = "CF304",
+     .first_pin_inch = 0.169,
+     .last_pin_inch = 0.913,
+     .pin_increment_inch = 0.082,
+     .pin_num = 10,
+     .pin_width_inch = 0.031,
+     .elbow_inch = 0.169, // 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
+     .uncut_depth_inch = 0.334,
+     .deepest_depth_inch = 0.257,
+     .depth_step_inch = 0.026,
+     .min_depth_ind = 1,
+     .max_depth_ind = 4,
+     .macs = 4,
+     .clearance = 2},
+
+    {.manufacturer = "KIA",
+     .format_name = "KK8",
+     .sides = 2,
+     .stop = 2,
+     .format_link = "3003",
+     .first_pin_inch = 0.217,
+     .last_pin_inch = 0.795,
+     .pin_increment_inch = 0.082,
+     .pin_num = 8,
+     .pin_width_inch = 0.031,
+     .elbow_inch = 0.217, // 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
+     .uncut_depth_inch = 0.331,
+     .deepest_depth_inch = 0.252,
+     .depth_step_inch = 0.020,
+     .min_depth_ind = 1,
+     .max_depth_ind = 5,
      .macs = 5,
-     .clearance = 0},
+     .clearance = 3},
 
     {.manufacturer = "Kawasaki",
      .format_name = "KA14",
@@ -348,7 +485,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 4,
-     .clearance = 0},
+     .clearance = 3},
 
     {.manufacturer = "Yamaha",
      .format_name = "YM63",
@@ -369,7 +506,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 4,
-     .clearance = 0},
+     .clearance = 3},
 
     {.manufacturer = "Best (A2)",
      .format_name = "SFIC",
@@ -386,16 +523,16 @@ const KeyFormat all_formats[] = {
      // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.318,
      .deepest_depth_inch = 0.206,
-     .depth_step_inch = 0.025,
+     .depth_step_inch = 0.013,
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 7,
-     .clearance = 0},
+     .clearance = 3},
 
     {.manufacturer = "RV (FIC,GL,Bauer)",
      .format_name = "RV",
      .sides = 2,
-     .format_link = "Card",
+     .format_link = "4013",
      .first_pin_inch = 0.126,
      .last_pin_inch = 0.504,
      .pin_increment_inch = 0.094,
@@ -405,10 +542,10 @@ const KeyFormat all_formats[] = {
      // stopped key line
      .drill_angle = 90, // This should actually be 100 but the current resolution will make
      // 100 degrees very ugly and unsuable
-     .uncut_depth_inch = 0.260,
-     .deepest_depth_inch = 0.181,
-     .depth_step_inch = 0.040,
+     .uncut_depth_inch = 0.272,
+     .deepest_depth_inch = 0.224,
+     .depth_step_inch = 0.024,
      .min_depth_ind = 1,
      .max_depth_ind = 3,
      .macs = 3,
-     .clearance = 0}};
+     .clearance = 1}};
diff --git a/key_formats.h b/key_formats.h
index 67fb471..6ffff29 100644
--- a/key_formats.h
+++ b/key_formats.h
@@ -1,7 +1,7 @@
 #ifndef KEY_FORMATS_H
 #define KEY_FORMATS_H
 
-#define FORMAT_NUM 21
+#define FORMAT_NUM 28
 
 typedef struct {
     char* manufacturer;

From a31b198db769b8d2d9f73f0dd8ec5e3de109f537 Mon Sep 17 00:00:00 2001
From: HonestLocksmith <haertle@msn.com>
Date: Thu, 23 Jan 2025 00:08:36 -0700
Subject: [PATCH 3/7] Added EL10, y159, b102 fix

---
 key_formats.c | 31 +++++++++++++++++++++++++------
 key_formats.h |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index 2a74d71..e36143e 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -76,6 +76,25 @@ const KeyFormat all_formats[] = {
      .macs = 7,
      .clearance = 7},
 
+    {.manufacturer = "Elzett",
+     .format_name = "EL10",
+     .format_link = "2274",
+     .first_pin_inch = 0.206,
+     .last_pin_inch = 0.836,
+     .pin_increment_inch = 0.158,
+     .pin_num = 5,
+     .pin_width_inch = 0.051,
+     .elbow_inch = 0.1,
+     .drill_angle = 90, // This should actually be 100 but the current resolution will
+     // make 100 degrees very ugly and unsuable
+     .uncut_depth_inch = 0.339,
+     .deepest_depth_inch = 0.173,
+     .depth_step_inch = 0.024,
+     .min_depth_ind = 0,
+     .max_depth_ind = 7,
+     .macs = 6,
+     .clearance = 6},
+
     {.manufacturer = "Abus",
      .format_name = "AB3    ",
      .format_link = "C112",
@@ -83,7 +102,7 @@ const KeyFormat all_formats[] = {
      .last_pin_inch = 0.768,
      .pin_increment_inch = 0.122,
      .pin_num = 6,
-     .pin_width_inch = 0.025,
+     .pin_width_inch = 0.035,
      .elbow_inch = 0.1,
      .drill_angle = 90, // This should actually be 100 but the current resolution will make
      // 100 degrees very ugly and unsuable
@@ -133,7 +152,7 @@ const KeyFormat all_formats[] = {
      .macs = 5,
      .clearance = 4},
 
-    {.manufacturer = "American",
+    {.manufacturer = "American Lock",
      .format_name = "AM7",
      .format_link = "C80",
      .first_pin_inch = 0.157,
@@ -393,7 +412,7 @@ const KeyFormat all_formats[] = {
      .drill_angle = 90, // This should actually be 100 but the current resolution will make
      // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.315,
-     .deepest_depth_inch = 0.161,
+     .deepest_depth_inch = 0.238,
      .depth_step_inch = 0.026,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
@@ -415,12 +434,12 @@ const KeyFormat all_formats[] = {
      .drill_angle = 90, // This should actually be 100 but the current resolution will make
      // 100 degrees very ugly and unsuable
      .uncut_depth_inch = 0.339,
-     .deepest_depth_inch = 0.197,
-     .depth_step_inch = 0.047,
+     .deepest_depth_inch = 0.268,
+     .depth_step_inch = 0.024,
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 4,
-     .clearance = 1},
+     .clearance = 2},
 
     {.manufacturer = "Nissan",
      .format_name = "DA34",
diff --git a/key_formats.h b/key_formats.h
index 6ffff29..ebbe7ad 100644
--- a/key_formats.h
+++ b/key_formats.h
@@ -1,7 +1,7 @@
 #ifndef KEY_FORMATS_H
 #define KEY_FORMATS_H
 
-#define FORMAT_NUM 28
+#define FORMAT_NUM 29
 
 typedef struct {
     char* manufacturer;

From 77c1b57522bb2a7a08196765873d27886f9e8378 Mon Sep 17 00:00:00 2001
From: zinongli <131403964+zinongli@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:15:33 -0500
Subject: [PATCH 4/7] delete incorrect comments

---
 key_formats.c | 79 ++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 42 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index e36143e..ec7335f 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -29,8 +29,8 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.031,
      .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.335,
      .deepest_depth_inch = 0.2,
      .depth_step_inch = 0.015,
@@ -85,8 +85,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 5,
      .pin_width_inch = 0.051,
      .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.339,
      .deepest_depth_inch = 0.173,
      .depth_step_inch = 0.024,
@@ -104,8 +103,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 6,
      .pin_width_inch = 0.035,
      .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.254,
      .deepest_depth_inch = 0.152,
      .depth_step_inch = 0.025,
@@ -123,8 +121,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,
@@ -142,8 +139,7 @@ const KeyFormat all_formats[] = {
      .pin_num = 4,
      .pin_width_inch = 0.031,
      .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.210,
      .deepest_depth_inch = 0.120,
      .depth_step_inch = 0.015,
@@ -161,8 +157,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,
@@ -180,8 +175,8 @@ const KeyFormat all_formats[] = {
      .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.149,
      .depth_step_inch = 0.019,
@@ -199,8 +194,8 @@ 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,
@@ -218,8 +213,8 @@ 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,
@@ -237,8 +232,8 @@ 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.250,
      .deepest_depth_inch = 0.175,
      .depth_step_inch = 0.025,
@@ -256,8 +251,8 @@ 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,
@@ -275,8 +270,8 @@ 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,
@@ -387,8 +382,8 @@ 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,
@@ -409,8 +404,8 @@ 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.238,
      .depth_step_inch = 0.026,
@@ -431,8 +426,8 @@ 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.268,
      .depth_step_inch = 0.024,
@@ -453,8 +448,8 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.031,
      .elbow_inch = 0.169, // 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.334,
      .deepest_depth_inch = 0.257,
      .depth_step_inch = 0.026,
@@ -475,8 +470,8 @@ const KeyFormat all_formats[] = {
      .pin_width_inch = 0.031,
      .elbow_inch = 0.217, // 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.331,
      .deepest_depth_inch = 0.252,
      .depth_step_inch = 0.020,
@@ -496,8 +491,8 @@ 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,
@@ -517,8 +512,8 @@ 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,
@@ -538,8 +533,8 @@ 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.013,
@@ -559,8 +554,8 @@ 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.272,
      .deepest_depth_inch = 0.224,
      .depth_step_inch = 0.024,

From 6d4daea95fd842b5da4792f1b990411f502245c5 Mon Sep 17 00:00:00 2001
From: zinongli <131403964+zinongli@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:19:27 -0500
Subject: [PATCH 5/7] Update ufbt_build.yaml

---
 .github/workflows/ufbt_build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ufbt_build.yaml b/.github/workflows/ufbt_build.yaml
index 1d81b30..0e5d0d8 100644
--- a/.github/workflows/ufbt_build.yaml
+++ b/.github/workflows/ufbt_build.yaml
@@ -30,7 +30,7 @@ jobs:
           sdk-channel: ${{ matrix.sdk-channel }}
           sdk-index-url: ${{ matrix.sdk-index-url }}
       - name: Upload app artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }}
           path: ${{ steps.build-app.outputs.fap-artifacts }}

From af3bf914011e97ef5ec7ec5a1ef98c37a39e3e4d Mon Sep 17 00:00:00 2001
From: zinongli <131403964+zinongli@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:46:43 -0500
Subject: [PATCH 6/7] clearance

---
 key_formats.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index ec7335f..ad73b50 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -55,7 +55,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 7,
-     .clearance = 7},
+     .clearance = 3},
 
     {.manufacturer = "Arrow",
      .format_name = "AR4",
@@ -92,10 +92,10 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 7,
      .macs = 6,
-     .clearance = 6},
+     .clearance = 3},
 
     {.manufacturer = "Abus",
-     .format_name = "AB3    ",
+     .format_name = "AB3",
      .format_link = "C112",
      .first_pin_inch = 0.157,
      .last_pin_inch = 0.768,
@@ -146,7 +146,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 6,
      .macs = 5,
-     .clearance = 4},
+     .clearance = 5},
 
     {.manufacturer = "American Lock",
      .format_name = "AM7",
@@ -240,7 +240,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 1,
      .max_depth_ind = 4,
      .macs = 5,
-     .clearance = 3},
+     .clearance = 1},
 
     {.manufacturer = "National",
      .format_name = "NA25",
@@ -296,7 +296,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 9,
-     .clearance = 6},
+     .clearance = 4},
 
     {.manufacturer = "Lockwood",
      .format_name = "LW4",

From c060e0b2bfd751ad97a3c047c29339652b73c627 Mon Sep 17 00:00:00 2001
From: zinongli <131403964+zinongli@users.noreply.github.com>
Date: Mon, 3 Feb 2025 22:05:38 -0500
Subject: [PATCH 7/7] more clearance adjustments

---
 key_formats.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/key_formats.c b/key_formats.c
index ad73b50..57e4eab 100644
--- a/key_formats.c
+++ b/key_formats.c
@@ -55,7 +55,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 9,
      .macs = 7,
-     .clearance = 3},
+     .clearance = 5},
 
     {.manufacturer = "Arrow",
      .format_name = "AR4",
@@ -92,7 +92,7 @@ const KeyFormat all_formats[] = {
      .min_depth_ind = 0,
      .max_depth_ind = 7,
      .macs = 6,
-     .clearance = 3},
+     .clearance = 4},
 
     {.manufacturer = "Abus",
      .format_name = "AB3",