pcb: correct wrong LD- silkscreen markings

- LD-: 9 | LD-: 11 are swapped
- Change Rev Num to rev0_1rc2

flake.lock

@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702233072,
+        "lastModified": 1703467016,
-        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
+        "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
+        "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,100 +9,90 @@
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; };
 
-      build = { variant }:
+      adapter_production_files = variant: pkgs.stdenv.mkDerivation {
-        let
+        name = "production-files";
-          adapter_production_files = pkgs.stdenv.mkDerivation {
+        src = ./kirdy_LD_adapter_${variant};
-            name = "production-files";
-            src = ./kirdy_LD_adapter_${variant};
 
-            nativeBuildInputs = [ pkgs.kicad pkgs.zip pkgs.python3 ];
+        nativeBuildInputs = [ pkgs.kicad pkgs.zip pkgs.python3 ];
 
-            buildPhase = ''
+        buildPhase = ''
-              echo ${variant}
+          # kicad-cli requires the use of $HOME
+          TMP_DIR="$(mktemp --tmpdir -d kicad-kirdy.XXXXXXX)"
+          export HOME=$TMP_DIR
 
-              # kicad-cli requires the use of $HOME
+          SCH=kirdy_LD_adapter_${variant}.kicad_sch
-              TMP_DIR="$(pwd)/$(mktemp -d tmp.XXXX)"
+          PCB=kirdy_LD_adapter_${variant}.kicad_pcb
-              export HOME=$TMP_DIR
 
-              SCH=kirdy_LD_adapter_${variant}.kicad_sch
+          # Get Revision Number from the Title Block in KiCAD Top Schematics
-              PCB=kirdy_LD_adapter_${variant}.kicad_pcb
+          REV=$(cat $SCH | grep rev | cut -d'"' -f 2)
+          PREFIX=kirdy_LD_adapter_${variant}_$REV
 
-              # Get Revision Number from the Title Block in KiCAD Top Schematics
+          kicad-cli sch export python-bom $SCH -o $PREFIX"_bom".xml
-              REV=$(cat $SCH | grep rev | cut -d'"' -f 2)
+          export PYTHONPATH=${pkgs.kicad.base}/share/kicad/plugins
-              PREFIX=kirdy_LD_adapter_${variant}_$REV
+          python ${kicad_bom_generator}/generate_bom_from_xml.py $PREFIX"_bom".xml $PREFIX"_bom".csv
 
-              kicad-cli sch export python-bom $SCH -o $PREFIX"_bom".xml
+          kicad-cli sch export pdf $SCH -o $PREFIX.pdf
-              export PYTHONPATH=${pkgs.kicad.base}/share/kicad/plugins
+          kicad-cli pcb export pos $PCB --format csv --units mm  -o $PREFIX"_pos".csv
-              python ${kicad_bom_generator}/generate_bom_from_xml.py $PREFIX"_bom".xml $PREFIX"_bom".csv
 
-              kicad-cli sch export pdf $SCH -o $PREFIX.pdf
+          export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}/share/kicad/3dmodels
-              kicad-cli pcb export pos $PCB --format csv --units mm  -o $PREFIX"_pos".csv
+          kicad-cli pcb export step $PCB --subst-models --force -o $PREFIX.step
 
-              export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}/share/kicad/3dmodels
+          mkdir -p $PREFIX"_gerber_drill"
-              kicad-cli pcb export step $PCB --subst-models --force -o $PREFIX.step
+          kicad-cli pcb export gerbers $PCB -l 'F.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"
 
-              mkdir -p $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 gerbers $PCB -l 'F.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"
+          kicad-cli pcb export drill $PCB -u mm --generate-map --map-format gerberx2 -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
+          zip -r -j $PREFIX"_gerber_drill" $PREFIX"_gerber_drill"
-              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
 
-              rm -r $TMP_DIR
+          cp $PREFIX.step $out/production_files/$PREFIX.step
-            '';
+        '';
+      };
 
-            installPhase = ''
+      copper_plate_production_files = pkgs.stdenv.mkDerivation {
-              mkdir -p $out/production_files 
+        name = "production-files";
-              cp $PREFIX"_bom".csv $out/production_files/$PREFIX"_bom".csv
+        src = ./kirdy_LD_adapter_copper_plate;
-              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
 
-              cp $PREFIX.step $out/production_files/$PREFIX.step
+        nativeBuildInputs = [ pkgs.kicad pkgs.python3 ];
-            '';
-          };
 
-          copper_plate_production_files = pkgs.stdenv.mkDerivation {
+        buildPhase = ''
-            name = "production-files";
+          # kicad-cli requires the use of $HOME
-            src = ./kirdy_LD_adapter_copper_plate;
+          TMP_DIR="$(mktemp --tmpdir -d kicad-kirdy.XXXXXXX)"
+          export HOME=$TMP_DIR
 
-            nativeBuildInputs = [ pkgs.kicad pkgs.zip pkgs.python3 ];
+          PCB=kirdy_LD_adapter_copper_plate.kicad_pcb
 
-            buildPhase = ''
+          # Get Revision Number from the Title Block in KiCAD PCB
-              # kicad-cli requires the use of $HOME
+          REV=$(cat $PCB | grep rev | cut -d'"' -f 2)
-              TMP_DIR="$(pwd)/$(mktemp -d tmp.XXXX)"
+          PREFIX=kirdy_LD_adapter_copper_plate_$REV
-              export HOME=$TMP_DIR
 
-              PCB=kirdy_LD_adapter_copper_plate.kicad_pcb
+          export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}/share/kicad/3dmodels
+          kicad-cli pcb export step $PCB --subst-models --force -o $PREFIX.step
+        '';
 
-              # Get Revision Number from the Title Block in KiCAD PCB
+        installPhase = ''
-              REV=$(cat $PCB | grep rev | cut -d'"' -f 2)
+          mkdir -p $out/production_files
-              PREFIX=kirdy_LD_adapter_copper_plate_$REV
+          cp $PREFIX.step $out/production_files/$PREFIX.step
+        '';
+      };
 
-              export KICAD7_3DMODEL_DIR=${pkgs.kicad.libraries.packages3d}/share/kicad/3dmodels
+    in {
-              kicad-cli pcb export step $PCB --subst-models --force -o $PREFIX.step
-
-              rm -r $TMP_DIR
-            '';
-
-            installPhase = ''
-              mkdir -p $out/production_files 
-              cp $PREFIX.step $out/production_files/$PREFIX.step
-            '';
-          };
-
-        in {
-          "LD_adapter_${variant}_PCB" = adapter_production_files;
-          "LD_adapter_${variant}_copper_plate" = copper_plate_production_files;
-        };
-
-    in rec {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
 
-      packages.x86_64-linux = (build { variant = "type_1"; })
+      packages.x86_64-linux = {
-        // (build { variant = "type_2"; });
+        "LD_adapter_type_1_PCB" = adapter_production_files "type_1";
+        "LD_adapter_type_2_PCB" = adapter_production_files "type_2";
+        "LD_adapter_copper_plate" = copper_plate_production_files;
+      };
 
       devShells.x86_64-linux.default =
         let pkgs = nixpkgs.legacyPackages.x86_64-linux;

kirdy_LD_adapter_type_1/kirdy_LD_adapter_type_1.kicad_pcb

@@ -6,8 +6,9 @@
 
   (paper "A4")
   (title_block
-    (rev "v0_1rc1")
+    (rev "v0_1rc2")
     (comment 1 "v0_1rc1: Changed the location of silkscreen markings of Bias-T Modulation Input")
+    (comment 2 "v0_1rc2: Correct Silkscreen Markings of LD9 and LD11")
   )
 
   (layers
@@ -2761,19 +2762,19 @@
   (gr_text "Use Bias-T" (at -40.4 -1.39 270) (layer "B.SilkS") (tstamp 27273078-f90b-42d9-aa8d-6b3b1a0d97c4)
     (effects (font (size 0.8 0.8) (thickness 0.15)) (justify left mirror))
   )
-  (gr_text "LD-: 9" (at -32.258 4.582) (layer "B.SilkS") (tstamp 4cc0ef08-f92c-4c13-bdf4-4ed9b0d668f1)
+  (gr_text "LD-: 11" (at -32.258 4.582) (layer "B.SilkS") (tstamp 4cc0ef08-f92c-4c13-bdf4-4ed9b0d668f1)
     (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
   )
   (gr_text "PD+: 3" (at -27.25 11.01) (layer "B.SilkS") (tstamp c5025ffb-4132-40ad-9ba2-5a426d255675)
     (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
   )
-  (gr_text "Kirdy Adapter for Type-1 Laser Diode \nRev: 0_1" (at 41.148 32.014) (layer "B.SilkS") (tstamp d9185641-8167-4841-b540-088303848472)
+  (gr_text "Kirdy Adapter for Type-1 Laser Diode \nRev: 0_1rc2" (at 41.148 32.014) (layer "B.SilkS") (tstamp d9185641-8167-4841-b540-088303848472)
     (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
   )
   (gr_text "PD-: 7" (at -27.25 9.01) (layer "B.SilkS") (tstamp e9305944-d283-4481-a373-483045d7de6d)
     (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
   )
-  (gr_text "LD-: 11" (at -32.258 1.998) (layer "B.SilkS") (tstamp f8a1f124-6566-4a42-92b0-87395200e1f8)
+  (gr_text "LD-: 9" (at -32.258 1.998) (layer "B.SilkS") (tstamp f8a1f124-6566-4a42-92b0-87395200e1f8)
     (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
   )
   (gr_text "Type-1 LD" (at 0 29.01) (layer "F.SilkS") (tstamp 6b833559-6474-4221-aa6a-78219e45b6af)