Introduce using multiple sub-circuits

Author: adamws

.justfile

@@ -1,4 +1,4 @@
-template_atmega32u4_au_v1 := "./atmega32u4_au_v1.kicad_pcb"
+template_atmega32u4_v1 := "./atmega32u4_v1.kicad_pcb"
 pcb_url := "https://raw.githubusercontent.com/ai03-2725/JP60/main/JP60.kicad_pcb"
 kicad_svg_fix := semver_matches(`kicad-cli --version`, ">=9.0.0")
 
@@ -17,28 +17,32 @@ svg kicad_pcb:
     -l F.Cu,B.Cu,F.Silkscreen,B.Silkscreen,Edge.Cuts \
     -o "{{without_extension(kicad_pcb)}}.svg" {{kicad_pcb}}
 
-circuits variant:
-  hatch run kicad:circuits --variant {{variant}}
-  just templates-svgs {{variant}}
+circuits circuit revision:
+  hatch run kicad:circuits --circuit {{circuit}} --rev {{revision}}
+  just templates-svgs {{circuit}}_{{revision}}
+
+all-circuits:
+  just circuits atmega32u4 v1
+  just circuits usb v1
 
 positions:
-  hatch run kicad:positions {{pcb_url}}
+  hatch run kicad:positions {{template_atmega32u4_v1}}
 
 tracks:
-  hatch run kicad:tracks {{template_atmega32u4_au_v1}}
+  hatch run kicad:tracks {{template_atmega32u4_v1}}
 
 io_tracks:
-  hatch run kicad:io_tracks {{template_atmega32u4_au_v1}}
+  hatch run kicad:io_tracks {{template_atmega32u4_v1}}
 
 templates-svgs variant:
-  just svg atmega32u4_au_{{variant}}.kicad_pcb
-  just svg-mm-to-cm atmega32u4_au_{{variant}}.svg
-  if {{kicad_svg_fix}} == "true"; then just svg-fix-area atmega32u4_au_{{variant}}.svg; fi
-  cp atmega32u4_au_{{variant}}.svg ./kicad-templates/
-  rm atmega32u4_au_{{variant}}.svg
-  firefox ./kicad-templates/atmega32u4_au_{{variant}}.svg
+  just svg {{variant}}.kicad_pcb
+  just svg-mm-to-cm {{variant}}.svg
+  if {{kicad_svg_fix}} == "true"; then just svg-fix-area {{variant}}.svg; fi
+  cp {{variant}}.svg ./kicad-templates/
+  rm {{variant}}.svg
+  firefox ./kicad-templates/{{variant}}.svg
 
 # assumes git-lukaj configured, see:
 # https://github.com/adamws/lukaj?tab=readme-ov-file#git-integration
-template-diff variant:
-  git diff-svg ./kicad-templates/atmega32u4_au_{{variant}}.svg
+template-diff circuit revision:
+  git diff-svg ./kicad-templates/{{circuit}}_{{revision}}.svg

README.md

@@ -32,7 +32,9 @@ Options
 --stabilizer-footprint  Stabilizer footprint f-string, optional [default: PCM_Mounting_Keyboard_Stabilizer:Stabilizer_Cherry_MX_{:.2f}u]
 --diode-footprint       Diode footprint [default: Diode_SMD:D_SOD-123F]
 --lib-path              Path to symbol library [default: None]
---controller-circuit    Add microcontroller circuitry [default: none]
+--controller-circuit    Name of controller circuit [default: None]
+--extra-circuits        Extra circuits [default: None]
+--row-column-pin-order  Comma separated list of microcontroller pins defining order of row/column assignments [default: None]
 --version               Prints the version of the kle2netlist package.
 --help                  Show this message and exit.
 ```
@@ -45,7 +47,11 @@ Options
         <td align="center"><b>Layout</b></td>
     </tr>
     <tr>
-        <td>atmega32u4_au_v1:<br>[todo]</td>
-        <td><img src="kicad-templates/atmega32u4_au_v1.svg"/></td>
+        <td>atmega32u4_v1:<br>[todo]</td>
+        <td align="center"><img src="kicad-templates/atmega32u4_v1.svg"/></td>
+    </tr>
+    <tr>
+        <td>usb_v1:<br>[todo]</td>
+        <td align="center"><img src="kicad-templates/usb_v1.svg" width="20%"/></td>
     </tr>
 </table>