Stop bundling switch library with project archive

From now on, produced zip package will not contain keyboard switches
footprints library. There are following reasons:
- footprints are cached in kicad_pcb file
- user can easily install required library itself using KiCad plugin
  manager (which was not available when this project started)
- final package size will be much smaller
- there is no need to generate `fp-lib-table` file

Also stop generating kicad_pro file because it will be automatically
added by `board.SaveBoard` function.

Author: adamws

docs/src/guide.md

@@ -16,7 +16,7 @@ Recommended workflow contains following steps:
 - Go to [keyboard-tools's](http://keyboard-tools.xyz/) KiCad Project Generator
   tab (1), choose project options (2) and upload keyboard layout (3).
 
-  In this example I decided to use *Cherry MX* footprints  and I enabled
+  In this example I decided to use *Cherry MX* footprints and I enabled
   routing. Because I did not used key annotations (see
   [this](features#matrix-position-assignment)) I used *Automatic* matrix option.
 
@@ -25,17 +25,10 @@ Recommended workflow contains following steps:
 
   ![frontend](./assets/guide/frontend.png)
 
-- Download and unzip project. Open project located in `keyboard` directory.
-  It should contain following structure:
+- Download and unzip project. There will be two directories. One for `logs`
+  and the other for KiCad files.
 
-  ![kicad-project](./assets/guide/kicad-project.png)
-
-  ::: tip
-  Generated project has entire selected switch library bundled in.
-  This makes footprint replacement easy.
-  :::
-
-  `keyboard.kicad_pcb` file should have switches and diodes placed according
+  `*.kicad_pcb` file should have switches and diodes placed according
   to provided layout like this:
 
   ![pcb](./assets/guide/pcb.png)
@@ -81,7 +74,7 @@ Recommended workflow contains following steps:
     otherwise key matrix netlist will be overwritten (by default, KiCad names
     netlist same as project).
 
-  - Open `keyboard.kicad_pcb` and load microcontroller netlist.
+  - Open `*.kicad_pcb` and load microcontroller netlist.
 
     ![load-netlist](./assets/guide/load-netlist.png)
 

kicad-api/Dockerfile

@@ -2,13 +2,16 @@ FROM admwscki/kicad-kbplacer:0.8
 
 ENV PATH="/kicad/.local/bin:${PATH}"
 
-RUN mkdir switch-libs \
-  && cd switch-libs \
-  && mkdir keyswitch-kicad-library && cd keyswitch-kicad-library \
+# simulate installation with KiCad's PCM (we care only about footprints):
+RUN cd /kicad/.local/share/kicad/7.0/3rdparty \
+  && mkdir -p footprints \
+  && mkdir tmp && cd tmp \
   && wget https://github.com/kiswitch/keyswitch-kicad-library/releases/download/v2.4/keyswitch-kicad-library.zip \
   && echo "b38d56323acb91ad660567340ca938c5b4a83a27eea52308ef14aa7857b0071b keyswitch-kicad-library.zip" | sha256sum -c \
   && unzip keyswitch-kicad-library.zip \
-  && rm keyswitch-kicad-library.zip
+  && rm keyswitch-kicad-library.zip \
+  && mv footprints ../footprints/com_github_perigoso_keyswitch-kicad-library \
+  && cd .. && rm -rf tmp
 
 RUN mkdir templates \
   && cd templates \

kicad-api/requirements.txt

@@ -1,5 +1,4 @@
 celery==5.3.6
-flask==3.0.0
 git+https://github.com/adamws/kinet2pcb@1fc8a4b67e9fbb25beade950c80d3cdc8d868c23
 minio==7.1.16
 PcbDraw==1.1.2

kicad-api/src/keyboard.kicad_pro.template

@@ -7,9 +7,9 @@
 from pathlib import Path
 
 import pcbnew
-from jinja2 import Template
 from kbplacer.defaults import DEFAULT_DIODE_POSITION, ZERO_POSITION
 from kbplacer.element_position import ElementInfo, PositionOption
+from kbplacer.kle_serial import get_keyboard
 from kbplacer.key_placer import KeyPlacer
 from kbplacer.template_copier import TemplateCopier
 from kinet2pcb import kinet2pcb
@@ -21,49 +21,6 @@
 __all__ = ["new_pcb"]
 
 
-def prepare_project(project_full_path, project_name, switch_library):
-    tm = Template(
-        "(sym_lib_table\n{% for sym_lib in sym_libs -%}{{ sym_lib }}\n{% endfor %})"
-    )
-    sym_lib_table = tm.render(sym_libs=[])
-    with open(f"{project_full_path}/sym-lib-table", "w") as f:
-        f.write(sym_lib_table)
-
-    tm = Template(
-        "(fp_lib_table\n{% for fp_lib in fp_libs -%}{{ fp_lib }}\n{% endfor %})"
-    )
-    if switch_library == "kiswitch/keyswitch-kicad-library":
-        prefix = "${KIPRJMOD}/libs/keyswitch-kicad-library/footprints"
-        fp_lib_table = tm.render(
-            fp_libs=[
-                f'(lib (name Switch_Keyboard_Cherry_MX)(type KiCad)(uri {prefix}/Switch_Keyboard_Cherry_MX.pretty)(options "")(descr ""))',
-                f'(lib (name Switch_Keyboard_Alps_Matias)(type KiCad)(uri {prefix}/Switch_Keyboard_Alps_Matias.pretty)(options "")(descr ""))',
-                f'(lib (name Switch_Keyboard_Hybrid)(type KiCad)(uri {prefix}/Switch_Keyboard_Hybrid.pretty)(options "")(descr ""))',
-                f'(lib (name Mounting_Keyboard_Stabilizer)(type KiCad)(uri {prefix}/Mounting_Keyboard_Stabilizer.pretty)(options "")(descr ""))',
-            ]
-        )
-        shutil.copytree(
-            "switch-libs/keyswitch-kicad-library",
-            f"{project_full_path}/libs/keyswitch-kicad-library",
-        )
-    else:
-        msg = "Unsupported switch library"
-        raise Exception(msg)
-
-    with open(f"{project_full_path}/fp-lib-table", "w") as f:
-        f.write(fp_lib_table)
-
-    with open(f"{project_full_path}/{project_name}.kicad_pcb", "w") as f:
-        f.write('(kicad_pcb (version 4) (host kicad "dummy file") )')
-
-    file_path = os.path.dirname(os.path.realpath(__file__))
-    with open(f"{file_path}/keyboard.kicad_pro.template") as f:
-        template = Template(f.read())
-        result = template.render(project_name=project_name)
-        with open(f"{project_full_path}/{project_name}.kicad_pro", "w") as f:
-            f.write(result)
-
-
 def run_element_placement(pcb_path, layout, settings):
     diode = ElementInfo("D{}", PositionOption.DEFAULT, DEFAULT_DIODE_POSITION, "")
     route_switches_with_diodes = settings["routing"] == "Full"
@@ -240,8 +197,6 @@ def new_pcb(task_id, task_request, update_state_callback):
     layout = task_request["layout"]
     settings = task_request["settings"]
 
-    switch_library = settings["switchLibrary"]
-
     project_name = layout["meta"]["name"]
     project_name = "keyboard" if project_name == "" else project_name
     project_full_path = str(Path(task_id).joinpath(project_name).absolute())
@@ -253,8 +208,6 @@ def new_pcb(task_id, task_request, update_state_callback):
     configure_loggers(log_path)
 
     update_state_callback(10)
-    prepare_project(project_full_path, project_name, switch_library)
-
     sanitize_keys(layout["keys"])
 
     pcb_file = f"{project_full_path}/{project_name}.kicad_pcb"
@@ -275,14 +228,12 @@ def new_pcb(task_id, task_request, update_state_callback):
     generate_netlist(netlist_file)
 
     update_state_callback(30)
-    kinet2pcb(
-        netlist_file,
-        pcb_file,
-        [
-            "/usr/share/kicad/footprints",
-            f"{project_full_path}/libs/keyswitch-kicad-library/footprints",
-        ],
-    )
+    libraries = ["/usr/share/kicad/footprints"]
+    footprints = Path(f"{Path.home()}/.local/share/kicad/7.0/3rdparty/footprints")
+    for path in footprints.iterdir():
+        if path.is_dir():
+            libraries.append(str(path))
+    kinet2pcb(netlist_file, pcb_file, libraries)
 
     update_state_callback(40)
     run_element_placement(pcb_file, layout, settings)

kicad-api/src/kicad.py

@@ -20,7 +20,6 @@ def assert_zip_content(zipfile):
     files_in_zip = zipfile.namelist()
     assert "logs/build.log" in files_in_zip
     expected_in_keyboard_dir = [
-        "sym-lib-table",
         "keyboard.net",
         "keyboard.kicad_pro",
         "keyboard.kicad_pcb",