Add copper plate to LD Adapter 3D model

- Generate production files with nix build .

.gitignore

@@ -3,6 +3,9 @@
 
 # Temporary files
 *.000
+*.cache
+*.config
+*.local
 *.bak
 *.bck
 *.kicad_pcb-bak
@@ -28,4 +31,4 @@ __pycache__
 *.ses
 
 # Generated Production Files
-production
+result

Panel/README.md

@@ -0,0 +1,10 @@
+### Kirdy Front Panel 
+
+## Text Markings
+- Font: PrisonGothicPro-Medium.otf
+- Drawn in KiCAD 7
+
+## Mechanical Design and Drawings
+- Drawn in FreeCAD 0.21.2 with a2plus and Exploded Assembly Workbench installed
+- Reference Assembly Kit: nVent SCHROFF 20848-668
+- Reference drawings: https://git.m-labs.hk/sinara-hw/front-panels/src/branch/master/Kasli_SOC-vNone

Panel/kirdy_front_panel_markings/kirdy_front_panel_markings.kicad_pro

@@ -179,7 +179,7 @@
     "pinned_symbol_libs": []
   },
   "meta": {
-    "filename": "front_panel.kicad_pro",
+    "filename": "kirdy_front_panel_markings.kicad_pro",
     "version": 1
   },
   "net_settings": {

flake.lock

@@ -0,0 +1,44 @@
+{
+  "nodes": {
+    "kicad_bom_generator": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702353729,
+        "narHash": "sha256-NIM/GLC71VdGdMletBBv9lSPuHpgD9zzeGiVQLEAULA=",
+        "ref": "refs/heads/main",
+        "rev": "72686f5556785c9aa13678dc42757dddfb7d7c23",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.m-labs.hk/linuswck/KiCAD_BOM_Generator.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.m-labs.hk/linuswck/KiCAD_BOM_Generator.git"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1701952659,
+        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "kicad_bom_generator": "kicad_bom_generator",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,66 @@
+{
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+  inputs.kicad_bom_generator = {
+    url = "git+https://git.m-labs.hk/linuswck/KiCAD_BOM_Generator.git";
+    flake = false;
+  };
+
+  outputs = { self, nixpkgs, kicad_bom_generator }: {
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
+
+    devShells.x86_64-linux.default =
+      let pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      in pkgs.mkShell {
+        name = "kicad-dev-shell";
+        buildInputs = [ pkgs.kicad ];
+      };
+
+    defaultPackage.x86_64-linux =
+      with import nixpkgs { system = "x86_64-linux"; };
+      stdenv.mkDerivation {
+        name = "production_files";
+        src = ./src;
+
+        nativeBuildInputs = [ pkgs.kicad pkgs.zip pkgs.python3 ];
+
+        buildPhase = ''
+          # kicad-cli requires the use of $HOME
+          export HOME=/tmp
+
+          SCH=kirdy.kicad_sch
+          PCB=kirdy.kicad_pcb
+
+          # Get Revision Number from the Title Block in KiCAD Top Schematics
+          REV=$(cat $SCH | grep rev | cut -d'"' -f 2)
+          PREFIX=kirdy_$REV
+
+          kicad-cli sch export python-bom $SCH -o $PREFIX"_bom".xml
+          export PYTHONPATH=${pkgs.kicad.base}/share/kicad/plugins
+          python ${kicad_bom_generator}/generate_bom_from_xml.py $PREFIX"_bom".xml $PREFIX"_bom".csv
+
+          kicad-cli sch export pdf $SCH -o $PREFIX.pdf
+          kicad-cli pcb export pos $PCB --format csv --units mm  -o $PREFIX"_pos".csv
+
+          export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}/share/kicad/3dmodels
+          kicad-cli pcb export step $PCB --subst-models --force -o $PREFIX.step
+
+          mkdir -p $PREFIX"_gerber_drill"
+          kicad-cli pcb export gerbers $PCB -l 'F.Cu,In1.Cu,In2.Cu,B.Cu,F.Paste,B.Paste,F.Silkscreen,B.Silkscreen,F.Mask,B.Mask,Edge.Cuts' --no-x2 --subtract-soldermask -o ./$PREFIX"_gerber_drill"
+
+          # The additional trailing slash is due to a bug in the kicad-cli tool. https://gitlab.com/kicad/code/kicad/-/issues/14438
+          kicad-cli pcb export drill $PCB -u mm --generate-map --map-format gerberx2 -o ./$PREFIX"_gerber_drill"/
+
+          zip -r -j $PREFIX"_gerber_drill" $PREFIX"_gerber_drill"
+        '';
+
+        installPhase = ''
+          mkdir -p $out/production_files 
+          cp $PREFIX"_bom".csv $out/production_files/$PREFIX"_bom".csv
+          cp $PREFIX.pdf $out/production_files/$PREFIX.pdf
+          cp $PREFIX"_pos".csv $out/production_files/$PREFIX"_pos.csv"
+          cp $PREFIX.step $out/production_files/$PREFIX.step
+          cp $PREFIX"_gerber_drill".zip $out/production_files/$PREFIX"_gerber_drill".zip
+        '';
+      };
+  };
+}

scripts/generate_bom_from_xml.py

@@ -1,63 +0,0 @@
-# Modified from "bom_csv_grouped_by_value_with_fp.py" Example BOM Generation Script
-
-"""
-    @package
-    Output: CSV (comma-separated)
-    The BOM does not include components with DNP or excluded from BOM field(s) checked. 
-    Grouped By: Value, Footprint, MFR_PN, MFR_ALT
-    Sorted By: Ref
-    Fields: Ref, Value, MFR_PN, MFR_PN_ALT, Qnty, LibPart, Footprint, Comment
-
-    Command line:
-    python "pathToFile/generate_bom_from_xml.py" "%I" "%O.csv"
-"""
-
-import kicad_netlist_reader
-import csv
-import sys
-import os
-
-try:
-    if not os.path.isdir(os.path.dirname(sys.argv[2])):
-        os.makedirs(os.path.dirname(sys.argv[2]))
-    f = open(sys.argv[2], 'w', encoding='utf-8')
-except IOError:
-    raise IOError("Can't open output file for writing: " + sys.argv[2])
-
-# Custom Equal Operator for "groupComponents" method
-def __eq__(self, other):
-    result = False
-    if self.getValue() == other.getValue():
-        if self.getFootprint() == other.getFootprint():
-            if self.getField("MFR_PN") == other.getField("MFR_PN"):
-                if self.getField("MFR_PN_ALT") == other.getField("MFR_PN_ALT"):
-                    result = True
-    return result
-kicad_netlist_reader.comp.__eq__ = __eq__
-
-net = kicad_netlist_reader.netlist(sys.argv[1])
-
-out = csv.writer(f, lineterminator='\n', delimiter=',', quotechar='\"', quoting=csv.QUOTE_ALL)
-out.writerow(['Source:', net.getSource()])
-out.writerow(['Date:', net.getDate()])
-out.writerow(['Tool:', net.getTool()])
-out.writerow(['Ref', 'Value', 'MFR_PN', 'MFR_PN_ALT', 'Qnty', 'LibPart', 'Footprint', 'Comment'])
-
-grouped = net.groupComponents(components=net.getInterestingComponents(excludeBOM=True, DNP=True))
-
-for group in grouped:
-    refs = ""
-    for component in group:
-        if refs != "":
-            refs += ", "
-        refs += component.getRef()
-        c = component
-
-    out.writerow([refs,
-        c.getValue(),
-        c.getField("MFR_PN"),
-        c.getField("MFR_PN_ALT"),
-        len(group),
-        c.getLibName() + ":" + c.getPartName(),
-        c.getFootprint(),
-        c.getField("Comment")])

scripts/generate_production_files.py

@@ -1,112 +0,0 @@
-import os
-import argparse
-
-__cmd_get_kicad_bin_path = "which kicad | xargs readlink | sed 's/$/-cli/' | xargs readlink"
-
-def setup_env(prefix, sch, out_dir, dir_kicad_plugins, dir_3d_models):
-    # Get the path to "kicad_netlist_reader.py" script in NixOs
-    if dir_kicad_plugins is None:
-        dir_kicad_plugins = os.path.join(os.popen(__cmd_get_kicad_bin_path).read().replace("\n", ""),
-            "../../share/kicad/plugins")
-    
-    # Setup the PYTHONPATH for "generate_bom_from_xml.py" to import "kicad_netlist_reader"
-    try:
-        pythonpath = os.environ['PYTHONPATH']
-    except KeyError:
-        pythonpath = ''
-    pathlist = [dir_kicad_plugins]
-    if pythonpath:
-        pathlist.extend(pythonpath.split(os.pathsep))
-    os.environ['PYTHONPATH'] = os.pathsep.join(pathlist)
-
-    # NIXOS installs KiCAD Built-in 3D models in a separated folder
-    if dir_3d_models is None:
-        temp = os.popen("ls /nix/store | grep kicad-packages3d").read().split()
-        for model_3d_path in temp:
-            if model_3d_path.find(".drv") == -1:
-                # Setup the KICAD7_3DMODEL_DIR for step file to be generated with kicad-cli"
-                os.environ['KICAD7_3DMODEL_DIR'] = os.path.join("/nix/store", model_3d_path, "share/kicad/3dmodels")
-                break
-
-    # Generate the prefix from the title and revision fields in title block of the schematics top
-    if prefix is None:
-        with open (sch, "r") as f:
-            data = f.read().splitlines()
-            title_line = data[7][1:-1].split()
-            revision_line = data[9][1:-1].split()
-        if title_line[0].find("title") and revision_line[0].find("rev"):
-            ret_prefix = f"{title_line[1][1:-1]}_{revision_line[1][1:-1]}"
-        else:
-            raise ValueError("Prefix cannot be generated from schematic file.")
-    else:
-        ret_prefix = prefix
-
-    gerber_drill_dir = os.path.join(out_dir, f"{ret_prefix}_gerber_drill")
-    if not os.path.exists(out_dir):
-        os.makedirs(out_dir)
-    if not os.path.exists(gerber_drill_dir):
-        os.makedirs(gerber_drill_dir)
-
-    return ret_prefix
-
-def generate_production_files(prefix, sch, pcb, out_dir):
-    out_path = os.path.join(out_dir, prefix)
-
-    bom_ret_code = os.system(f"kicad-cli sch export python-bom {sch} -o {out_path}_bom.xml")
-    bom_ret_code |= os.system(f"python -m scripts.generate_bom_from_xml {out_path}_bom.xml  {out_path}_bom.csv")
-    os.system(f"rm {out_path}_bom.xml")
-
-    pdf_ret_code = os.system(f"kicad-cli sch export pdf {sch} -o {out_path}.pdf")
-
-    pos_ret_code = os.system(f"kicad-cli pcb export pos {pcb} --format csv --units mm  -o {out_path}_pos.csv")
-
-    step_ret_code = os.system(f"kicad-cli pcb export step {pcb} --subst-models --force -o {out_path}.step")
-
-    out_path = os.path.join(out_dir, f"{prefix}_gerber_drill")
-    
-    gerber_ret_code = os.system(f"kicad-cli pcb export gerbers {pcb} -l 'F.Cu,In1.Cu,In2.Cu,B.Cu,F.Paste,B.Paste,F.Silkscreen,B.Silkscreen,F.Mask,B.Mask,Edge.Cuts' --no-x2 --subtract-soldermask -o {out_path}")
-    
-    # The additional trailing slash is due to a bug in the kicad-cli tool. https://gitlab.com/kicad/code/kicad/-/issues/14438
-    drill_ret_code = os.system(f"kicad-cli pcb export drill {pcb} -u mm --generate-map --map-format gerberx2 -o {out_path}/")
-    zip_ret_code = os.system(f"zip -r -j {out_path} {out_path}")
-    os.system(f"rm -r {out_path}")
-
-    print("=== File Generation Status === ")
-    print("Gerber: {}".format("Success" if gerber_ret_code == 0 else "Failed"))
-    print("Drill: {}".format("Success" if drill_ret_code == 0 else "Failed"))
-    print("Zip_Gerber_Drill: {}".format("Success" if zip_ret_code == 0 else "Failed"))
-    print("Bom: {}".format("Success" if bom_ret_code == 0 else "Failed"))
-    print("Pdf: {}".format("Success" if pdf_ret_code == 0 else "Failed"))
-    print("Pos: {}".format("Success" if pos_ret_code == 0 else "Failed"))
-    print("Step: {}".format("Success" if step_ret_code == 0 else "Failed"))
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Python Script to Generate Production Files(Gerber, Drill, Drill Map, Bom, Component Placement, Schematics PDF, Step Files)")
-    parser.add_argument("-s", "--sch",  
-                        default="kirdy.kicad_sch",
-                        help="schematics top file. defaults to 'kirdy.kicad_sch' if omitted")
-    parser.add_argument("-p", "--pcb",  
-                        default="kirdy.kicad_pcb",
-                        help="pcb file. defaults to 'kirdy.kicad_pcb' if omitted")
-    parser.add_argument("-o", "--output",  
-                        default="./production",
-                        help="output folder, defaults to './production' if omitted")
-    parser.add_argument("-pre", "--prefix",  
-                    default=None,
-                    help="output filename prefix, attempts to generated from schematics top file if omitted")
-    parser.add_argument("-dir_plugins", "--dir_kicad_plugins",  
-                default=None,
-                help="path to kicad_netlist_reader.py, attempts to find the required path in the system if omitted")
-    parser.add_argument("-dir_3d", "--dir_3d_models",  
-                default=None,
-                help="path to kicad 3d models folder, attempts to find the required path in the system if omitted")
-
-    args = parser.parse_args()
-
-    prefix = setup_env(args.prefix, args.sch, args.output, args.dir_kicad_plugins, args.dir_3d_models)
-
-    generate_production_files(prefix, args.sch, args.pcb, args.output)
-
-if __name__ == '__main__':
-    main()

src/asupply.kicad_sch

@@ -3877,10 +3877,10 @@
     (property "Datasheet" "~" (at 281.94 210.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "GRM21BZ71E106KE15K" (at 281.94 210.82 0)
+    (property "MFR_PN" "CL21B106KOQNNNG" (at 281.94 210.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN_ALT" "GRM21BZ71E106KE15L" (at 281.94 210.82 0)
+    (property "MFR_PN_ALT" "CL21B106KOQNNNE" (at 281.94 210.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 08a6df89-dc5a-40c7-b74e-27d010811d04))
@@ -4909,7 +4909,7 @@
     (property "Datasheet" "https://www.mouser.hk/datasheet/2/396/LSQ02_e-3082146.pdf" (at 120.65 237.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "C3225T220KR" (at 120.65 237.49 90)
+    (property "MFR_PN" "CBC3225T220KR" (at 120.65 237.49 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "MFR_PN_ALT" "LSQPA322525T220KR" (at 120.65 237.49 90)
@@ -7577,7 +7577,7 @@
     (property "Datasheet" "https://www.mouser.hk/datasheet/2/396/LSQ02_e-3082146.pdf" (at 166.37 201.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "C3225T220KR" (at 166.37 201.93 90)
+    (property "MFR_PN" "CBC3225T220KR" (at 166.37 201.93 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "MFR_PN_ALT" "LSQPA322525T220KR" (at 166.37 201.93 90)

src/driveStage.kicad_sch

@@ -3085,7 +3085,7 @@
   )
 
   (symbol (lib_id "kirdy:R_Y169010R0000T9L") (at 360.68 120.015 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (dnp yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 0eab9295-041d-4ed4-b10a-3c7684b6770c)
     (property "Reference" "R24" (at 362.585 118.745 0)
       (effects (font (size 1.27 1.27)) (justify right))
@@ -3379,7 +3379,7 @@
   )
 
   (symbol (lib_id "Device:R") (at 331.47 115.57 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board yes) (dnp yes)
     (uuid 276ec956-181f-40ad-b3fb-6d83e4859fd0)
     (property "Reference" "R22" (at 331.47 118.11 90)
       (effects (font (size 1.27 1.27)))
@@ -3547,7 +3547,7 @@
   )
 
   (symbol (lib_id "Device:R") (at 349.885 119.38 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board yes) (dnp yes)
     (uuid 2b425dde-7746-41bc-be37-43235bf0e487)
     (property "Reference" "R23" (at 351.79 118.745 0)
       (effects (font (size 1.27 1.27)) (justify left))
@@ -5080,7 +5080,7 @@
   )
 
   (symbol (lib_id "Device:R") (at 331.47 124.46 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid b2a44ba2-3ac1-4c9c-9c1d-4cfb7af052aa)
     (property "Reference" "R25" (at 331.47 127 90)
       (effects (font (size 1.27 1.27)))

src/dsupply.kicad_sch

@@ -3139,7 +3139,7 @@
     (property "MFR_PN" "PM1202" (at 154.305 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Manufacturer: SDAPO" (at 155.575 83.82 0)
+    (property "Comment" "https://m.tb.cn/h.5mqugBw?tk=N0blWf9e2cn" (at 155.575 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 14be5c36-316f-4e69-84bd-226d8db63330))

src/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1701952659,
+        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

src/flake.nix

@@ -0,0 +1,39 @@
+{
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+
+  outputs = { self, nixpkgs }: {
+
+    devShells.x86_64-linux.default =
+      let pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      in pkgs.mkShell {
+        name = "kicad-dev-shell";
+        buildInputs = [ pkgs.kicad ];
+        shellHook = ''
+          export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}
+          export PYTHONPATH=${pkgs.kicad.base}/share/kicad/plugins
+          export OUTPUT_DIR=$(pwd)/production
+        '';
+      };
+
+    defaultPackage.x86_64-linux = # Notice the reference to nixpkgs here.
+      with import nixpkgs { system = "x86_64-linux"; };
+      stdenv.mkDerivation {
+        name = "proj";
+        src = self;
+
+        nativeBuildInputs = [ pkgs.kicad pkgs.python3 ];
+        buildPhase = ''
+          export HOME=/tmp
+          echo ${src}
+          kicad-cli sch export pdf ${src}/kirdy.kicad_sch -o kirdy.pdf
+        '';
+        installPhase = "echo test";
+      };
+
+  };
+  # pkgs = nixpkgs.legacyPackages.x86_64-linux;
+  #       nativeBuildInputs = [
+  #          pkgs.kicad pkgs.python3
+  #       ];
+
+}

src/kirdy.kicad_pro

@@ -66,7 +66,14 @@
           "width": 0.117348
         }
       ],
-      "drc_exclusions": [],
+      "drc_exclusions": [
+        "hole_clearance|130350000|24000000|83553730-2413-4ad6-a317-ed776b3a8021|4e60be3e-79a4-41df-901a-326dc28e1f86",
+        "hole_clearance|158600000|24000000|c8e5c519-46e1-4ce1-a316-abb8969a411e|cc3dd9cf-30f4-44ad-a78d-6e534b4f5e2c",
+        "hole_clearance|158600000|76000000|0c452fd4-1270-4819-ab06-9c83d7cb07ba|e1d5bbe3-dca9-4fd4-aa90-fa7cb3a52dd6",
+        "solder_mask_bridge|130332340|24308208|83553730-2413-4ad6-a317-ed776b3a8021|4e60be3e-79a4-41df-901a-326dc28e1f86",
+        "solder_mask_bridge|130332340|76308208|6f270bc4-4133-428d-8b4f-df173b059340|fe51fc4a-61a2-4622-8c9f-962e914f266e",
+        "solder_mask_bridge|158582340|76308208|0c452fd4-1270-4819-ab06-9c83d7cb07ba|e1d5bbe3-dca9-4fd4-aa90-fa7cb3a52dd6"
+      ],
       "meta": {
         "version": 2
       },
@@ -124,10 +131,10 @@
         "allow_blind_buried_vias": false,
         "allow_microvias": false,
         "max_error": 0.005,
-        "min_clearance": 0.08889999999999999,
+        "min_clearance": 0.09,
         "min_connection": 0.0,
-        "min_copper_edge_clearance": 0.25,
-        "min_hole_clearance": 0.19999999999999998,
+        "min_copper_edge_clearance": 0.3,
+        "min_hole_clearance": 0.254,
         "min_hole_to_hole": 0.254,
         "min_microvia_diameter": 0.19999999999999998,
         "min_microvia_drill": 0.09999999999999999,
@@ -136,7 +143,7 @@
         "min_text_height": 0.7999999999999999,
         "min_text_thickness": 0.08,
         "min_through_hole_diameter": 0.19999999999999998,
-        "min_track_width": 0.08889999999999999,
+        "min_track_width": 0.09,
         "min_via_annular_width": 0.09999999999999999,
         "min_via_diameter": 0.39999999999999997,
         "solder_mask_clearance": 0.0,
@@ -440,7 +447,7 @@
     "classes": [
       {
         "bus_width": 12,
-        "clearance": 0.0889,
+        "clearance": 0.09,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
         "diff_pair_width": 0.2,
@@ -457,7 +464,7 @@
       },
       {
         "bus_width": 12,
-        "clearance": 0.0889,
+        "clearance": 0.09,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
         "diff_pair_width": 0.2,
@@ -474,7 +481,7 @@
       },
       {
         "bus_width": 12,
-        "clearance": 0.0889,
+        "clearance": 0.09,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
         "diff_pair_width": 0.2,

src/kirdy.kicad_sch

@@ -853,33 +853,6 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 334.01 154.305 0) (unit 1)
-    (in_bom yes) (on_board no) (dnp no)
-    (uuid 183a9e72-a95d-461b-a10b-3fb42d228b12)
-    (property "Reference" "SCREW3" (at 330.2 151.13 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "M3 x 8" (at 334.01 156.718 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 332.74 153.035 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 332.74 153.035 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR_PN" "FH4-M3-8" (at 334.01 154.305 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (instances
-      (project "kirdy"
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW3") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:R") (at 296.545 179.07 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp yes)
     (uuid 1c1a49e4-f784-4f10-9c53-f59db356230f)
@@ -1015,7 +988,13 @@
     (property "Datasheet" "" (at 315.595 153.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "FH4-M3-8" (at 316.865 154.305 0)
+    (property "MFR_PN" "EDLV-M3-L8" (at 316.865 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 316.865 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 316.865 154.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (instances
@@ -1121,28 +1100,34 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 342.9 154.305 0) (unit 1)
+  (symbol (lib_id "kirdy:Screw") (at 333.375 154.305 0) (unit 1)
     (in_bom yes) (on_board no) (dnp no)
-    (uuid 7d7ccd16-5d93-4f5a-9049-b2034f02d95c)
-    (property "Reference" "SCREW4" (at 339.09 151.13 0)
+    (uuid 65acffca-de34-48f7-917e-77b747d305c8)
+    (property "Reference" "SCREW3" (at 329.565 151.13 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3 x 8" (at 342.9 156.718 0)
+    (property "Value" "M3 x 8" (at 333.375 156.718 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 341.63 153.035 0)
+    (property "Footprint" "" (at 332.105 153.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 341.63 153.035 0)
+    (property "Datasheet" "" (at 332.105 153.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "FH4-M3-8" (at 342.9 154.305 0)
+    (property "MFR_PN" "EDLV-M3-L8" (at 333.375 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 333.375 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 333.375 154.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (instances
       (project "kirdy"
         (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW4") (unit 1)
+          (reference "SCREW3") (unit 1)
         )
       )
     )
@@ -1419,7 +1404,13 @@
     (property "Datasheet" "" (at 323.85 153.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "FH4-M3-8" (at 325.12 154.305 0)
+    (property "MFR_PN" "EDLV-M3-L8" (at 325.12 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 325.12 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 325.12 154.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (instances
@@ -1545,6 +1536,39 @@
     )
   )
 
+  (symbol (lib_id "kirdy:Screw") (at 341.63 154.305 0) (unit 1)
+    (in_bom yes) (on_board no) (dnp no)
+    (uuid e5d77fe7-0679-4db6-8102-f121afeea642)
+    (property "Reference" "SCREW4" (at 337.82 151.13 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3 x 8" (at 341.63 156.718 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 340.36 153.035 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 340.36 153.035 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN" "EDLV-M3-L8" (at 341.63 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 341.63 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 341.63 154.305 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (instances
+      (project "kirdy"
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
+          (reference "SCREW4") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "kirdy:Panel") (at 293.37 208.28 270) (unit 2)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid e9764e56-b700-47cf-ba98-dcdc23fae030)

src/mcu.kicad_sch

@@ -2726,6 +2726,42 @@
     )
   )
 
+  (symbol (lib_id "kirdy:Screw") (at 102.87 208.915 0) (unit 1)
+    (in_bom yes) (on_board no) (dnp no)
+    (uuid 05bd9a78-5ec3-4182-9223-198aa0619486)
+    (property "Reference" "SCREW4" (at 99.06 205.74 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3 x 8" (at 102.87 211.328 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 101.6 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 101.6 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN" "EDLV-M3-L8" (at 102.87 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 102.87 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 102.87 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (instances
+      (project "kirdy"
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
+          (reference "SCREW4") (unit 1)
+        )
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
+          (reference "SCREW6") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "power:GND") (at 120.015 195.58 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 0b9d4681-d636-499c-9456-242fb5e2df31)
@@ -3092,6 +3128,42 @@
     )
   )
 
+  (symbol (lib_id "kirdy:Screw") (at 120.015 208.915 0) (unit 1)
+    (in_bom yes) (on_board no) (dnp no)
+    (uuid 31db3faa-12b3-4b80-a6c3-e8fec4c132bb)
+    (property "Reference" "SCREW4" (at 116.205 205.74 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3 x 8" (at 120.015 211.328 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 118.745 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 118.745 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN" "EDLV-M3-L8" (at 120.015 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 120.015 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 120.015 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (instances
+      (project "kirdy"
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
+          (reference "SCREW4") (unit 1)
+        )
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
+          (reference "SCREW8") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:R") (at 124.46 149.86 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 3488fcc2-96d0-4f44-9077-0e06482de89e)
@@ -4113,36 +4185,6 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 103.505 208.915 0) (unit 1)
-    (in_bom yes) (on_board no) (dnp no)
-    (uuid a1a54f10-9052-4c18-902c-5cc6a4555da7)
-    (property "Reference" "SCREW?" (at 99.695 205.74 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "M3 x 8" (at 103.505 211.328 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 102.235 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 102.235 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR_PN" "FH4-M3-8" (at 103.505 208.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (instances
-      (project "kirdy"
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW?") (unit 1)
-        )
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
-          (reference "SCREW6") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 204.47 41.91 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid a2140362-07ce-4b03-8b3c-3b08e38a3536)
@@ -4176,7 +4218,7 @@
   )
 
   (symbol (lib_id "Connector:Conn_01x05_Pin") (at 361.315 91.44 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid a46f3d97-7af3-41c3-ad51-2686894a2414)
     (property "Reference" "J6" (at 361.95 81.915 0)
       (effects (font (size 1.27 1.27)))
@@ -4190,6 +4232,15 @@
     (property "Datasheet" "~" (at 361.315 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "MFR_PN" "HB-PH3-25415PB2GOP" (at 361.315 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "PH1-05-UA" (at 361.315 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "Generic 2.54mm x 5 Pin Header" (at 361.315 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 66199c09-c1c3-4157-811c-30f95b358b93))
     (pin "2" (uuid 899c2a35-0b12-40a8-9abe-269b3dbce6b6))
     (pin "3" (uuid 0e948f7f-dfa2-4b7e-bfe1-9e5d47d30043))
@@ -4478,6 +4529,42 @@
     )
   )
 
+  (symbol (lib_id "kirdy:Screw") (at 94.615 208.915 0) (unit 1)
+    (in_bom yes) (on_board no) (dnp no)
+    (uuid c93ddcb6-53b3-4aa6-bc2e-7d912273d090)
+    (property "Reference" "SCREW4" (at 90.805 205.74 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3 x 8" (at 94.615 211.328 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 93.345 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 93.345 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN" "EDLV-M3-L8" (at 94.615 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 94.615 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 94.615 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (instances
+      (project "kirdy"
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
+          (reference "SCREW4") (unit 1)
+        )
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
+          (reference "SCREW5") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "power:+3V3") (at 146.05 167.64 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid c9795646-ab15-43ce-9a5d-7ab8e0cc6208)
@@ -4503,36 +4590,6 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 95.25 208.915 0) (unit 1)
-    (in_bom yes) (on_board no) (dnp no)
-    (uuid cadd8f15-49ad-49da-b68c-ddf6c138d078)
-    (property "Reference" "SCREW?" (at 91.44 205.74 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "M3 x 8" (at 95.25 211.328 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 93.98 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 93.98 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR_PN" "FH4-M3-8" (at 95.25 208.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (instances
-      (project "kirdy"
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW?") (unit 1)
-        )
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
-          (reference "SCREW5") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:+5VA") (at 72.39 85.725 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid cc2794a0-1cf9-484f-9e22-3572ecd8a32a)
@@ -4595,36 +4652,6 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 121.285 208.915 0) (unit 1)
-    (in_bom yes) (on_board no) (dnp no)
-    (uuid d1f64861-c3ba-46ef-b3dd-a3d3a4547daa)
-    (property "Reference" "SCREW?" (at 117.475 205.74 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "M3 x 8" (at 121.285 211.328 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 120.015 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 120.015 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR_PN" "FH4-M3-8" (at 121.285 208.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (instances
-      (project "kirdy"
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW?") (unit 1)
-        )
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
-          (reference "SCREW8") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Mechanical:MountingHole_Pad") (at 120.015 185.42 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid d7fcdc3d-5c1a-460b-827a-b97f51dddd10)
@@ -4741,36 +4768,6 @@
     )
   )
 
-  (symbol (lib_id "kirdy:Screw") (at 112.395 208.915 0) (unit 1)
-    (in_bom yes) (on_board no) (dnp no)
-    (uuid ee077a50-73cf-4890-af81-e0d49e6395b9)
-    (property "Reference" "SCREW?" (at 108.585 205.74 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "M3 x 8" (at 112.395 211.328 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 111.125 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 111.125 207.645 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR_PN" "FH4-M3-8" (at 112.395 208.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (instances
-      (project "kirdy"
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
-          (reference "SCREW?") (unit 1)
-        )
-        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
-          (reference "SCREW7") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Device:C") (at 152.4 41.91 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid ef16c58e-ba59-4268-98bc-6377a8d8a788)
@@ -4976,4 +4973,40 @@
       )
     )
   )
+
+  (symbol (lib_id "kirdy:Screw") (at 111.76 208.915 0) (unit 1)
+    (in_bom yes) (on_board no) (dnp no)
+    (uuid fe37341a-cb99-4137-9ac1-47d8f8716b9f)
+    (property "Reference" "SCREW4" (at 107.95 205.74 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3 x 8" (at 111.76 211.328 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 110.49 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 110.49 207.645 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN" "EDLV-M3-L8" (at 111.76 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR_PN_ALT" "FH4-M3-8 " (at 111.76 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "https://jlcmc.com/product/s/E02/EDLV/cross-recessed-large-flat-head-screw" (at 111.76 208.915 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (instances
+      (project "kirdy"
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f"
+          (reference "SCREW4") (unit 1)
+        )
+        (path "/88da1dd8-9274-4b55-84fb-90006c9b6e8f/e9afb2cc-7f7f-4cb9-888a-0bfd71b1d070"
+          (reference "SCREW7") (unit 1)
+        )
+      )
+    )
+  )
 )

src/thermostat.kicad_sch

@@ -3188,7 +3188,10 @@
     (property "Datasheet" "https://www.analog.com/media/en/technical-documentation/data-sheets/ad5680.pdf" (at 168.275 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MFR_PN" "AD5680BRJZ" (at 177.165 101.6 0)
+    (property "MFR_PN" "AD5680BRJZ-1" (at 177.165 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Comment" "It must be \"-1\" model" (at 177.165 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cd0bde21-0441-4418-8330-6dd5a7d90601))