Merge branch 'mounting-hw'

- Fix all components to include full information including BOM
information

- Include all mounting hardware in components List

- fix schematic to align on 0.1" grid.

.github/workflows/asdf-firmware.yml

@@ -0,0 +1,39 @@
+name: asdf-firmware
+on:
+  push:
+    branches:
+      - asdf-release
+      - asdf-build-test
+
+jobs:
+  build_firmware:
+    runs-on: ubuntu-latest
+    container: { image: alpine }
+    defaults:
+      run:
+        shell: sh
+    steps:
+       - name: install_git_and_bash
+         run: apk add bash git rsync
+
+       - name: checkout
+         uses: actions/checkout@v2
+
+       - run: apk add gcc-avr binutils-avr avr-libc
+       - run: apk add cmake make
+       - run: apk add python3 py3-pip
+       - run: pip install -U sphinx sphinx-rtd-theme sphinx-autodoc-typehints
+       - run: pip install -U sphinxcontrib-napoleon
+       - run: pip install -U toml
+#       - run: pip install pipenv
+
+       # Create the build directories, make all targets, and copy
+       # hex files to sphinx source directory for download links
+       - run: cd firmware/asdf; /bin/bash ./make-targets.sh -a -i -s
+       - run: mkdir public; touch public/.nojekyll
+       - run: sphinx-build -b html firmware/asdf/docs/source public
+
+       - name: Deploy
+         uses: JamesIves/github-pages-deploy-action@v4
+         with:
+           folder: public

README.md

@@ -14,10 +14,12 @@ The keyboard is designed using KiCad in order to be the most useful for anybody
 - Replacement keyboard for the Sol-20 computer
 - Generic ADM-3A/Teletype style keyboard
 - Apple I keyboard (multiple styles)
+- Franklin ACE 1000 replacement keyboard by Chris Ryu (https://github.com/ryucats/Franklin-ACE-1000-Keyboard)
 
 ### Coming soon:
 - Replace encoder board on Apple II/II+ keyboards
 - Convert an OSI 542 keyboard into a generic ASCII keyboard
+- Replica for Knight keyboard
 
 ### This keyboard project so far consists of:
 - A classic retro-style ASCII keyboard, modeled after the ADM-3A keyboard, which

firmware/asdf/CMakeLists.txt

@@ -4,43 +4,90 @@ set(KEYMAPFILE keymaps.txt)
 
 # Set up the toolchain and other architecture specific details
 
-if(ARCH MATCHES atmega328p)
-  message(STATUS "setting up for atmega328p")
-  set(AVF_H_FUSE 0xd9)
+set(ARCH_FAMILY_ATMEGA328P atmega328p)
+set(ARCH_FAMILY_ATMEGA2560 atmega2560)
+
+if(ARCH MATCHES atmega328p OR ARCH MATCHES atmega168p OR ARCH MATCHES atmega88p)
+  set(FUSE_NOTES "Setting up for ${ARCH}: \n\n\
+       Fuses: EXTENDED = 0xFF, HIGH = 0xdf, LOW = 0xd2\n\n\
+       Brownout detect level:          111   (disabled) \n\
+       Debug Wire (DWEN):              0     (disabled) \n\
+       SPIEN:                          1     (enabled) \n\
+       Watchdog (WDTON):               0     (disabled) \n\
+       Save EEPROM (EESAVE):           0     (disabled) \n\
+       Boot section / size (BOOTZ):    11    (size=128[88p,168p]/256[328p])) \n\
+       Boot Reset Vector (BOOTRST):    0     (disabled) \n\
+       Divide Clock by 8 (CKDIV8):     0     (disabled) \n\
+       Clock out B0 (CKOUT)            0     (disabled) \n\
+       Clock select (CKSEL3:0):       0010   (Ext Crystal 8.0 MHz) \n\
+       Startup time (SUT):             01    (4.1 ms)\n\n")
+
+  set(AVR_X_FUSE 0xff)
+  set(AVR_H_FUSE 0xdf)
   set(AVR_L_FUSE 0xd2)
+
   set(AVR_MCU ${ARCH})
-
+  set(ARCH_FAMILY ${ARCH_FAMILY_ATMEGA328P})
+  set(ARCH_TYPE AVR)
   set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/generic-gcc-avr.cmake)
-  set (ASDF_OUT_TARGET ${ASDF_TARGET}.elf)
+  set (FINAL_TARGET ${TARGET}.elf)
 
-elseif(ARCH MATCHES atmega2560)
-  message(STATUS "setting up for atmega2560")
-  set(AVF_H_FUSE 0x99)
+elseif(ARCH MATCHES atmega640 OR ARCH MATCHES atmega1280 OR ARCH MATCHES atmega2560)
+  set(FUSE_NOTES "Setting up for ${ARCH}: \n\n\
+       Fuses: EXTENDED = 0xFD, HIGH = 0x98, LOW = 0xFD\n\n\
+       Brownout detect level:          111   (disabled) \n\
+       On-chip Debug (OCD):            0     (disabled) \n\
+       JTAGEN:                         1     (enabled) \n\
+       SPIEN:                          1     (enabled) \n\
+       Watchdog (WDTON):               0     (disabled) \n\
+       Save EEPROM (EESAVE):           0     (disabled) \n\
+       Boot section / size (BOOTZ):    00    (size=4096/start=$1F000) \n\
+       Boot Reset Vector (BOOTRST):    0     (enabled) \n\
+       Divide Clock by 8 (CKDIV8):     0     (disabled) \n\
+       Clock out E7 (CKOUT)            0     (disabled) \n\
+       Clock select (CKSEL0:3):       0111   (Full Swing Osc.) \n\
+       Startup time (SUT):             10    (4.1 ms)\n\n")
+
+  set(AVR_X_FUSE 0xff)
+  set(AVR_H_FUSE 0x99)
   set(AVR_L_FUSE 0xe7)
+
   set(AVR_MCU ${ARCH})
+  set(ARCH_FAMILY ${ARCH_FAMILY_ATMEGA2560})
+  set(ARCH_TYPE AVR)
 
   set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/generic-gcc-avr.cmake)
-  set (ASDF_OUT_TARGET ${ASDF_TARGET}.elf)
+  set (FINAL_TARGET ${TARGET}.elf)
 
 endif()
 
 project("asdf"
-  VERSION 1.6.2
+  VERSION 1.6.5
   DESCRIPTION "A customizable keyboard matrix controller for retrocomputers"
   LANGUAGES C)
 
 set_property(GLOBAL PROPERTY C_STANDARD 99)
 
-set(ASDF_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set(PROJECT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+message("SRC Dir is ${PROJECT_SRC_DIR}")
 
-set (ASDF_TARGET_NAME asdf-v${PROJECT_VERSION}-${ARCH})
-set (ASDF_EXECUTABLE_TARGET_NAME ${ASDF_TARGET_NAME})
+#set(PYTHON_SCRIPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
+#message("Python scripts Dir is ${PYTHON_SCRIPTS_DIR}")
+
+set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+message("Documentation and web page directory is ${DOC_DIR}")
+
+set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR})
+message("Install root: ${CMAKE_INSTALL_PREFIX}")
+
+set (PROJECT_TARGET_NAME ${PROJECT_NAME}-v${PROJECT_VERSION}-${ARCH})
+set (PROJECT_EXECUTABLE_TARGET_NAME ${PROJECT_TARGET_NAME})
 
 if(ARCH MATCHES test)
   add_subdirectory(test)
 else()
-  if((ARCH MATCHES atmega328p) OR (ARCH MATCHES atmega2560))
-    set (ASDF_EXECUTABLE_TARGET_NAME ${ASDF_TARGET_NAME}.elf)
+  if(ARCH_TYPE MATCHES AVR)
+    set (PROJECT_EXECUTABLE_TARGET_NAME ${PROJECT_TARGET_NAME}.elf)
 
     function(custom_add_library EXECUTABLE_NAME)
       add_avr_library(${EXECUTABLE_NAME} ${ARGN})
@@ -53,3 +100,8 @@ else()
 
   add_subdirectory(src)
 endif()
+
+# generate reStructuredText index file for project version: Note: this may be
+# rebuilt for each target, but as long as all have the same project version, the
+# build is idempotent, so no issues.
+configure_file(${DOC_DIR}/source/_templates/index.rst.in ${DOC_DIR}/source/index.rst)

firmware/asdf/Pipfile

@@ -0,0 +1,20 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+black = "*"
+flake8 = "*"
+pylint = "*"
+mypy = "*"
+
+[packages]
+sphinx = "*"
+sphinx-autodoc-typehints = "*"
+sphinx-rtd-theme = "*"
+toml = "*"
+intelhex = "*"
+
+[requires]
+python_version = "3"

firmware/asdf/README.md

@@ -1,5 +1,5 @@
-ASDF Keyboard scanning firmware
--
+# ASDF Keyboard scanning firmware
+
 This is a key matrix scanner that can detect and debounce keypress and release
 events on a key matrix and either send codes or perform actions on keypress or
 release. Keymaps are defined per application and may, for example, generate
@@ -18,8 +18,12 @@ ASDF supports basic keyboard functionality and is configurable via a few
 boolean variables, and via the key maps. The key maps are organized in
 row,column format, with separate keymaps shift, capslock, and control-key modes.
 
-Features:
---
+## Downloads:
+
+Download the latest release of the firmware [here](https://osiweb.github.io/unified_retro_keyboard)
+
+## Features:
+
 * modifiers: A set of modifier keys may be specified. When only a few modifiers
   are used, this mechanism is a low-overhead alternative to a keymap overlay for
   keyboard states that only change the key codes produced by a keypress, such as
@@ -47,6 +51,7 @@ Features:
   * (2): Apple 2 ASCII keyboard (upper/lower)
   * (3): Apple 2 ASCII keyboard (standard all caps)
   * (4): Sol-20 ASCII keyboard
+  * (5): Franklin Ace-100 keyboard (Thanks to Chris Ryu)
 
 * Debounce and Repeat functions: The main keyscan logic implements key
   debouncing. Multiple keys may be debounced simultaneously using a separate
@@ -59,23 +64,131 @@ Features:
 
 * ASCII output - supported via output_value function.
 
-* Virtual Output layer: Indicator LEDs and other direct logic-level hardware controls: supported via
- a virtual output layer.  The keymaps (and certain functions such as shiftlock and capslock) may bind virtual outputs.  The keymaps may then specify how the virtual outputs map to the available physical resources.  This allows one keymap to place the capslock LED in one position, and another keymap may place the capslock LED elswhere.  This simplifies support of multiple keyboards and keymaps.
+* Virtual Output layer: Indicator LEDs and other direct logic-level hardware
+ controls: supported via a virtual output layer. The keymaps (and certain
+ functions such as shiftlock and capslock) may bind virtual outputs. The keymaps
+ may then specify how the virtual outputs map to the available physical
+ resources. This allows one keymap to place the capslock LED in one position,
+ and another keymap may place the capslock LED elswhere. This simplifies support
+ of multiple keyboards and keymaps.
 
-Compiling and configuration
---
-The source files are in the ./src directory.  The final build files go in the ./build directory.
+## Compiling and configuration
 
-To build, enter the ./src directory. You should be able to build a binary and
-hex file suitable for programming a microcontroller by typing "Make". You may
-edit the Makefile to specify your target platform (default is Atmega328P ASCII
-controller). You may also wish to edit your preferences in "asdf_config.h" to
-specify repeat timings, optimize the debounce setting (if you have very bounce
-keys), and specify the character output buffer size (if you are implementing
-macros, etc.)
+### Changing project name and version number.
+
+- Edit the file "CMakeLists.txt"
+- You will see a "project" section near the beginning of the file.
+
+        project("asdf"
+            VERSION 1.6.3
+            DESCRIPTION "A customizable keyboard matrix controller for retrocomputers"
+            LANGUAGES C)
+
+- You can change the project name from "asdf" to whatever you like, and change the version number as you see fit.  These values will be used to name the resulting hex files, and also to name the download links in the GitHub page, if you choose to create one. 
+
+        project("my-keyboard"
+            VERSION 1.0
+            DESCRIPTION "My customized keyboard firmware"
+            LANGUAGES C)
+
+### building using github actions:
+
+If you have commit privileges to the repository, or if you have your own fork,
+then push a commit to one of the following branches to trigger an automatic build:
+
+- asdf-release
+- asdf-build-test
+
+This will generate a github page with downloadable hex files. You will find the
+link to the github page in the "Actions" tab of the repository. 
+
+You will also need to activate GitHub pages.  To do this:
+
+- Click "Settings" at the top of this GitHub page, then along the menu bar on the left, select "Pages" in the "Code and Actions Section."
+- In the "Build and deployment" section, select "Deploy from Branch"
+- The "Branch" section will display a message that github pages is disabled.  Select the branch "gh-pages" from the dropdown, and the "disabled" message will be replaced with a message that the site is being built from "gh-pages".  Once you have triggered a build, you will see a message at the top of this page with a link to the live page. 
+- 
+
+### build using the make-build-dirs.sh script.
+
+
+1) Run the make-targets.sh script
+
+    Options:
+
+            -x   Before creating a build directgory or virtual env, remove
+                 any pre-existing version
+            -t   add an architecture directory
+            -a   Add all valid architecture directories
+            -i   Build each specified target and install to dist directory
+            -p   Install pipenv virtual environment for python scripts
+            -c   Clean all artifacts
+            -s   Copy dist files to sphinx directory
+
+    Valid targets: atmega640, atmega1280, atmega2560
+
+    - To create build directories for all targets and install the python virtual
+      environment:
+
+            bash make-targets.sh -ap
+
+    - To create a a build directory for atmega1280, deleting any pre-existing directory:
+
+            bash make-targets.sh -xt atmega2560
+
+    - To remove and rebuild the python virtual environment:
+
+            bash make-targets.sh -xp
+
+    - To copy hex files to sphinx source tree (Requires the hex files
+      to be installed in ./dist either from make install in each target
+      directory, or 'bash make-targets.sh -ai')
+
+            bash make-targets.sh -s
+
+
+    - From a fresh checkout, build all targets and install hex files in
+      sphinx tree for the download links:
+
+            bash make-targets -pais
+
+2) Enter the build directory for the desired architecture and build:
+   Only needed if working on single target.  To make all targets at once,
+   use the make-targest script described in step 1.
+
+   Example: building the atmega2560 binary:
+
+         cd build-atmega2560
+         make
+
+3) Build the sphinx documentation:
+
+         cd docs
+         pipenv run make html
+
+### build manually (e.g., for development)
+
+1) make and build directories for the desired architectures:
+
+        mkdir build-atmega328p build-atmega2560
+
+3) enter each build directory and run cmake for the desired architecture.
+
+        cd build-atmega2560
+        cmake .. -DARCH=atmega2560 -DCMAKE_BUILD_TYPE=RELEASE
+   >    make
+
+4) to run unit tests, the process is the same as above, with "test" as the
+   target:
+
+        mkdir build-test
+        cd build-test
+        cmake .. -DARCH=test
+        cd src
+        ctest
+
+## Porting
 
-Porting
---
 This firmware was written in modular, portable C99, to be compiled with GCC
 (avr-gcc for the Atmega). The hardware-sepecific files are in Arch/*.[ch]. To
 adapt the Atmega port for additional hardware, enter the ./src/Arch directory,

firmware/asdf/cmake/generic-gcc-avr.cmake

@@ -50,6 +50,74 @@ set(CMAKE_SYSTEM_PROCESSOR avr)
 set(CMAKE_C_COMPILER ${AVR_CC})
 set(CMAKE_CXX_COMPILER ${AVR_CXX})
 
+#Flags used by the C compiler during DEBUG builds.
+set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+#Flags used by the C compiler during MINSIZEREL builds.
+set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
+#Flags used by the C compiler during RELEASE builds.
+set(CMAKE_C_FLAGS_RELEASE "-O1 -DNDEBUG")
+#Flags used by the C compiler during RELWITHDEBINFO builds.
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O1 -g -DNDEBUG")
+
+##########################################################################
+# c_toolchain_flags
+# - Adds a list of compiler-specific flags to the CFLAGS variable in the
+#   parent scope.
+##########################################################################
+function(c_toolchain_flags)
+    # fix array base indexing beginning in AVR-GCC 12:
+
+    list(APPEND TOOLCHAIN_FLAGS
+        -std=c99
+    #  -Wa,-adhln
+        -Wall
+        -funsigned-char
+        -funsigned-bitfields
+        -ffunction-sections
+        -fdata-sections
+        -fpack-struct
+        -fshort-enums
+        -Wall
+        -Wextra
+        -Wpointer-arith
+        -Wcast-align
+        -Wwrite-strings
+        -Wswitch-default
+        -Wunreachable-code
+        -Winit-self
+        -Wmissing-field-initializers
+        -Wno-unknown-pragmas
+        -Wstrict-prototypes
+        -Wundef
+        -Wold-style-definition
+    )
+
+    if(CMAKE_C_COMPILER_VERSION GREATER_EQUAL "11.3")
+        message(STATUS "Appending page size fix for GCC >= 11.3")
+        list(APPEND TOOLCHAIN_FLAGS --param=min-pagesize=0)
+    endif()
+
+    set(CFLAGS ${TOOLCHAIN_FLAGS} PARENT_SCOPE)
+endfunction(c_toolchain_flags)
+
+
+##########################################################################
+# Macros for setting optimization flag:
+# - optimization_off: turn off optimization for RTOS
+# - optimization_full: set optimization to desired level for app.
+##########################################################################
+
+macro(optimization_off)
+    set(CMAKE_CFLAGS_RELEASE "-O0" "-NDEBUG")
+    set(CMAKE_CFLAGS "-O0" "-NDEBUG")
+endmacro(optimization_off)
+
+
+macro(optimization_full)
+    set(CMAKE_CFLAGS_RELEASE "-O1" "-NDEBUG")
+    set(CMAKE_CFLAGS "-O1" "-NDEBUG")
+endmacro(optimization_full)
+
 ##########################################################################
 # Identification
 ##########################################################################
@@ -100,11 +168,7 @@ endif(NOT AVR_MCU)
 
 #default avr-size args
 if(NOT AVR_SIZE_ARGS)
-    if(APPLE)
-        set(AVR_SIZE_ARGS -B)
-    else(APPLE)
-        set(AVR_SIZE_ARGS -C;--mcu=${AVR_MCU})
-    endif(APPLE)
+    set(AVR_SIZE_ARGS -B)
 endif(NOT AVR_SIZE_ARGS)
 
 # prepare base flags for upload tool
@@ -151,6 +215,7 @@ else(WITH_MCU)
     set(MCU_TYPE_FOR_FILENAME "")
 endif(WITH_MCU)
 
+
 ##########################################################################
 # add_avr_executable
 # - IN_VAR: EXECUTABLE_NAME
@@ -169,12 +234,22 @@ function(add_avr_executable EXECUTABLE_NAME)
    endif(NOT ARGN)
 
    # set file names
-   set(elf_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.elf)
-   set(hex_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.hex)
-   set(lst_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.lst)
-   set(map_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.map)
-   set(eeprom_image ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}-eeprom.hex)
-   message(STATUS "elf name: ${elf_file}")
+   set(basename ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME})
+   set(elf_file ${basename}.elf)
+   set(hex_file ${basename}.hex)
+   set(lst_file ${basename}.lst)
+   set(map_file ${basename}.map)
+   set(eeprom_image ${basename}-eeprom.hex)
+  message(STATUS "elf name: ${elf_file}")
+  message(STATUS "project target name: ${PROJECT_TARGET_NAME}")
+
+  set(sphinx_file ${CMAKE_CURRENT_BINARY_DIR}/toc_${PROJECT_TARGET_NAME}.rst)
+  configure_file(${DOC_DIR}/source/_templates/hexfile_link.in ${sphinx_file})
+
+  message(STATUS "sphinx file: ${sphinx_file}")
+
+  install(FILES ${sphinx_file} DESTINATION docs/source)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${basename}.hex DESTINATION dist)
 
    # elf file
    add_executable(${elf_file} EXCLUDE_FROM_ALL ${ARGN})

firmware/asdf/docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

firmware/asdf/docs/make.bat

@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.https://www.sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd

firmware/asdf/docs/source/_templates/hexfile_link.in

@@ -0,0 +1,7 @@
+.. _@ARCH@ Rev @CMAKE_PROJECT_VERSION@:
+
+ASDF Rev @CMAKE_PROJECT_VERSION@ hex file (@ARCH@)
+----------------------------------------------------------------------------------
+
+:ASDF Firmware @CMAKE_PROJECT_VERSION@-@ARCH@:
+   :download:`@hex_file@`

firmware/asdf/docs/source/_templates/index.rst.in

@@ -0,0 +1,8 @@
+Unified Retro Keyboard firmware (ASDF) rev @CMAKE_PROJECT_VERSION@
+=======================================================================
+
+.. toctree::
+   :caption: Downloads
+   :glob:
+
+   toc_*

firmware/asdf/docs/source/conf.py

@@ -0,0 +1,63 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+import re
+import toml
+
+# -- Project information -----------------------------------------------------
+
+project = "ASDF - Unified Retro Keyboard Firmware"
+copyright = "2022 Osiweb.org"
+author = "David F"
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    "sphinx.ext.napoleon",
+    "sphinx.ext.autodoc",  # Core library for html generation from docstrings
+    "sphinx_autodoc_typehints",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.autosectionlabel",
+    "sphinx.ext.autosummary",  # Create neat summary tables
+]
+autosummary_generate = True  # Turn on sphinx.ext.autosummary
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ["_templates"]
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = []
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = "sphinx_rtd_theme"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = [
+    "_static"
+]  # Configuration file for the Sphinx documentation builder.
+#
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html

firmware/asdf/eeprom-spec.org

@@ -0,0 +1,62 @@
+* EEPROM management
+** Uses
+*** Store current keyboard ID
+*** Store status of various options
+**** key repeat rates and delays
+**** communications delays
+**** serial baud rates
+**** keyboard macros
+**** keyboard specific options
+***** all caps / upper+lower
+***** handling of special keys
+** Allocate on demand
+** System block does not change as keyboards are changed
+*** Items include:
+**** current keyboard
+*** All system block allocation must occur before any keyboard allocation may occur.
+*** Once system EEPROM is allocated, system EEPROM is "locked"
+*** If system EEPROM is locked, then EEPROM cannot be reallocated, although the parameters may be re-written.
+*** provision to unlock EEPROM, for example, when firmware is updated, or during development
+
+** Keyboard block is reset whenever the keyboard changes
+*** Any parameters specific to a keyboard, such as macros, keymap-specific settings, etc. are stored here.
+*** This section is erased when keymap changes, but not when a keymap is loaded from EEPROM at powerup.
+
+* Architecture
+** Device independent layer - allows diferent devices including on-chip EEPROM, off-chip EEPROM, and other technologies such as FRAM.  An API that implements the following:
+*** Read a byte/word from EEPROM
+*** Write a byte/word to EEPROM
+*** Erase a range of EEPROM
+*** Return size of storage (in bytes)
+** Allocation layer
+*** Store an arbitrary length string to a numbers slot (0-ff)
+*** retrieve an arbitrary length string from a numbered slot (0-ff)
+*** delete a string an a numbered slot (0-ff).  Probably accomplish by storing a 0-length string.
+*** Initialize an arbitary portion of storage (including all storage)
+
+** Architecture for allocation layer:
+*** Pointer to first "free" block.  This is a linked list of blocks.
+*** Table of starting positions and lengths.  Starting position will be 2 bytes, and will indicate a 1 or 2 byte boundary1, 2, or 4-byte words, determined by storage size.  Number of elements in table will also be determined by storage size, up to max 255.
+*** Initialize with a free block of all available storage
+*** Allocate storage from beginning of free block.
+*** The beginning of each block is a header including a "size" value (1 or 2 bytes) and a "link" address, 1, 2, or 4 bytes, same as the index table.  For free blocks, the "size" is always a contiguous size.  For allocated blocks, the size is the total size of all the blocks linked in a list.
+*** To allocate:
+***** Look up the first free block
+***** If the string can fit in the size of the free block:
+****** then store size in the size field
+****** store "0" in the link
+****** store the string next.
+****** If there is any space left over in the free block, then create a new "free block" from the next few bytes, and add to the front of the "free" list.
+***** If the string cannot fit in the size of the free block:
+****** store the size in the size field
+****** Leave the "link" address, which points to the next free block
+****** Store the string text
+****** jump to the next free block, and repeat the above for the remainder of the string.
+****** keep repeating until the string can fit in a free block.
+****** If there is no more free block, and not enough room to store the text, then store as much as possible, then stop.
+*** To free:
+***** Look up the string address in the index
+***** Zero out the index entry for the string.
+***** Look at the size of the string.  If the next contiguous block is also free, then combine and store the size of the combined block at the beginning of the block.
+****** repeat the above until next contiguous block is not free
+***** Please free block at the beginning of the "free" list.

firmware/asdf/keymap_list.cmake

@@ -4,6 +4,5 @@ list(APPEND keymap_list
   "<apple2:2>"
   "<apple2_caps:3>"
   "<sol:4>"
+  "<ace1000:5>"
   )
-
-

firmware/asdf/make-build-dirs.sh

@@ -1,118 +0,0 @@
-#!/opt/local/bin/bash
-
-
-CMAKE_TARGETS=""
-VALID_TARGETS=""
-
-add_valid_target() {
-    VALID_TARGETS+=" $1 "
-}
-
-add_valid_target test
-add_valid_target atmega328p
-add_valid_target atmega2560
-
-build_arch() {
-
-    for target_arch in "$@"
-    do
-        if [[ ! -d "build-$target_arch" ]]
-        then
-            echo -ne "\nCreating directory $target_arch..." 
-            mkdir  "build-$target_arch" && echo "[success]"
-        else
-            echo "Directory \"$target_arch\" exists."
-        fi
-
-        if [[ -d "build-$target_arch" ]]
-        then
-            echo -e "\nRunning CMake in directory $target_arch..."
-            (cd "build-$target_arch" && cmake -DARCH=$target_arch ..)
-            echo
-        fi
-    done
-}
-
-main() {
-    parse $@
-
-    echo "Valid: $VALID_TARGETS"
-    echo "Selected: $CMAKE_TARGETS"
-
-    run
-}
-
-run() {
-    echo "$CMAKE_TARGETS"
-
-    build_arch $CMAKE_TARGETS
-}
-
-
-syntax() {
-    echo "Usage:"
-    echo "  $0 -t target [-t target] ..."
-    echo "  $0 -a"
-    echo "  $0 -h"
-    echo ""
-    echo "Options:"
-    echo "  -t   add an architecture directory"
-    echo "  -h   Display this help message"
-    echo "  -a   Add all valid architecture directories"
-    echo ""
-    echo "Valid targets: $VALID_TARGETS"
-}
-
-parse() {
-    local SYNTAX=""
-    local ALL=""
-
-    while getopts "t:ah" optname
-    do
-        case "$optname" in
-            h)
-                SYNTAX="yes"
-                ;;
-            a)
-                ALL="yes"
-                ;;
-            t)
-                # Test that target is valid and not already specified
-                if [[ " $VALID_TARGETS " == *" $OPTARG "* ]]
-                then
-                    if [[ " $CMAKE_TARGETS " != *" $OPTARG "* ]]
-                    then
-                        CMAKE_TARGETS+=" $OPTARG "
-                    fi
-                else
-                    SYNTAX="yes"
-                fi
-                ;;
-        esac
-    done
-
-    if [[ "$SYNTAX" == "yes" ]]; then
-        syntax && die
-    fi
-
-    if [[ "$ALL" == "yes" ]]
-    then
-        CMAKE_TARGETS="$VALID_TARGETS"
-    fi
-
-    if [[ -z "$CMAKE_TARGETS" ]]
-    then
-        die "No targets!"
-    fi
-}
-
-die() {
-    builtin echo $@
-    exit 1
-}
-
-main $@
-
-exit 0
-
-

firmware/asdf/make-targets.sh

@@ -0,0 +1,228 @@
+#!/bin/bash
+
+GENERATOR="Unix Makefiles"
+NUM_VALID_TARGETS=0
+BUILD_TYPE=RELEASE
+INSTALL_DIR="dist"
+MAKE_TARGETS="all"
+DOC_DIR=docs
+LINKS_DIR="$DOC_DIR/source"
+
+add_valid_target() {
+    VALID_TARGETS[$NUM_VALID_TARGETS]=$1
+    HW_SIGS[$NUM_VALID_TARGETS]=$2
+    ((NUM_VALID_TARGETS++))
+}
+
+add_valid_target test
+add_valid_target atmega328p
+add_valid_target atmega168p
+add_valid_target atmega88p
+add_valid_target atmega2560
+add_valid_target atmega1280
+add_valid_target atmega640
+
+
+check_valid_target() {
+    result="false"
+
+    for (( i = 0; i < NUM_VALID_TARGETS; i++ ))
+    do
+        if [[ ${VALID_TARGETS[$i]} == $1 ]]
+        then
+            result=$i
+        fi
+    done
+    echo $result
+}
+
+
+do_pipenv_clean() {
+    echo removing old python virtual environment...
+    pipenv --rm
+}
+
+
+do_pipenv_install() {
+    echo installing python virtual environment...
+    pipenv install
+}
+
+clean_arch() {
+    target_arch="$1"
+    echo "Removing pre-existing build directory: $target_arch..."
+    rm -rf "build-$target_arch"
+    echo "Removing any build artifacts"
+    rm -f $INSTALL_DIR/*"$1"*
+    echo "Removing any download links"
+    rm -f $LINKS_DIR/*$1*
+}
+
+build_arch() {
+    local target_arch="$1"
+    local hardware_sig="$2"
+
+    cmake -S . -B "build-$target_arch" -G "$GENERATOR" \
+        -DCMAKE_INSTALL_PREFIX="." -DARCH="$target_arch" \
+        -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
+
+}
+
+deploy_arch() {
+    local target_arch="$1"
+
+    if [[ -d "build-$target_arch" ]]
+    then
+        (cd "build-$target_arch" \
+        && make install)
+    fi
+}
+
+clean_all() {
+    echo "- Removing install dir \"$INSTALL_DIR\"..."
+    rm -rvf "$INSTALL_DIR"
+    echo "- Removing download links from doc dir..."
+    rm -vf $DOC_DIR/source/toc_*
+    echo "- Removing hex files from doc dir..."
+    rm -vf $DOC_DIR/source/*.hex
+    echo "- Removing versioned index file from doc dir"
+    rm -vf "$DOC_DIR/source/index.rst"
+}
+
+syntax() {
+    echo "Usage:"
+    echo "  $0 -t target [-t target] ..."
+    echo "  $0 -a"
+    echo "  $0 -h"
+    echo ""
+    echo "Options:"
+    echo "  -h.  Display this help message"
+    echo "  -x   Before creating a build directgory or virtual env, remove"
+    echo "       any pre-existing version"
+    echo "  -t   add an architecture directory"
+    echo "  -a   Add all valid architecture directories"
+    echo "  -i   Build each specified target and install to dist directory"
+    echo "  -p   Install pipenv virtual environment for python scripts"
+    echo "  -c   Clean all artifacts"
+    echo "  -s   Copy dist files to sphinx directory"
+    echo "Valid targets: ${VALID_TARGETS[*]}"
+}
+
+parse() {
+    local SYNTAX=""
+    local ALL=""
+    local i
+    local valid_index
+
+    NUM_CMAKE_TARGETS=0
+    CLEAN_BEFORE_BUILD=""
+    DO_PIPENV_INSTALL=""
+    DEPLOY=""
+    CLEAN_ALL=""
+    COPY_DIST_TO_DOCS=""
+
+    while getopts "t:ahipxcs" optname
+    do
+        case "$optname" in
+            h)
+                SYNTAX="yes"
+                ;;
+            a)
+                ALL="yes"
+                ;;
+            t)
+                # Test that target is valid
+                valid_index=$(check_valid_target $OPTARG)
+                if [[ $valid_index != "false" ]]
+                then
+                    CMAKE_TARGETS[$NUM_CMAKE_TARGETS]=$valid_index
+                    ((NUM_CMAKE_TARGETS++))
+                else
+                    echo Unknown target \"$OPTARG\"
+                    SYNTAX="yes"
+                fi
+                ;;
+            p)
+                DO_PIPENV_INSTALL="yes"
+                ;;
+            x)
+                CLEAN_BEFORE_BUILD="yes"
+                ;;
+            i)  DEPLOY="yes"
+                ;;
+            s)  COPY_DIST_TO_DOCS="yes"
+                ;;
+            c)  CLEAN_ALL="yes"
+
+    esac
+    done
+
+    if [[ "$SYNTAX" == "yes" ]]; then
+        syntax && die
+    fi
+
+    if [[ "$ALL" == "yes" ]]
+    then
+        for (( i=0; i<NUM_VALID_TARGETS; i++ ))
+        do
+            CMAKE_TARGETS[i]=$i
+        done
+        NUM_CMAKE_TARGETS=$NUM_VALID_TARGETS
+    fi
+
+}
+
+die() {
+    builtin echo $@
+    exit 1
+}
+
+main() {
+     local TARGET
+     local i
+     parse $@
+
+     if [[ "$DO_PIPENV_INSTALL" == "yes" ]]
+     then
+         if [[ "$CLEAN_BEFORE_BUILD" == "yes" ]]
+         then
+             do_pipenv_clean
+         fi
+
+         do_pipenv_install
+     fi
+
+     if [[ "$CLEAN_ALL" == "yes" ]]
+     then
+         clean_all
+     fi
+
+     echo Valid Targets: "${VALID_TARGETS[*]}"
+
+     for (( i=0; $i<$NUM_CMAKE_TARGETS; i++ ))
+     do
+         TARGET=${CMAKE_TARGETS[$i]}
+         if [[ "$CLEAN_BEFORE_BUILD" == "yes" ]]
+         then
+             clean_arch ${VALID_TARGETS[$TARGET]}
+         fi
+         build_arch ${VALID_TARGETS[$TARGET]} ${HW_SIGS[$TARGET]}
+         if [[ "$DEPLOY" == "yes" ]]
+         then
+             deploy_arch ${VALID_TARGETS[$TARGET]}
+         fi
+     done
+
+     if [[ $COPY_DIST_TO_DOCS == "yes" && -d "$INSTALL_DIR" ]]
+     then
+         cp -av "$INSTALL_DIR"/* docs/source
+     fi
+
+}
+
+
+main $@
+
+exit 0
+
+

firmware/asdf/src/ARCHITECTURE-keymaps.org

@@ -1,15 +1,14 @@
 * Keymap architecture
-** Keymap definition module
-   The keymap definition module defines:
-*** The key mappings used by a keymap
-*** The virtual devices required by the keymap
-    This includes definitions for LED's and I/O lines, including their initial
-    states, and default I/O operations such as toggle, pulse, etc.
-*** Function hooks used by the keymap.
-    Specifies which functions are used for operations such as key scanning, I/O,
-    special keybindings, etc.
-
-  Any special functions or logic required by the keymap are also defined and used in the module.
+** Keymap definition modules are in src/Keymaps
+** Each keymap has its own keymap setup routine
+*** void setup_mapname_keymap(void) - keymap setup function
+**** register a keycode map for each modifier combination
+***** The keycode maps are in flash (ROM)
+**** set up virtual devices for the keymap
+***** virtual device to physical device mapping
+***** associated virtual device function on activate/deactivate
+***** initial state
+**** set up function hooks used by keymap
 
 ** Keymap definition API
 *** mapping keys
@@ -24,12 +23,6 @@
 ***** Accept a virtual device code, a physical device code, a default function, and a default initial value, and create a new entry in the virtual device table.
 ***** increment the virtual device table pointer and set next (last) entry to NULL
 
-* Eliminate keymaps table and instead have table of keymap init routines with MAX_KEYMAPS entries
-* keymap setup routine adds maps for each modifier to the keymap, now only rxcxMODIFIERS instead of rxcxmodifiersxkeymaps
-* remove the keymap index from the add_map() call.
-* select_keymap() will call setup routine for the g
-iven keymap.
-* Each keymap sets its own num_rows and num_columns, per matrix for each modifier
 
 * DIP SWITCHES
   Note that the DIP switches are keys in the key matrix, which is initialized to

firmware/asdf/src/Arch/asdf_arch_atmega2560.c

@@ -681,24 +681,23 @@ void asdf_arch_pulse_delay_long(void)
   _delay_ms(ASDF_PULSE_DELAY_LONG_MS);
 }
 
-// PROCEDURE: asdf_arch_character_delay
-// INPUTS: none
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
 // OUTPUTS: none
 //
-// DESCRIPTION: Delays a fixed amount of time after each character of a system
-// message, to allow polled systems to catch up.
+// DESCRIPTION: Delays a specified number of milliseconds
 //
 // SIDE EFFECTS: see above.
 //
-// NOTES: Set ASDF_PULSE_DELAY_US in asdf_config.h
-//
 // SCOPE: public
 //
 // COMPLEXITY: 1
 //
-void asdf_arch_character_delay(void)
+void asdf_arch_delay_ms(uint16_t delay_ms)
 {
-  _delay_ms(ASDF_MESSAGE_CHARACTER_DELAY);
+  for (uint16_t i=0; i < delay_ms; i++) {
+    _delay_ms(1);
+  }
 }
 
 // PROCEDURE: asdf_arch_init

firmware/asdf/src/Arch/asdf_arch_atmega2560.h

@@ -349,7 +349,7 @@
 #define TICK_COUNT 249
 
 // Default key matrix row scanner
-#define ASDF_ARCH_DEFAULT_SCANNER &asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER &asdf_arch_read_row
 
 // Default keyboard output
 #define ASDF_ARCH_DEFAULT_OUTPUT &asdf_arch_send_code
@@ -475,13 +475,11 @@ void asdf_arch_pulse_delay_short(void);
 // ASDF_PULSE_DELAY_LONG_MS
 void asdf_arch_pulse_delay_long(void);
 
-// PROCEDURE: asdf_arch_character_delay
-// INPUTS: none
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
 // OUTPUTS: none
-// DESCRIPTION: Delays a fixed amount of time after each character of a system
-// message, to allow polled systems to catch up.
-// NOTES: Set ASDF_CHARACTER_DELAY_US in asdf_config.h
-void asdf_arch_character_delay(void);
+// DESCRIPTION: Delays a specified number of milliseconds
+void asdf_arch_delay_ms(uint16_t delay_ms);
 
 // PROCEDURE: asdf_arch_tick
 // INPUTS: none

firmware/asdf/src/Arch/asdf_arch_atmega328p.c

@@ -677,24 +677,23 @@ void asdf_arch_pulse_delay_long(void)
   _delay_ms(ASDF_PULSE_DELAY_LONG_MS);
 }
 
-// PROCEDURE: asdf_arch_character_delay
-// INPUTS: none
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
 // OUTPUTS: none
 //
-// DESCRIPTION: Delays a fixed amount of time after each character of a system
-// message, to allow polled systems to catch up.
+// DESCRIPTION: Delays a specified number of milliseconds
 //
 // SIDE EFFECTS: see above.
 //
-// NOTES: Set ASDF_PULSE_DELAY_US in asdf_config.h
-//
 // SCOPE: public
 //
 // COMPLEXITY: 1
 //
-void asdf_arch_character_delay(void)
+void asdf_arch_delay_ms(uint16_t delay_ms)
 {
-  _delay_ms(ASDF_MESSAGE_CHARACTER_DELAY);
+  for (uint16_t i=0; i < delay_ms; i++) {
+    _delay_ms(1);
+  }
 }
 
 // PROCEDURE: asdf_arch_init

firmware/asdf/src/Arch/asdf_arch_atmega328p.h

@@ -254,7 +254,7 @@
 
 
 // Default key matrix row scanner
-#define ASDF_ARCH_DEFAULT_SCANNER asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER asdf_arch_read_row
 
 // Default keyboard output
 #define ASDF_ARCH_DEFAULT_OUTPUT asdf_arch_send_code
@@ -376,13 +376,11 @@ void asdf_arch_pulse_delay_short(void);
 // DESCRIPTION: Delays a fixed amount of time for keyboard output pulses specified by ASDF_PULSE_DELAY_LONG_MS
 void asdf_arch_pulse_delay_long(void);
 
-// PROCEDURE: asdf_arch_character_delay
-// INPUTS: none
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
 // OUTPUTS: none
-// DESCRIPTION: Delays a fixed amount of time after each character of a system
-// message, to allow polled systems to catch up.
-// NOTES: Set ASDF_CHARACTER_DELAY_US in asdf_config.h
-void asdf_arch_character_delay(void);
+// DESCRIPTION: Delays a specified number of milliseconds
+void asdf_arch_delay_ms(uint16_t delay_ms);
 
 // PROCEDURE: asdf_arch_tick
 // INPUTS: none

firmware/asdf/src/Arch/asdf_arch_test.c

@@ -543,6 +543,23 @@ void asdf_arch_pulse_delay_long(void)
   asdf_arch_pulse_delay();
 }
 
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
+// OUTPUTS: none
+//
+// DESCRIPTION: Delays a specified number of milliseconds
+//
+// SIDE EFFECTS: see above.
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+void asdf_arch_delay_ms(uint16_t delay_ms)
+{
+    asdf_arch_pulse_delay();
+}
+
 // PROCEDURE: asdf_arch_pulse_delay_short
 // INPUTS: none
 // OUTPUTS: none

firmware/asdf/src/Arch/asdf_arch_test.h

@@ -56,7 +56,7 @@ typedef enum {
 #define FLASH
 #define FLASH_READ (a) (*(a))
 #define FLASH_READ_MATRIX_ELEMENT(mat,row,col) (mat)[(row)][(col)]
-#define ASDF_ARCH_DEFAULT_SCANNER asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER asdf_arch_read_row
 #define ASDF_ARCH_DEFAULT_OUTPUT asdf_arch_send_code
 
 // PROCEDURE: asdf_arch_pos_strobe
@@ -197,6 +197,12 @@ asdf_cols_t asdf_arch_read_row(uint8_t row);
 // be tested.
 void asdf_arch_send_code(asdf_keycode_t);
 
+// PROCEDURE: asdf_arch_delay_ms
+// INPUTS: (uint16) delay_ms - the delay in msec.
+// OUTPUTS: none
+// DESCRIPTION: Delays a specified number of milliseconds
+void asdf_arch_delay_ms(uint16_t delay_ms);
+
 // PROCEDURE: asdf_arch_get_sent_code
 // INPUTS: none
 // OUTPUTS: returns type (asdf_keycode_t) in register and zeros the register.

firmware/asdf/src/CMakeLists.txt

@@ -14,7 +14,7 @@ function(create_keymap_valid keymaps keymap_valid)
   # However, we need to append an extra ';' at the end.
   string(APPEND temp_list ";")
   set(${keymap_valid} "${temp_list}" PARENT_SCOPE)
-endfunction(create_keymap_setups)
+endfunction(create_keymap_valid)
 
 function(create_keymap_declarations keymaps keymap_decl)
   list(TRANSFORM keymaps REPLACE "<\(.+\):\(.+\)>"  "\n void setup_\\1_keymap(void)" OUTPUT_VARIABLE temp_list)
@@ -37,47 +37,19 @@ create_keymap_valid("${keymap_list}" keymap_valid)
 create_keymap_report("${keymap_list}" keymap_report)
 create_keymap_declarations("${keymap_list}" keymap_declarations)
 
-# get list length and decrement by one to account for trailing semicolon
-list (LENGTH keymap_list num_keymaps)
-
 message("**********************")
 message("Keymap table: ${keymap_report}")
 message("**********************\n\n")
 
-set (ASDF_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set (PROJECT_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-configure_file(${ASDF_SRC_DIR}/Arch/asdf_arch_${ARCH}.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h COPYONLY)
-configure_file(${ASDF_SRC_DIR}/Arch/asdf_arch_${ARCH}.c ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.c COPYONLY)
-configure_file(${ASDF_SRC_DIR}/asdf_keymap_setup.c.in  ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_setup.c)
-configure_file(${ASDF_SRC_DIR}/asdf_keymap_setup.h.in  ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_setup.h)
+configure_file(${PROJECT_SRC_DIR}/Arch/asdf_arch_${ARCH_FAMILY}.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h COPYONLY)
+configure_file(${PROJECT_SRC_DIR}/Arch/asdf_arch_${ARCH_FAMILY}.c ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.c COPYONLY)
+configure_file(${PROJECT_SRC_DIR}/asdf_keymap_setup.c.in  ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_setup.c)
+configure_file(${PROJECT_SRC_DIR}/asdf_keymap_setup.h.in  ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_setup.h)
 
 
-
-list(APPEND CFLAGS
-  -std=c99
-#  -Wa,-adhln
-  -Wall
-  -funsigned-char
-  -funsigned-bitfields
-  -ffunction-sections
-  -fdata-sections
-  -fpack-struct
-  -fshort-enums
-  -O2
-  -Wall
-  -Wextra
-  -Wpointer-arith
-  -Wcast-align
-  -Wwrite-strings
-  -Wswitch-default
-  -Wunreachable-code
-  -Winit-self
-  -Wmissing-field-initializers
-  -Wno-unknown-pragmas
-  -Wstrict-prototypes
-  -Wundef
-  -Wold-style-definition
-)
+c_toolchain_flags()
 
 list (APPEND SOURCES
   asdf.c
@@ -99,6 +71,8 @@ list (APPEND SOURCES
   Keymaps/asdf_keymap_apple2_caps.c
   Keymaps/asdf_keymap_apple2_add_map.c
   Keymaps/asdf_keymap_sol.c
+  Keymaps/asdf_keymap_ace1000.c
+  Keymaps/asdf_keymap_ace1000_add_map.c
   main.c
   )
 
@@ -107,16 +81,16 @@ list (APPEND SOURCES
 
 # add the executable
 if (COMMAND custom_add_executable)
-  custom_add_executable(${ASDF_TARGET_NAME}
+  custom_add_executable(${PROJECT_TARGET_NAME}
   ${SOURCES}
   )
 else()
-  add_executable(${ASDF_TARGET_NAME}
+  add_executable(${PROJECT_TARGET_NAME}
     ${SOURCES}
     )
 endif()
 
-target_include_directories(${ASDF_EXECUTABLE_TARGET_NAME}
+target_include_directories(${PROJECT_EXECUTABLE_TARGET_NAME}
   PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -124,11 +98,11 @@ target_include_directories(${ASDF_EXECUTABLE_TARGET_NAME}
 
   )
 
-target_compile_options(${ASDF_EXECUTABLE_TARGET_NAME}
+target_compile_options(${PROJECT_EXECUTABLE_TARGET_NAME}
   PRIVATE
   ${CFLAGS}
   )
 
-#target_link_libraries(${ASDF_EXECUTABLE_TARGET_NAME}
+#target_link_libraries(${PROJECT_EXECUTABLE_TARGET_NAME}
 #  keymaps
 #  )

firmware/asdf/src/Keymaps/asdf_keymap_ace1000.c

@@ -0,0 +1,89 @@
+// -*- mode: C; tab-width: 2 ; indent-tabs-mode: nil -*-
+//
+// Unified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_classic.c
+//
+// Implements the Franklin ACE 1000 replacement keyboard keymaps
+// https://github.com/ryucats/Franklin-ACE-1000-Keyboard
+//
+// Copyright 2023 Chris RYU
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+//
+
+#include "asdf.h"
+#include "asdf_keymaps.h"
+#include "asdf_virtual.h"
+#include "asdf_modifiers.h"
+#include "asdf_print.h"
+#include "asdf_keymap_ace1000.h"
+#include "asdf_keymap_ace1000_add_map.h"
+#include "asdf_keymap_apple2_add_map.h"
+
+void ace1000_id_message(void) {
+  asdf_print("[Keymap: ace1000]\n");
+}
+
+// PROCEDURE:
+// INPUTS:
+// OUTPUTS:
+//
+// DESCRIPTION:
+//
+// SIDE EFFECTS:
+//
+// NOTES:
+//
+// SCOPE:
+//
+// COMPLEXITY:
+//
+
+void setup_ace1000_keymap(void)
+{
+  asdf_set_print_delay(ASDF_ACE1000_PRINT_SPEED); //msec
+
+  ace1000_add_map(ACE1000_PLAIN_MAP, MOD_PLAIN_MAP);
+  ace1000_add_map(ACE1000_CAPS_MAP, MOD_CAPS_MAP);
+  ace1000_add_map(ACE1000_SHIFT_MAP, MOD_SHIFT_MAP);
+  ace1000_add_map(ACE1000_CTRL_MAP, MOD_CTRL_MAP);
+
+  asdf_hook_assign(ACE1000_ID_MESSAGE_HOOK, ace1000_id_message);
+  asdf_hook_assign(APPLESOFT_KEYBOARD_TEST_HOOK, ace1000_keyboard_test);
+
+  // Assign power LED to virtual power LED, and initialize to ON
+  asdf_virtual_assign(ACE1000_VIRTUAL_POWER_LED, ACE1000_POWER_LED, V_NOFUNC, ACE1000_POWER_LED_INIT_VALUE);
+
+  // Assign CAPS LED to virtual CAPS LED, and initialize to the INIT value, to
+  // match the initial CAPSLOCK state. The capslock state code will alter the
+  // virtual LED according to the state.
+
+  asdf_virtual_assign(VCAPS_LED, ACE1000_CAPS_LED, V_NOFUNC, ACE1000_CAPS_LED_INIT_VALUE);
+
+  // assign RESET output to the virtual RESET output, configure to produce a short pulse when activated
+  asdf_virtual_assign(ACE1000_VIRTUAL_RESET, ACE1000_RESET_OUTPUT, V_PULSE_SHORT, !ACE1000_RESET_ACTIVE_VALUE);
+
+  // assign the CLRSCR output to the virtual CLRSCR output, configure to produce a long pulse when activated
+  asdf_virtual_assign(ACE1000_VIRTUAL_CLR_SCR, ACE1000_CLR_SCR_OUT, V_PULSE_LONG, !ACE1000_CLR_SCR_ACTIVE_VALUE);
+
+  // turn on caps lock
+  asdf_modifier_capslock_activate();
+}
+
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/Keymaps/asdf_keymap_ace1000.h

@@ -0,0 +1,71 @@
+// -*- mode: C; tab-width: 4 ; indent-tabs-mode: nil -*-
+//
+// Unfified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_ace1000.h
+//
+// ASCII keymaps for the Franklin ACE 1000 replacement keyboard
+// https://github.com/ryucats/Franklin-ACE-1000-Keyboard
+//
+// Copyright 2023 Chris RYU
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+// To use this ascii for a new keymap, edit the keymaps definitions as
+// desired. The keymaps are organized from row 0, counting upward, and each row
+// includes the columns from 0-NUM_COLS.
+//
+
+#if !defined(ASDF_KEYMAP_DEFS_ACE1000_H)
+#define ASDF_KEYMAP_DEFS_ACE1000_H
+
+#include "asdf_hook.h"
+
+// Edit the number of rows and columns used in this map. If the number is less
+// than the maxium, the unused elements will be initialized to 0.
+
+#define ACE1000_NUM_ROWS 10 // DIP switches are row 8 (zero based)
+#define ACE1000_NUM_COLS 8
+
+#define ACE1000_ACTION_BREAK ACTION_NOTHING
+
+#define ACE1000_VIRTUAL_RESET VOUT1
+#define ACE1000_ACTION_RESET ACTION_VOUT1
+#define ACE1000_RESET_OUTPUT PHYSICAL_OUT3_OPEN_HI
+#define ACE1000_RESET_ACTIVE_VALUE 0
+
+#define ACE1000_VIRTUAL_CLR_SCR VOUT2
+#define ACE1000_ACTION_CLEAR ACTION_VOUT2
+#define ACE1000_CLR_SCR_OUT PHYSICAL_OUT1_OPEN_LO
+#define ACE1000_CLR_SCR_ACTIVE_VALUE 1
+
+#define ACE1000_VIRTUAL_POWER_LED VLED1
+#define ACE1000_POWER_LED PHYSICAL_LED1
+#define ACE1000_POWER_LED_INIT_VALUE 1
+
+#define ACE1000_CAPS_LED PHYSICAL_LED3
+#define ACE1000_CAPS_LED_INIT_VALUE 0
+
+#define ACE1000_ID_MESSAGE_HOOK ASDF_HOOK_USER_10
+#define APPLESOFT_KEYBOARD_TEST_HOOK ASDF_HOOK_USER_9
+
+#define ASDF_ACE1000_PRINT_SPEED 40
+
+#endif /* !defined (ASDF_KEYMAP_DEFS_ACE1000_H) */
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c

@@ -0,0 +1,122 @@
+// -*- mode: C; tab-width: 2 ; indent-tabs-mode: nil -*-
+//
+// Unified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_ace1000_add_map.c
+//
+// Keymap matrices used by the Franklin ACE 1000 replacement keyboard
+// https://github.com/ryucats/Franklin-ACE-1000-Keyboard
+//
+// Copyright 2023 Chris RYU
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+//
+
+#include "asdf_arch.h"
+#include "asdf.h"
+#include "asdf_ascii.h"
+#include "asdf_print.h"
+#include "asdf_keymaps.h"
+#include "asdf_keymap_ace1000.h"
+#include "asdf_keymap_ace1000_add_map.h"
+#include "asdf_keymap_defs_dipswitch.h"
+
+// Key Matrix for the Franklin ACE 1000 replacement keyboard by Chris RYU
+
+#define ASDF_ACE1000_DIP_SWITCHES ASDF_KEYMAP_DIP_SWITCHES
+
+typedef asdf_keycode_t ace1000_keycode_matrix_t[ACE1000_NUM_ROWS][ACE1000_NUM_COLS];
+
+const FLASH ace1000_keycode_matrix_t ace1000_plain_matrix = {
+    [0] = { ACE_KEY_ESC, ACE_KEY_BREAK, ACE_KEY_PAUSE, ACTION_CTRL, ACE_KEY_TAB, ACTION_CAPS, ACTION_SHIFT, ACE_KEY_SPACE,  },
+    [1] = { ACE_KEY_1, ACE_KEY_Q, ACE_KEY_A, ACE_KEY_Z, ACE_KEY_2, ACE_KEY_W, ACE_KEY_S, ACE_KEY_X,  },
+    [2] = { ACE_KEY_3, ACE_KEY_E, ACE_KEY_D, ACE_KEY_C, ACE_KEY_4, ACE_KEY_R, ACE_KEY_F, ACE_KEY_V,  },
+    [3] = { ACE_KEY_5, ACE_KEY_T, ACE_KEY_G, ACE_KEY_B, ACE_KEY_6, ACE_KEY_Y, ACE_KEY_H, ACE_KEY_N,  },
+    [4] = { ACE_KEY_7, ACE_KEY_U, ACE_KEY_J, ACE_KEY_M, ACE_KEY_8, ACE_KEY_I, ACE_KEY_K, ACE_KEY_COMMA,  },
+    [5] = { ACE_KEY_9, ACE_KEY_O, ACE_KEY_L, ACE_KEY_PERIOD, ACE_KEY_RIGHT, ACE_KEY_UNDERSCORE, ACE_KEY_PLUS, ACE_KEY_SPLAT,  },
+    [6] = { ACE_KEY_0, ACE_KEY_P, ACE_KEY_SEMI, ACE_KEY_SLASH, ACE_KEY_7, ACE_KEY_4, ACE_KEY_1, ACE_KEY_GT,  },
+    [7] = { ACE_KEY_MINUS, ACE_KEY_CURLY, ACE_KEY_QUOTE, ACTION_SHIFT, ACE_KEY_8, ACE_KEY_5, ACE_KEY_2, ACE_KEY_0,  },
+    [9] = { ACE_KEY_SLASH, ACE_KEY_SQUARE, ACE_KEY_RETURN, ACE_KEY_LEFT, ACE_KEY_9, ACE_KEY_6, ACE_KEY_3, ACE_KEY_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
+};
+
+const FLASH ace1000_keycode_matrix_t ace1000_shift_matrix = {
+    [0] = { ACE_KEY_SHIFT_ESC, ACE_KEY_SHIFT_BREAK, ACE_KEY_SHIFT_PAUSE, ACTION_CTRL, ACE_KEY_SHIFT_TAB, ACTION_CAPS, ACTION_SHIFT, ACE_KEY_SHIFT_SPACE,  },
+    [1] = { ACE_KEY_SHIFT_1, ACE_KEY_SHIFT_Q, ACE_KEY_SHIFT_A, ACE_KEY_SHIFT_Z, ACE_KEY_SHIFT_2, ACE_KEY_SHIFT_W, ACE_KEY_SHIFT_S, ACE_KEY_SHIFT_X,  },
+    [2] = { ACE_KEY_SHIFT_3, ACE_KEY_SHIFT_E, ACE_KEY_SHIFT_D, ACE_KEY_SHIFT_C, ACE_KEY_SHIFT_4, ACE_KEY_SHIFT_R, ACE_KEY_SHIFT_F, ACE_KEY_SHIFT_V,  },
+    [3] = { ACE_KEY_SHIFT_5, ACE_KEY_SHIFT_T, ACE_KEY_SHIFT_G, ACE_KEY_SHIFT_B, ACE_KEY_SHIFT_6, ACE_KEY_SHIFT_Y, ACE_KEY_SHIFT_H, ACE_KEY_SHIFT_N,  },
+    [4] = { ACE_KEY_SHIFT_7, ACE_KEY_SHIFT_U, ACE_KEY_SHIFT_J, ACE_KEY_SHIFT_M, ACE_KEY_SHIFT_8, ACE_KEY_SHIFT_I, ACE_KEY_SHIFT_K, ACE_KEY_SHIFT_COMMA,  },
+    [5] = { ACE_KEY_SHIFT_9, ACE_KEY_SHIFT_O, ACE_KEY_SHIFT_L, ACE_KEY_SHIFT_PERIOD, ACE_KEY_SHIFT_RIGHT, ACE_KEY_SHIFT_UNDERSCORE, ACE_KEY_SHIFT_PLUS, ACE_KEY_SHIFT_SPLAT,  },
+    [6] = { ACE_KEY_SHIFT_0, ACE_KEY_SHIFT_P, ACE_KEY_SHIFT_SEMI, ACE_KEY_SHIFT_SLASH, ACE_KEY_SHIFT_7, ACE_KEY_SHIFT_4, ACE_KEY_SHIFT_1, ACE_KEY_SHIFT_GT,  },
+    [7] = { ACE_KEY_SHIFT_MINUS, ACE_KEY_SHIFT_CURLY, ACE_KEY_SHIFT_QUOTE, ACTION_SHIFT, ACE_KEY_SHIFT_8, ACE_KEY_SHIFT_5, ACE_KEY_SHIFT_2, ACE_KEY_SHIFT_0,  },
+    [9] = { ACE_KEY_SHIFT_SLASH, ACE_KEY_SHIFT_SQUARE, ACE_KEY_RETURN, ACE_KEY_SHIFT_LEFT, ACE_KEY_SHIFT_9, ACE_KEY_SHIFT_6, ACE_KEY_SHIFT_3, ACE_KEY_SHIFT_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
+};
+
+const FLASH ace1000_keycode_matrix_t ace1000_caps_matrix = {
+    [0] = { ACE_KEY_ESC, ACE_KEY_BREAK, ACE_KEY_PAUSE, ACTION_CTRL, ACE_KEY_TAB, ACTION_CAPS, ACTION_SHIFT, ACE_KEY_SPACE,  },
+    [1] = { ACE_KEY_1, ACE_KEY_SHIFT_Q, ACE_KEY_SHIFT_A, ACE_KEY_SHIFT_Z, ACE_KEY_2, ACE_KEY_SHIFT_W, ACE_KEY_SHIFT_S, ACE_KEY_SHIFT_X,  },
+    [2] = { ACE_KEY_3, ACE_KEY_SHIFT_E, ACE_KEY_SHIFT_D, ACE_KEY_SHIFT_C, ACE_KEY_4, ACE_KEY_SHIFT_R, ACE_KEY_SHIFT_F, ACE_KEY_SHIFT_V,  },
+    [3] = { ACE_KEY_5, ACE_KEY_SHIFT_T, ACE_KEY_SHIFT_G, ACE_KEY_SHIFT_B, ACE_KEY_6, ACE_KEY_SHIFT_Y, ACE_KEY_SHIFT_H, ACE_KEY_SHIFT_N,  },
+    [4] = { ACE_KEY_7, ACE_KEY_SHIFT_U, ACE_KEY_SHIFT_J, ACE_KEY_SHIFT_M, ACE_KEY_8, ACE_KEY_SHIFT_I, ACE_KEY_SHIFT_K, ACE_KEY_COMMA,  },
+    [5] = { ACE_KEY_9, ACE_KEY_SHIFT_O, ACE_KEY_SHIFT_L, ACE_KEY_PERIOD, ACE_KEY_RIGHT, ACE_KEY_UNDERSCORE, ACE_KEY_PLUS, ACE_KEY_SPLAT,  },
+    [6] = { ACE_KEY_0, ACE_KEY_SHIFT_P, ACE_KEY_SEMI, ACE_KEY_SLASH, ACE_KEY_7, ACE_KEY_4, ACE_KEY_1, ACE_KEY_GT,  },
+    [7] = { ACE_KEY_MINUS, ACE_KEY_CURLY, ACE_KEY_QUOTE, ACTION_SHIFT, ACE_KEY_8, ACE_KEY_5, ACE_KEY_2, ACE_KEY_0,  },
+    [9] = { ACE_KEY_SLASH, ACE_KEY_SQUARE, ACE_KEY_RETURN, ACE_KEY_LEFT, ACE_KEY_9, ACE_KEY_6, ACE_KEY_3, ACE_KEY_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
+};
+
+const FLASH ace1000_keycode_matrix_t ace1000_ctrl_matrix = {
+    [0] = { ACE_KEY_ESC, ACE_KEY_BREAK, ACE_KEY_PAUSE, ACTION_CTRL, ACE_KEY_TAB, ACTION_CAPS, ACTION_SHIFT, ACE_KEY_SPACE,  },
+    [1] = { ACE_KEY_CTRL_1, ACE_KEY_CTRL_Q, ACE_KEY_CTRL_A, ACE_KEY_CTRL_Z, ACE_KEY_CTRL_2, ACE_KEY_CTRL_W, ACE_KEY_CTRL_S, ACE_KEY_CTRL_X,  },
+    [2] = { ACE_KEY_CTRL_3, ACE_KEY_CTRL_E, ACE_KEY_CTRL_D, ACE_KEY_CTRL_C, ACE_KEY_CTRL_4, ACE_KEY_CTRL_R, ACE_KEY_CTRL_F, ACE_KEY_CTRL_V,  },
+    [3] = { ACE_KEY_CTRL_5, ACE_KEY_CTRL_T, ACE_KEY_CTRL_G, ACE_KEY_CTRL_B, ACE_KEY_CTRL_6, ACE_KEY_CTRL_Y, ACE_KEY_CTRL_H, ACE_KEY_CTRL_N,  },
+    [4] = { ACE_KEY_CTRL_7, ACE_KEY_CTRL_U, ACE_KEY_CTRL_J, ACE_KEY_CTRL_M, ACE_KEY_CTRL_8, ACE_KEY_CTRL_I, ACE_KEY_CTRL_K, ACE_KEY_CTRL_COMMA,  },
+    [5] = { ACE_KEY_CTRL_9, ACE_KEY_CTRL_O, ACE_KEY_CTRL_L, ACE_KEY_CTRL_PERIOD, ACE_KEY_CTRL_RIGHT, ACE_KEY_CTRL_UNDERSCORE, ACE_KEY_CTRL_PLUS, ACE_KEY_CTRL_SPLAT,  },
+    [6] = { ACE_KEY_CTRL_0, ACE_KEY_CTRL_P, ACE_KEY_CTRL_SEMI, ACE_KEY_CTRL_SLASH, ACE_KEY_CTRL_7, ACE_KEY_CTRL_4, ACE_KEY_CTRL_1, ACE_KEY_CTRL_GT,  },
+    [7] = { ACE_KEY_CTRL_MINUS, ACE_KEY_CTRL_CURLY, ACE_KEY_CTRL_QUOTE, ACTION_SHIFT, ACE_KEY_CTRL_8, ACE_KEY_CTRL_5, ACE_KEY_CTRL_2, ACE_KEY_CTRL_0,  },
+    [9] = { ACE_KEY_CTRL_SLASH, ACE_KEY_CTRL_SQUARE, ACE_KEY_RETURN, ACE_KEY_CTRL_LEFT, ACE_KEY_CTRL_9, ACE_KEY_CTRL_6, ACE_KEY_CTRL_3, ACE_KEY_CTRL_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
+};
+
+static const ace1000_keycode_matrix_t *ace1000_maps[] = {
+  [ACE1000_CAPS_MAP] = &ace1000_caps_matrix,
+  [ACE1000_PLAIN_MAP] = &ace1000_plain_matrix,
+  [ACE1000_SHIFT_MAP] = &ace1000_shift_matrix,
+  [ACE1000_CTRL_MAP] = &ace1000_ctrl_matrix,
+};
+
+void ace1000_add_map(const ace1000_map_index_t map_index,
+                     modifier_index_t modifier_index)
+{
+
+  asdf_keycode_t (*matrix)[ACE1000_NUM_COLS] =
+    (asdf_keycode_t (*)[ACE1000_NUM_COLS]) ace1000_maps[map_index];
+
+    asdf_keymaps_add_map(&matrix[0][0], modifier_index, (uint8_t) ACE1000_NUM_ROWS,
+                       (uint8_t) ACE1000_NUM_COLS);
+}
+
+void ace1000_keyboard_test(void)
+{
+    asdf_print("10GETA$(0):A=ASC(A$(0)):A$(1)=\"CTL+\"+CHR$(A + 64):?\"'\";A$(A<32);\"' = \";A:IFA<>3GOTO10\r");
+}
+
+
+
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h

@@ -0,0 +1,254 @@
+// -*- mode: C; tab-width: 4 ; indent-tabs-mode: nil -*-
+//
+// Unfified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_classic_add_map.h
+//
+// Keymap matrices and add_map() function for the Franklin ACE 1000 replacement keyboard
+// https://github.com/ryucats/Franklin-ACE-1000-Keyboard
+//
+// Copyright 2023 Chris RYU
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+
+#if !defined(ASDF_KEYMAP_ACE1000_ADD_MAP_H)
+#define ASDF_KEYMAP_ACE1000_ADD_MAP_H
+
+#include "asdf_keymap_defs_dipswitch.h"
+#include "asdf_modifiers.h"
+
+typedef enum {
+  ACE1000_PLAIN_MAP,
+  ACE1000_CAPS_MAP,
+  ACE1000_SHIFT_MAP,
+  ACE1000_CTRL_MAP,
+} ace1000_map_index_t;
+
+
+// function prototypes
+void ace1000_add_map(const ace1000_map_index_t map_index, modifier_index_t modifier_index);
+void ace1000_keyboard_test(void);
+
+#define ASDF_ACE_DIP_SWITCHES ASDF_KEYMAP_DIP_SWITCHES
+
+// Key value definitions
+#define ACE_KEY_0	0x30
+#define ACE_KEY_1	0x31
+#define ACE_KEY_2	0x32
+#define ACE_KEY_3	0x33
+#define ACE_KEY_4	0x34
+#define ACE_KEY_5	0x35
+#define ACE_KEY_6	0x36
+#define ACE_KEY_7	0x37
+#define ACE_KEY_8	0x38
+#define ACE_KEY_9	0x39
+#define ACE_KEY_A	0x61
+#define ACE_KEY_B	0x62
+#define ACE_KEY_BREAK	0x03
+#define ACE_KEY_C	0x63
+#define ACE_KEY_COMMA	0x2c
+#define ACE_KEY_CTRL_0	0x30
+#define ACE_KEY_CTRL_1	0x31
+#define ACE_KEY_CTRL_2	0x32
+#define ACE_KEY_CTRL_3	0x33
+#define ACE_KEY_CTRL_4	0x34
+#define ACE_KEY_CTRL_5	0x35
+#define ACE_KEY_CTRL_6	0x36
+#define ACE_KEY_CTRL_7	0x37
+#define ACE_KEY_CTRL_8	0x38
+#define ACE_KEY_CTRL_9	0x39
+#define ACE_KEY_CTRL_A	0x01
+#define ACE_KEY_CTRL_B	0x02
+#define ACE_KEY_CTRL_BREAK	0x03
+#define ACE_KEY_CTRL_C	0x03
+#define ACE_KEY_CTRL_COMMA	0x2c
+#define ACE_KEY_CTRL_CURLY	0x7b
+#define ACE_KEY_CTRL_D	0x04
+#define ACE_KEY_CTRL_E	0x05
+#define ACE_KEY_CTRL_ESC	0x1b
+#define ACE_KEY_CTRL_F	0x06
+#define ACE_KEY_CTRL_G	0x07
+#define ACE_KEY_CTRL_H	0x08
+#define ACE_KEY_CTRL_I	0x09
+#define ACE_KEY_CTRL_J	0x0a
+#define ACE_KEY_CTRL_K	0x0b
+#define ACE_KEY_CTRL_L	0x0c
+#define ACE_KEY_CTRL_LEFT	0x08
+#define ACE_KEY_CTRL_M	0x0d
+#define ACE_KEY_CTRL_N	0x0e
+#define ACE_KEY_CTRL_NUM_0	0x30
+#define ACE_KEY_CTRL_NUM_1	0x31
+#define ACE_KEY_CTRL_NUM_2	0x32
+#define ACE_KEY_CTRL_NUM_3	0x33
+#define ACE_KEY_CTRL_NUM_4	0x34
+#define ACE_KEY_CTRL_NUM_5	0x35
+#define ACE_KEY_CTRL_NUM_6	0x36
+#define ACE_KEY_CTRL_NUM_7	0x37
+#define ACE_KEY_CTRL_NUM_8	0x38
+#define ACE_KEY_CTRL_NUM_9	0x39
+#define ACE_KEY_CTRL_GT	0x3e
+#define ACE_KEY_CTRL_MINUS	0x2d
+#define ACE_KEY_CTRL_SPLAT	0x2a
+#define ACE_KEY_CTRL_NUM_PERIOD	0x2e
+#define ACE_KEY_CTRL_NUM_PLUS	0x2b
+#define ACE_KEY_CTRL_O	0x0f
+#define ACE_KEY_CTRL_P	0x10
+#define ACE_KEY_RETURN 0x0d
+#define ACE_KEY_CTRL_PAUSE	0x13
+#define ACE_KEY_CTRL_PERIOD	0x2e
+#define ACE_KEY_CTRL_PLUS	0x3d
+#define ACE_KEY_CTRL_Q	0x11
+#define ACE_KEY_CTRL_SLASH	0x2f
+#define ACE_KEY_CTRL_QUOTE	0x27
+#define ACE_KEY_CTRL_R	0x12
+#define ACE_KEY_CTRL_RIGHT	0x15
+#define ACE_KEY_CTRL_S	0x13
+#define ACE_KEY_CTRL_SEMI	0x3b
+#define ACE_KEY_CTRL_SPACE	0x20
+#define ACE_KEY_CTRL_SQUARE	0x1d
+#define ACE_KEY_CTRL_T	0x14
+#define ACE_KEY_CTRL_TAB	0x09
+#define ACE_KEY_CTRL_U	0x15
+#define ACE_KEY_CTRL_UNDERSCORE	0x3d
+#define ACE_KEY_CTRL_V	0x16
+#define ACE_KEY_CTRL_W	0x17
+#define ACE_KEY_CTRL_X	0x18
+#define ACE_KEY_CTRL_Y	0x19
+#define ACE_KEY_CTRL_Z	0x1a
+#define ACE_KEY_CURLY	0x7b
+#define ACE_KEY_D	0x64
+#define ACE_KEY_E	0x65
+#define ACE_KEY_ESC	0x1b
+#define ACE_KEY_F	0x66
+#define ACE_KEY_G	0x67
+#define ACE_KEY_H	0x68
+#define ACE_KEY_I	0x69
+#define ACE_KEY_J	0x6a
+#define ACE_KEY_K	0x6b
+#define ACE_KEY_L	0x6c
+#define ACE_KEY_LEFT	0x08
+#define ACE_KEY_M	0x6d
+#define ACE_KEY_N	0x6e
+#define ACE_KEY_NUM_0	0x30
+#define ACE_KEY_NUM_1	0x31
+#define ACE_KEY_NUM_2	0x32
+#define ACE_KEY_NUM_3	0x33
+#define ACE_KEY_NUM_4	0x34
+#define ACE_KEY_NUM_5	0x35
+#define ACE_KEY_NUM_6	0x36
+#define ACE_KEY_NUM_7	0x37
+#define ACE_KEY_NUM_8	0x38
+#define ACE_KEY_NUM_9	0x39
+#define ACE_KEY_GT	0x3e
+#define ACE_KEY_MINUS	0x2d
+#define ACE_KEY_SPLAT	0x2a
+#define ACE_KEY_NUM_PERIOD	0x2e
+#define ACE_KEY_NUM_PLUS	0x2b
+#define ACE_KEY_O	0x6f
+#define ACE_KEY_P	0x70
+#define ACE_KEY_PAUSE	0x13
+#define ACE_KEY_PERIOD	0x2e
+#define ACE_KEY_PLUS	0x3d
+#define ACE_KEY_Q	0x71
+#define ACE_KEY_SLASH	0x2f
+#define ACE_KEY_QUOTE	0x27
+#define ACE_KEY_R	0x72
+#define ACE_KEY_RIGHT	0x15
+#define ACE_KEY_S	0x73
+#define ACE_KEY_SEMI	0x3b
+#define ACE_KEY_SHIFT_0	0x29
+#define ACE_KEY_SHIFT_1	0x21
+#define ACE_KEY_SHIFT_2	0x40
+#define ACE_KEY_SHIFT_3	0x23
+#define ACE_KEY_SHIFT_4	0x24
+#define ACE_KEY_SHIFT_5	0x25
+#define ACE_KEY_SHIFT_6	0x5e
+#define ACE_KEY_SHIFT_7	0x26
+#define ACE_KEY_SHIFT_8	0x2a
+#define ACE_KEY_SHIFT_9	0x28
+#define ACE_KEY_SHIFT_A	0x41
+#define ACE_KEY_SHIFT_B	0x42
+#define ACE_KEY_SHIFT_BREAK	0x03
+#define ACE_KEY_SHIFT_C	0x43
+#define ACE_KEY_SHIFT_COMMA	0x3c
+#define ACE_KEY_SHIFT_CURLY	0x7d
+#define ACE_KEY_SHIFT_D	0x44
+#define ACE_KEY_SHIFT_E	0x45
+#define ACE_KEY_SHIFT_ESC	0x1b
+#define ACE_KEY_SHIFT_F	0x46
+#define ACE_KEY_SHIFT_G	0x47
+#define ACE_KEY_SHIFT_H	0x48
+#define ACE_KEY_SHIFT_I	0x49
+#define ACE_KEY_SHIFT_J	0x4a
+#define ACE_KEY_SHIFT_K	0x4b
+#define ACE_KEY_SHIFT_L	0x4c
+#define ACE_KEY_SHIFT_LEFT	0x08
+#define ACE_KEY_SHIFT_M	0x4d
+#define ACE_KEY_SHIFT_N	0x4e
+#define ACE_KEY_SHIFT_NUM_0	0x30
+#define ACE_KEY_SHIFT_NUM_1	0x31
+#define ACE_KEY_SHIFT_NUM_2	0x32
+#define ACE_KEY_SHIFT_NUM_3	0x33
+#define ACE_KEY_SHIFT_NUM_4	0x34
+#define ACE_KEY_SHIFT_NUM_5	0x35
+#define ACE_KEY_SHIFT_NUM_6	0x36
+#define ACE_KEY_SHIFT_NUM_7	0x37
+#define ACE_KEY_SHIFT_NUM_8	0x38
+#define ACE_KEY_SHIFT_NUM_9	0x39
+#define ACE_KEY_SHIFT_GT	0x3e
+#define ACE_KEY_SHIFT_MINUS	0x2d
+#define ACE_KEY_SHIFT_SPLAT	0x2a
+#define ACE_KEY_SHIFT_NUM_PERIOD	0x2e
+#define ACE_KEY_SHIFT_NUM_PLUS	0x2b
+#define ACE_KEY_SHIFT_O	0x4f
+#define ACE_KEY_SHIFT_P	0x50
+#define ACE_KEY_SHIFT_PAUSE	0x13
+#define ACE_KEY_SHIFT_PERIOD	0x3e
+#define ACE_KEY_SHIFT_PLUS	0x2b
+#define ACE_KEY_SHIFT_Q	0x51
+#define ACE_KEY_SHIFT_SLASH	0x3f
+#define ACE_KEY_SHIFT_QUOTE	0x22
+#define ACE_KEY_SHIFT_R	0x52
+#define ACE_KEY_SHIFT_RIGHT	0x15
+#define ACE_KEY_SHIFT_S	0x53
+#define ACE_KEY_SHIFT_SEMI	0x3a
+#define ACE_KEY_SHIFT_SPACE	0x20
+#define ACE_KEY_SHIFT_SQUARE	0x5d
+#define ACE_KEY_SHIFT_T	0x54
+#define ACE_KEY_SHIFT_TAB	0x09
+#define ACE_KEY_SHIFT_U	0x55
+#define ACE_KEY_SHIFT_UNDERSCORE	0x5f
+#define ACE_KEY_SHIFT_V	0x56
+#define ACE_KEY_SHIFT_W	0x57
+#define ACE_KEY_SHIFT_X	0x58
+#define ACE_KEY_SHIFT_Y	0x59
+#define ACE_KEY_SHIFT_Z	0x5A
+#define ACE_KEY_SPACE	0x20
+#define ACE_KEY_SQUARE	0x5b
+#define ACE_KEY_T	0x74
+#define ACE_KEY_TAB	0x09
+#define ACE_KEY_U	0x75
+#define ACE_KEY_UNDERSCORE	0x2d
+#define ACE_KEY_V	0x76
+#define ACE_KEY_W	0x77
+#define ACE_KEY_X	0x78
+#define ACE_KEY_Y	0x79
+#define ACE_KEY_Z	0x7a
+
+#endif /* !defined (ASDF_KEYMAP_ACE1000_ADD_MAP_H) */
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/Keymaps/asdf_keymap_apple2.c

@@ -25,10 +25,12 @@
 
 
 #include "asdf_print.h"
+#include "asdf_hook.h"
 #include "asdf_keymaps.h"
 #include "asdf_virtual.h"
 #include "asdf_modifiers.h"
 #include "asdf_keymap_apple2_add_map.h"
+#include "asdf_keymap_apple2.h"
 
 // PROCEDURE:
 // INPUTS:
@@ -44,18 +46,24 @@
 //
 // COMPLEXITY:
 //
+
+void apple2_id_message(void)
+{
+  asdf_print("[Keymap: Apple 2 (u/l case)]");
+}
+
 void setup_apple2_keymap(void)
 {
+  asdf_set_print_delay(APPLE2_PRINT_DELAY);
 
-  asdf_print("[Keymap: Apple 2 (u/l case)]");
 
   apple_add_map(APPLE_PLAIN_MAP, MOD_PLAIN_MAP);
   apple_add_map(APPLE_CAPS_MAP, MOD_CAPS_MAP);
   apple_add_map(APPLE_SHIFT_MAP, MOD_SHIFT_MAP);
   apple_add_map(APPLE_CTRL_MAP, MOD_CTRL_MAP);
 
-  asdf_virtual_init();
-
+  asdf_hook_assign(APPLESOFT_KEYBOARD_TEST, applesoft_keyboard_test);
+  asdf_hook_assign(APPLE2_ID_MESSAGE, apple2_id_message);
 
   // Attach the physical POWER LED as the CAPS LED. Assign no triggered
   // function, and initialize to initial state of the CAPS logic. The CAPS LED
@@ -71,6 +79,8 @@ void setup_apple2_keymap(void)
 
   // assign the CLRSCR output to the virtual CLRSCR output, configure to produce a long pulse when activated
   asdf_virtual_assign(APPLE_VIRTUAL_CLR_SCR, APPLE_CLR_SCR_OUTPUT, V_PULSE_LONG, !APPLE_CLR_SCR_ACTIVE_VALUE);
+
+  asdf_modifier_capslock_activate(); // For Apple 2, start with CAPS active
 }
 
 

firmware/asdf/src/Keymaps/asdf_keymap_apple2.h

@@ -39,11 +39,14 @@
 #if !defined(ASDF_KEYMAP_DEFS_APPLE2_H)
 #define ASDF_KEYMAP_DEFS_APPLE2_H
 
-// include DIP switch definitions
-#include "asdf_keymap_defs_dipswitch.h"
+#include "asdf_hook.h"
+
+#define APPLESOFT_KEYBOARD_TEST ASDF_HOOK_USER_3
+#define APPLE2_ID_MESSAGE ASDF_HOOK_USER_10
+#define APPLE2_ASCII_TEST ASDF_HOOK_USER_11
+
+#define APPLE2_PRINT_DELAY 40 // msec
 
-// Edit the number of rows and columns used in this map. If the number is less
-// than the maxium, the unused elements will be initialized to 0.
 
 #endif /* !defined (ASDF_KEYMAP_DEFS_APPLE2_H) */
 

firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.c

@@ -25,6 +25,7 @@
 
 #include "asdf_arch.h"
 #include "asdf.h"
+#include "asdf_print.h"
 #include "asdf_ascii.h"
 #include "asdf_keymaps.h"
 #include "asdf_keymap_apple2_add_map.h"
@@ -87,7 +88,7 @@ const FLASH apple_keycode_matrix_t apple_shift_matrix = {
    [4] = { ACTION_NOTHING, 'I', 'U', 'Y', 'T', 'R', 'E', 'W' },
    [5] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ASCII_CR, ASCII_AT, 'O', 'L', '>' },
    [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_CLEAR, '=',
-           '*',         ASCII_ZERO,           ASCII_RT_PAREN,       ASCII_LT_PAREN },
+           '*', ASCII_AT, ASCII_RT_PAREN, ASCII_LT_PAREN },
    [7] = { APPLE_LEFT_ARROW, ASCII_SINGLE_QUOTE, '&', '%', '$', '#', ASCII_DOUBLE_QUOTE, '!' },
    ASDF_APPLE2_DIP_SWITCHES
 };
@@ -101,7 +102,7 @@ const FLASH apple_keycode_matrix_t apple_caps_shift_matrix = {
    [4] = { ACTION_NOTHING, 'I', 'U', 'Y', 'T', 'R', 'E', 'W' },
    [5] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ASCII_CR, ACTION_REPEAT, 'O', 'L', '>' },
    [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_CLEAR, '=',
-           '*', ASCII_ZERO, ASCII_RT_PAREN, ASCII_LT_PAREN },
+           '*', ACTION_NOTHING, ASCII_RT_PAREN, ASCII_LT_PAREN },
    [7] = { APPLE_LEFT_ARROW, ASCII_SINGLE_QUOTE, '&', '%', '$', '#', ASCII_DOUBLE_QUOTE, '!' },
    ASDF_APPLE2_DIP_SWITCHES
 };
@@ -122,25 +123,24 @@ const FLASH apple_keycode_matrix_t apple_caps_matrix = {
 const FLASH apple_keycode_matrix_t apple_ctrl_matrix = {
    [0] = { ACTION_CAPS, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING,
            ACTION_NOTHING, ASCII_ESC,    ACTION_CTRL,  APPLE_RIGHT_ARROW },
-   [1] = { ACTION_NOTHING, ASCII_CTRL_P, ACTION_NOTHING, ACTION_NOTHING,
+   [1] = { ACTION_NOTHING, ASCII_CTRL_P, ACTION_NOTHING, ASCII_BACKSLASH,
            ASCII_SPACE,    ASCII_CTRL_Z, ASCII_CTRL_A,   ASCII_CTRL_Q },
-   [2] = { ACTION_NOTHING, ASCII_COMMA, ASCII_CTRL_M, ASCII_CTRL_N,
+   [2] = { ACTION_NOTHING, ASCII_LT_SQUARE_BRACE, ASCII_CTRL_M, ASCII_CTRL_N,
            ASCII_CTRL_B, ASCII_CTRL_V, ASCII_CTRL_C, ASCII_CTRL_X },
    [3] = { ACTION_NOTHING, ASCII_CTRL_K, ASCII_CTRL_J, ASCII_CTRL_H,
            ASCII_CTRL_G, ASCII_CTRL_F, ASCII_CTRL_D, ASCII_CTRL_S },
    [4] = { ACTION_NOTHING, ASCII_CTRL_I, ASCII_CTRL_U, ASCII_CTRL_Y,
            ASCII_CTRL_T, ASCII_CTRL_R, ASCII_CTRL_E, ASCII_CTRL_W },
    [5] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING,  ASCII_CR,
-           ACTION_REPEAT,      ASCII_CTRL_O,   ASCII_CTRL_L, ACTION_NOTHING },
-   [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_RESET,   ACTION_NOTHING,
-           ACTION_NOTHING, ACTION_FN_10, ACTION_FN_9, ACTION_FN_8 },
-   [7] = { APPLE_LEFT_ARROW, ACTION_FN_7, ACTION_FN_6, ACTION_FN_5,
-            ACTION_FN_4, ACTION_FN_3, ACTION_FN_2, ACTION_FN_1 },
+           ACTION_REPEAT,      ASCII_CTRL_O,   ASCII_CTRL_L, ASCII_RT_SQUARE_BRACE },
+   [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_RESET,  ASCII_UNDERSCORE,
+           ACTION_NOTHING, ACTION_FN_10, ASCII_RT_CURLY_BRACE, ASCII_LT_CURLY_BRACE },
+   [7] = { ASCII_DEL, ASCII_GRAVE_ACCENT, ASCII_CARET, ACTION_FN_5,
+            ACTION_FN_4, ACTION_FN_3, ASCII_TILDE, ASCII_VERT_BAR },
    ASDF_APPLE2_DIP_SWITCHES
 };
 
 
-
 static const apple_keycode_matrix_t *apple_maps[] = {
   [APPLE_CAPS_MAP] = &apple_caps_matrix,
   [APPLE_PLAIN_MAP] = &apple_plain_matrix,
@@ -149,7 +149,12 @@ static const apple_keycode_matrix_t *apple_maps[] = {
   [APPLE_CAPS_SHIFT_MAP] = &apple_caps_shift_matrix
 };
 
-  void apple_add_map(const apple_map_index_t map_index,
+void applesoft_keyboard_test(void)
+{
+    asdf_print("10GETA$(0):A=ASC(A$(0)):A$(1)=\"CTL+\"+CHR$(A + 64):?\"'\";A$(A<32);\"' = \";A:IFA<>3GOTO10\r");
+}
+
+void apple_add_map(const apple_map_index_t map_index,
                        modifier_index_t modifier_index)
 {
 

firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.h

@@ -49,7 +49,7 @@
 
 #define APPLE_VIRTUAL_POWER_LED VLED1
 #define APPLE_POWER_LED PHYSICAL_LED1
-#define APPLE_POWER_LED_INIT_VALUE 1
+#define APPLE_POWER_LED_INIT_VALUE 0 // Toggles when caps lock is activated
 
 #define APPLE_VIRTUAL_DISABLED_LED VLED2
 #define APPLE_DISABLED_LED PHYSICAL_LED3
@@ -70,6 +70,8 @@ typedef enum {
 
 
 // function prototypes
+void applesoft_keyboard_test(void);
+
 void apple_add_map(const apple_map_index_t map_index, modifier_index_t modifier_index);
 
 #endif /* !defined (ASDF_KEYMAP_APPLE_ADD_MAP_H) */

firmware/asdf/src/Keymaps/asdf_keymap_apple2_caps.c

@@ -29,6 +29,11 @@
 #include "asdf_virtual.h"
 #include "asdf_modifiers.h"
 #include "asdf_keymap_apple2_add_map.h"
+#include "asdf_keymap_apple2_caps.h"
+
+void apple2_caps_id_message(void) {
+  asdf_print("[Keymap: Apple 2 CAPS]");
+}
 
 // PROCEDURE: setup_apple2_caps_keymap
 // INPUTS: none
@@ -46,16 +51,15 @@
 //
 void setup_apple2_caps_keymap(void)
 {
-
-  asdf_print("[Keymap: Apple 2 CAPS]");
+  asdf_set_print_delay(APPLE2_PRINT_DELAY);
 
   apple_add_map(APPLE_CAPS_MAP, MOD_PLAIN_MAP);
   apple_add_map(APPLE_CAPS_MAP, MOD_CAPS_MAP);
   apple_add_map(APPLE_CAPS_SHIFT_MAP, MOD_SHIFT_MAP);
   apple_add_map(APPLE_CTRL_MAP, MOD_CTRL_MAP);
 
-  asdf_virtual_init();
-
+  asdf_hook_assign(APPLESOFT_KEYBOARD_TEST, applesoft_keyboard_test);
+  asdf_hook_assign(APPLE2_CAPS_ID_MESSAGE, apple2_caps_id_message);
 
   // Turn the POWER LED on and don't assign to any function
 

firmware/asdf/src/Keymaps/asdf_keymap_apple2_caps.h

@@ -0,0 +1,51 @@
+// -*- mode: C; tab-width: 4 ; indent-tabs-mode: nil -*-
+//
+// Unfified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_apple2_caps.h
+//
+// Apple 2 keymaps
+//
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+// This file supplies the Apple 2 ASCII keyboard keymap.  Two variants are provided:
+//
+// 1) An Upper/Lowercase variant. This variant moves the @ and ^ symbols from
+//    the P and N keys to the REPEAT key, since the P and N keys need to reserve
+//    the shifted value for the uppercase characters. Also, the "Power" key
+//    doubles as a caps-lock key.
+//
+// 2) A CAPS only keyboard, following the standard Apple II conventions and
+//    layout, with ^ above the N key and @ above the P key, and a functioning
+//    REPEAT key.
+//
+// For both variants, CTRL+RESET is required for a system reset.
+
+#if !defined(ASDF_KEYMAP_DEFS_APPLE2_CAPS_H)
+#define ASDF_KEYMAP_DEFS_APPLE2_CAPS_H
+
+#define APPLESOFT_KEYBOARD_TEST ASDF_HOOK_USER_9
+#define APPLE2_CAPS_ID_MESSAGE ASDF_HOOK_USER_10
+
+#define APPLE2_PRINT_DELAY 40 // msec
+
+
+#endif /* !defined (ASDF_KEYMAP_DEFS_APPLE2_CAPS_H) */
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/Keymaps/asdf_keymap_classic.c

@@ -23,12 +23,18 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
+#include "asdf.h"
 #include "asdf_keymaps.h"
 #include "asdf_virtual.h"
 #include "asdf_modifiers.h"
 #include "asdf_print.h"
 #include "asdf_keymap_classic.h"
 #include "asdf_keymap_classic_add_map.h"
+#include "asdf_keymap_apple2_add_map.h"
+
+void classic_id_message(void) {
+  asdf_print("[Keymap: classic]\n");
+}
 
 // PROCEDURE:
 // INPUTS:
@@ -47,14 +53,15 @@
 
 void setup_classic_keymap(void)
 {
-  asdf_print("[Keymap: classic]\n");
+  asdf_set_print_delay(ASDF_CLASSIC_PRINT_SPEED); //msec
 
   classic_add_map(CLASSIC_PLAIN_MAP, MOD_PLAIN_MAP);
   classic_add_map(CLASSIC_CAPS_MAP, MOD_CAPS_MAP);
   classic_add_map(CLASSIC_SHIFT_MAP, MOD_SHIFT_MAP);
   classic_add_map(CLASSIC_CTRL_MAP, MOD_CTRL_MAP);
 
-  asdf_virtual_init();
+  asdf_hook_assign(CLASSIC_ID_MESSAGE_HOOK, classic_id_message);
+  asdf_hook_assign(APPLESOFT_KEYBOARD_TEST_HOOK, applesoft_keyboard_test);
 
   // Assign power LED to virtual power LED, and initialize to ON
   asdf_virtual_assign(CLASSIC_VIRTUAL_POWER_LED, CLASSIC_POWER_LED, V_NOFUNC, CLASSIC_POWER_LED_INIT_VALUE);
@@ -62,6 +69,7 @@ void setup_classic_keymap(void)
   // Assign CAPS LED to virtual CAPS LED, and initialize to the INIT value, to
   // match the initial CAPSLOCK state. The capslock state code will alter the
   // virtual LED according to the state.
+
   asdf_virtual_assign(VCAPS_LED, CLASSIC_CAPS_LED, V_NOFUNC, CLASSIC_CAPS_LED_INIT_VALUE);
 
   // assign RESET output to the virtual RESET output, configure to produce a short pulse when activated
@@ -69,7 +77,6 @@ void setup_classic_keymap(void)
 
   // assign the CLRSCR output to the virtual CLRSCR output, configure to produce a long pulse when activated
   asdf_virtual_assign(CLASSIC_VIRTUAL_CLR_SCR, CLASSIC_CLR_SCR_OUT, V_PULSE_LONG, !CLASSIC_CLR_SCR_ACTIVE_VALUE);
-
 }
 
 

firmware/asdf/src/Keymaps/asdf_keymap_classic.h

@@ -31,8 +31,7 @@
 #if !defined(ASDF_KEYMAP_DEFS_CLASSIC_H)
 #define ASDF_KEYMAP_DEFS_CLASSIC_H
 
-// include DIP switch definitions
-#include "asdf_keymap_defs_dipswitch.h"
+#include "asdf_hook.h"
 
 // Edit the number of rows and columns used in this map. If the number is less
 // than the maxium, the unused elements will be initialized to 0.
@@ -59,6 +58,11 @@
 #define CLASSIC_CAPS_LED PHYSICAL_LED3
 #define CLASSIC_CAPS_LED_INIT_VALUE 0
 
+#define CLASSIC_ID_MESSAGE_HOOK ASDF_HOOK_USER_10
+#define APPLESOFT_KEYBOARD_TEST_HOOK ASDF_HOOK_USER_9
+
+#define ASDF_CLASSIC_PRINT_SPEED 40
+
 #endif /* !defined (ASDF_KEYMAP_DEFS_ASCII_H) */
 
 //-------|---------|---------+---------+---------+---------+---------+---------+

firmware/asdf/src/Keymaps/asdf_keymap_classic_add_map.c

@@ -29,6 +29,7 @@
 #include "asdf_keymaps.h"
 #include "asdf_keymap_classic.h"
 #include "asdf_keymap_classic_add_map.h"
+#include "asdf_keymap_defs_dipswitch.h"
 
 // Key Matrix for combination of ASCII controller and Classic ASCII matrix
 //

firmware/asdf/src/Keymaps/asdf_keymap_classic_caps.c

@@ -23,12 +23,21 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
+#include "asdf.h"
 #include "asdf_keymaps.h"
 #include "asdf_print.h"
 #include "asdf_virtual.h"
 #include "asdf_modifiers.h"
 #include "asdf_keymap_classic.h"
 #include "asdf_keymap_classic_add_map.h"
+#include "asdf_keymap_apple2_add_map.h"
+
+
+
+void classic_caps_id_message(void) {
+  asdf_print("[Keymap: classic]\n");
+}
+
 
 // PROCEDURE:
 // INPUTS:
@@ -47,7 +56,7 @@
 
 void setup_classic_caps_keymap(void)
 {
-  asdf_print("[Keymap: classic CAPS]");
+  asdf_set_print_delay(ASDF_CLASSIC_PRINT_SPEED);
 
   // for the ALL CAPS keymap, the "plain" mode is the same as "all caps" mode:
   classic_add_map(CLASSIC_CAPS_MAP, MOD_PLAIN_MAP);
@@ -55,7 +64,8 @@ void setup_classic_caps_keymap(void)
   classic_add_map(CLASSIC_SHIFT_MAP, MOD_SHIFT_MAP);
   classic_add_map(CLASSIC_CTRL_MAP, MOD_CTRL_MAP);
 
-  asdf_virtual_init();
+  asdf_hook_assign(CLASSIC_ID_MESSAGE_HOOK, classic_caps_id_message);
+  asdf_hook_assign(APPLESOFT_KEYBOARD_TEST_HOOK, applesoft_keyboard_test);
 
   // Assign power LED to virtual power LED, and initialize to ON
   asdf_virtual_assign(CLASSIC_VIRTUAL_POWER_LED, CLASSIC_POWER_LED, V_NOFUNC, CLASSIC_POWER_LED_INIT_VALUE);

firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h

@@ -31,6 +31,7 @@
                                [1] = ACTION_MAPSEL_1,               \
                                [2] = ACTION_MAPSEL_2,               \
                                [3] = ACTION_MAPSEL_3,               \
+                               [5] = ACTION_FN_11,                   \
                                [6] = ACTION_STROBE_POLARITY_SELECT, \
                                [7] = ACTION_AUTOREPEAT_SELECT,      \
   }

firmware/asdf/src/Keymaps/asdf_keymap_sol.c

@@ -29,6 +29,11 @@
 #include "asdf_ascii.h"
 #include "asdf_modifiers.h"
 #include "asdf_keymaps.h"
+#include "asdf_print.h"
+
+
+#define SOL_PRINT_DELAY 40 // msec
+#define SOL_ID_MESSAGE_HOOK ASDF_HOOK_USER_10
 
 static const FLASH asdf_keycode_t sol_plain_map[ASDF_SOL_NUM_ROWS][ASDF_SOL_NUM_COLS] = {
   [0] = { ACTION_CTRL, SOL_KBD_SHIFTLOCK_ACTION, 'a', 's', 'd', 'f', 'g', 'h' },
@@ -137,6 +142,11 @@ static void sol_add_map(const asdf_keycode_t (*matrix)[ASDF_SOL_NUM_COLS],
 }
 
 
+static void sol_id_message(void)
+{
+  asdf_print("[Keybd: Sol-20]");
+}
+
 void setup_sol_keymap(void)
 {
   sol_add_map(sol_plain_map, MOD_PLAIN_MAP);
@@ -144,7 +154,7 @@ void setup_sol_keymap(void)
   sol_add_map(sol_shift_map, MOD_SHIFT_MAP);
   sol_add_map(sol_ctrl_map, MOD_CTRL_MAP);
 
-  asdf_virtual_init();
+  asdf_set_print_delay(SOL_PRINT_DELAY);
 
   // Set up the ALL CAPS LED, default = off
   asdf_virtual_assign(VCAPS_LED, SOL_KBD_LED_UPPERCASE, V_NOFUNC, SOL_KBD_LED_OFF);
@@ -163,12 +173,13 @@ void setup_sol_keymap(void)
   // Set up the BREAK output, produce a long pulse when activated, default output high
   asdf_virtual_assign(SOL_KBD_VBREAK, SOL_KBD_TTLOUT_BREAK, V_PULSE_LONG, SOL_KBD_TTL_HIGH);
 
-
   // Activate the ALL CAPS mode to emulate the original keyboard:
   asdf_modifier_capslock_activate();
 
   // Configure negative strobe
   asdf_arch_set_neg_strobe();
+
+  asdf_hook_assign(SOL_ID_MESSAGE_HOOK, sol_id_message);
 }
 
 

firmware/asdf/src/Keymaps/asdf_keymap_sol.h

@@ -0,0 +1,127 @@
+// -*- mode: C; tab-width: 4 ; indent-tabs-mode: nil -*-
+//
+// Unfified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymaps_sol.h
+//
+// Ascii keymaps
+//
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+// To use this ascii for a new keymap, edit the keymaps definitions as
+// desired. The keymaps are organized from row 0, counting upward, and each row
+// includes the columns from 0-NUM_COLS.
+//
+
+#if !defined(ASDF_KEYMAP_SOL_H)
+#define ASDF_KEYMAP_SOL_H
+#include "asdf.h"
+#include "asdf_keymap_defs_dipswitch.h"
+
+// Edit the number of rows and columns used in this map. If the number is less
+// than the maxium, the unused elements will be initialized to 0.
+
+#define ASDF_SOL_NUM_ROWS 13 // DIP switches are row 9
+#define ASDF_SOL_NUM_COLS 8
+
+
+// Key Matrix for combination of ASCII controller (ATMega328P version) and Classic ASCII matrix
+//
+// Col->   0          1          2          3          4          5          6          7
+// Row 0   Lt Ctrl    ShiftLock  A          S          D          F          G(alpha)   H
+// Row 1   J          K          L          ;(semi)    :(colon)   DEL        Repeat     Rt Ctrl
+// Row 2   UpperCase  Lt Shift   Z          X          C          V          B(alpha)   N
+// Row 3   M          ,(comma)   .(period)  /(slash)   Rt Shift   ModeSelect
+// Row 4   ESC        1          2          3          4          5          6(six)     7
+// Row 5   8(eight)   9          0(zero)    -(Dash)    ^(Caret)   [          \          ]
+// Row 6   BREAK      TAB        Q          W          E          R          T          Y
+// Row 7   U          I          O(alpha)   P          @(at)      Return     LineFeed   Load
+// Row 9   LOCAL      UpArrow    LtArrow    Spacebar   RtArrow    DnArrow    Home       Clear
+// Row 10  NP-Minus   NP-7       NP-Times   NP-8       NP-Divide  NP-9       (none)     (none)
+// Row 11  NP-4       NP-1       NP-5       NP-2       NP-6       NP-3       (none)     (none)
+// Row 12  NP-0       NP-period  NP-Plus
+//
+// Row 8   DIP switches 0-7
+//
+// Physical Resource mapping:
+// LED1: UPPER CASE
+// LED2: LOCAL
+// LED3: SHIFT LOCK
+// OUT1: RESET
+// OUT2: BREAK
+// OUT3: LOCAL
+
+// Notes:
+//
+// 1) To ensure consistent DIP switch operation within the keymap, a
+//    ASDF_SOL_DIP_SWITCHES macro is defined. Keeping the ACTION_MAPSEL0-3
+//    definitions in positions 0-3 ensures consistent map selection among all
+//    keymaps.
+
+
+#define SOL_PRINT_DELAY 40 // msec
+#define SOL_ID_MESSAGE_HOOK ASDF_HOOK_USER_10
+
+#define SOL_NUM_ROWS 13
+#define SOL_NUM_COLS 8
+
+#define SOL_KBD_VRESET VOUT1
+#define SOL_KBD_VBREAK VOUT2
+#define SOL_KBD_VLOCAL VOUT3
+#define SOL_KBD_LED_ON 1
+#define SOL_KBD_LED_OFF 0
+
+// The SOL manual (sec. 7.7.8) indicates shiftlock locks SHIFT on, and SHIFT
+// returns to unshifted. For Toggle behavior, change to ACTION_SHIFTLOCK_TOGGLE.
+#define SOL_KBD_SHIFTLOCK_ACTION ACTION_SHIFTLOCK_ON
+
+
+// The weird C preprocessor expansion behavior requires one dereference for each
+// expansion.
+#define SOL_KBD_VIRTUAL_SUB1(SOL_VDEVICE) ACTION_ ## SOL_VDEVICE
+#define SOL_KBD_VIRTUAL_SUB(SOL_VDEVICE) SOL_KBD_VIRTUAL_SUB1(SOL_VDEVICE)
+#define SOL_KBD_LOCAL_ACTION SOL_KBD_VIRTUAL_SUB(SOL_KBD_VLOCAL)
+#define SOL_KBD_RESET_ACTION SOL_KBD_VIRTUAL_SUB(SOL_KBD_VRESET)
+#define SOL_KBD_BREAK_ACTION SOL_KBD_VIRTUAL_SUB(SOL_KBD_VBREAK)
+
+#define SOL_ASCII_LOAD 0x8C
+#define SOL_ASCII_MODE_SELECT 0x80
+#define SOL_ASCII_UP_ARROW 0x97
+#define SOL_ASCII_LT_ARROW 0x81
+#define SOL_ASCII_RT_ARROW 0x93
+#define SOL_ASCII_DN_ARROW 0x9a
+#define SOL_ASCII_HOME 0x8e
+#define SOL_ASCII_CLEAR 0x8b
+
+#define SOL_KBD_TTL_HIGH 1
+#define SOL_KBD_TTL_LOW 0
+
+#define SOL_KBD_LED_UPPERCASE PHYSICAL_LED1
+#define SOL_KBD_LED_LOCAL PHYSICAL_LED2
+#define SOL_KBD_LED_SHIFTLOCK PHYSICAL_LED3
+#define SOL_KBD_TTLOUT_RESET PHYSICAL_OUT3_OPEN_HI // Emulate open collector output.
+#define SOL_KBD_TTLOUT_BREAK PHYSICAL_OUT2
+#define SOL_KBD_TTLOUT_LOCAL PHYSICAL_OUT1
+
+#define ASDF_SOL_DIP_SWITCHES ASDF_KEYMAP_DIP_SWITCHES
+
+
+#endif /* !defined (ASDF_KEYMAP_SOL_H) */
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/asdf.c

@@ -67,6 +67,11 @@ static asdf_buffer_handle_t asdf_keycode_buffer;
 // This is the handle for the message output buffer
 static asdf_buffer_handle_t asdf_message_buffer;
 
+// The delay time for strings sent via parallel port. This is needed because
+// most keyboards have no handshaking, and we need to allow time for various
+// environments to process the characters. Some, such as basic interpreters, are
+// rather slow.  So we we allow keyboard modules to modifiy this delay.
+static uint16_t asdf_print_delay_ms;
 
 // PROCEDURE: asdf_put_code
 // INPUTS: (asdf_keycode_t) code: code to be buffered for output
@@ -140,11 +145,33 @@ asdf_keycode_t asdf_next_code(void)
     code = asdf_buffer_get(asdf_keycode_buffer);
   } else {
     // for system message
-    asdf_arch_character_delay();
+    asdf_arch_delay_ms(asdf_print_delay_ms);
   }
   return code;
 }
 
+// PROCEDURE: asdf_set_print_delay
+// INPUTS: (uint8_t) delay_ms
+//
+// OUTPUTS: none
+//
+// DESCRIPTION: sets the delay to be used by the system print buffer
+//
+// SIDE EFFECTS: modifies character delay variable.
+//
+// NOTES: A delay is enforced for system messages, to reduce the risk of dropped
+// characters with unbuffered polling hosts. No delay is needed for typed
+// keycodes, as these are generated at human speeds.
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+void asdf_set_print_delay(uint8_t delay_ms)
+{
+  asdf_print_delay_ms = delay_ms;
+}
+
 // PROCEDURE: asdf_lookup_keycode
 // INPUTS: row, col: specify a row and column in the keyboard matrix
 // OUTPUTS: returns a keycode
@@ -280,15 +307,35 @@ static void asdf_activate_action(action_t keycode)
     case ACTION_NOTHING:
     case ACTION_HERE_IS:
     case ACTION_FN_1:
+      asdf_hook_execute(ASDF_HOOK_USER_1);
+      break;
     case ACTION_FN_2:
+      asdf_hook_execute(ASDF_HOOK_USER_2);
+      break;
     case ACTION_FN_3:
+      asdf_hook_execute(ASDF_HOOK_USER_3);
+      break;
     case ACTION_FN_4:
+      asdf_hook_execute(ASDF_HOOK_USER_4);
+      break;
     case ACTION_FN_5:
+      asdf_hook_execute(ASDF_HOOK_USER_5);
+      break;
     case ACTION_FN_6:
+      asdf_hook_execute(ASDF_HOOK_USER_6);
+      break;
     case ACTION_FN_7:
+      asdf_hook_execute(ASDF_HOOK_USER_7);
+      break;
     case ACTION_FN_8:
+      asdf_hook_execute(ASDF_HOOK_USER_8);
+      break;
     case ACTION_FN_9:
+      asdf_hook_execute(ASDF_HOOK_USER_9);
+      break;
     case ACTION_FN_10:
+      asdf_hook_execute(ASDF_HOOK_USER_10);
+      break;
     default: break;
   }
 }
@@ -416,42 +463,6 @@ static void asdf_deactivate_key(asdf_keycode_t keycode)
   }
 }
 
-// PROCEDURE: asdf_init
-// INPUTS: none
-// OUTPUTS: none
-//
-// DESCRIPTION: Reserve an output buffer to hold keycodes to be sent, and
-// initialize the keyboard state and debounce counters
-//
-// SIDE EFFECTS: see DESCRIPTION
-//
-// SCOPE: public
-//
-// COMPLEXITY: 3
-//
-void asdf_init(void)
-{
-
-  last_key = ACTION_NOTHING;
-
-  asdf_buffer_init();  // initialize the buffers
-  asdf_repeat_init();  // initialize the repeat counters
-  asdf_keymaps_init(); // initialize keymaps. This also initializes the modifier
-                       // key states.
-  // reserve a buffer for the ASCII output:
-  asdf_keycode_buffer = asdf_buffer_new(ASDF_KEYCODE_BUFFER_SIZE);
-  asdf_message_buffer = asdf_buffer_new(ASDF_MESSAGE_BUFFER_SIZE);
-
-  // Initialize all the keys to the unpressed state, and initialze the debounce
-  // counters.
-  for (uint8_t row = 0; row < ASDF_MAX_ROWS; row++) {
-    last_stable_key_state[row] = 0;
-    for (uint8_t col = 0; col < ASDF_MAX_COLS; col++) {
-      debounce_counters[row][col] = ASDF_DEBOUNCE_TIME_MS;
-    }
-  }
-}
-
 // PROCEDURE: asdf_handle_key_press_or_release
 // INPUTS: row, col: the row and column number of the key that has changed.
 // OUTPUTS: none
@@ -552,7 +563,7 @@ static void asdf_handle_key_held_pressed(uint8_t row, uint8_t col)
 //
 void asdf_keyscan(void)
 {
-  asdf_cols_t (*row_reader)(uint8_t) = (asdf_cols_t(*)(uint8_t)) asdf_hook_get(ASDF_HOOK_SCANNER);
+  asdf_cols_t (*row_reader)(uint8_t) = (asdf_cols_t(*)(uint8_t)) asdf_hook_get(ASDF_HOOK_ROW_SCANNER);
 
   asdf_hook_execute(ASDF_HOOK_EACH_SCAN);
   for (uint8_t row = 0; row < asdf_keymaps_num_rows(); row++) {
@@ -561,7 +572,7 @@ void asdf_keyscan(void)
     asdf_cols_t changed = row_key_state ^ last_stable_key_state[row];
 
     // loop over the bits until all changed or pressed keys in the row are handled.
-    for (uint8_t col = 0; (changed || row_key_state) && col < asdf_keymaps_num_cols(); col++) {
+    for (uint8_t col = 0; /*(changed || row_key_state) && */col < asdf_keymaps_num_cols(); col++) {
       if (changed & 1) {
         // key state is different from last stable state
         asdf_handle_key_press_or_release(row, col, row_key_state & 1);
@@ -575,5 +586,82 @@ void asdf_keyscan(void)
   }
 }
 
+// PROCEDURE: asdf_apply_all_actions
+// INPUTS: none
+// OUTPUTS: none
+//
+// DESCRIPTION: Scans the key matrix. For each row, read the columns, and for
+// each bit, if an action is specified, then call the activate or deactivate
+// function for that action, based on the key state. This is necessary to ensure
+// that configuration settings, such as DIP switches and jumper settings, are
+// properly handled when a keymap is changed.
+
+// SIDE EFFECTS: See DESCRIPTION
+//
+// COMPLEXITY: 5
+//
+// SCOPE: private
+//
+void asdf_apply_all_actions(void)
+{
+  asdf_cols_t (*row_reader)(uint8_t) = (asdf_cols_t(*)(uint8_t)) asdf_hook_get(ASDF_HOOK_ROW_SCANNER);
+
+  for (uint8_t row = 0; row < asdf_keymaps_num_rows(); row++) {
+    asdf_cols_t row_key_state = (*row_reader)(row);
+
+    // To avoid double actions, assign last stable key state to current state.
+    last_stable_key_state[row] = row_key_state;
+
+    // loop over the bits until all changed or pressed keys in the row are handled.
+    for (uint8_t col = 0; col < asdf_keymaps_num_cols(); col++) {
+      asdf_keycode_t code = asdf_lookup_keycode(row, col);
+      if (row_key_state & 1) {
+        asdf_activate_action(code);
+      } else {
+        asdf_deactivate_action(code);
+      }
+      row_key_state >>= 1;
+    }
+  }
+}
+
+
+// PROCEDURE: asdf_init
+// INPUTS: none
+// OUTPUTS: none
+//
+// DESCRIPTION: Reserve an output buffer to hold keycodes to be sent, and
+// initialize the keyboard state and debounce counters
+//
+// SIDE EFFECTS: see DESCRIPTION
+//
+// SCOPE: public
+//
+// COMPLEXITY: 3
+//
+void asdf_init(void)
+{
+
+  last_key = ACTION_NOTHING;
+
+  asdf_buffer_init();  // initialize the buffers
+  asdf_repeat_init();  // initialize the repeat counters
+  asdf_keymaps_init(); // initialize keymaps. This also initializes the modifier
+                       // key states.
+  // reserve a buffer for the ASCII output:
+  asdf_keycode_buffer = asdf_buffer_new(ASDF_KEYCODE_BUFFER_SIZE);
+  asdf_message_buffer = asdf_buffer_new(ASDF_MESSAGE_BUFFER_SIZE);
+
+  // Initialize all the keys to the unpressed state, and initialze the debounce
+  // counters.
+  for (uint8_t row = 0; row < ASDF_MAX_ROWS; row++) {
+    last_stable_key_state[row] = 0;
+    for (uint8_t col = 0; col < ASDF_MAX_COLS; col++) {
+      debounce_counters[row][col] = ASDF_DEBOUNCE_TIME_MS;
+    }
+  }
+}
+
+
 //-------|---------|---------+---------+---------+---------+---------+---------+
 // Above line is 80 columns, and should display completely in the editor.

firmware/asdf/src/asdf.h

@@ -85,6 +85,7 @@ typedef enum {
   ACTION_FN_8,
   ACTION_FN_9,
   ACTION_FN_10,
+  ACTION_FN_11,
   RESERVED_1,
   RESERVED_2,
   RESERVED_3,
@@ -147,6 +148,15 @@ int asdf_putc(char c, FILE *stream);
 // keycodes, as these are generated at human speeds.
 asdf_keycode_t asdf_next_code(void);
 
+// PROCEDURE: asdf_set_print_delay
+// INPUTS: (uint8_t) delay_ms
+// OUTPUTS: none
+// DESCRIPTION: sets the delay to be used by the system print buffer
+// NOTES: A delay is enforced for system messages, to reduce the risk of dropped
+// characters with unbuffered polling hosts. No delay is needed for typed
+// keycodes, as these are generated at human speeds.
+void asdf_set_print_delay(uint8_t delay_ms);
+
 #endif // !defined (ASDF_H)
 
 

firmware/asdf/src/asdf_ascii.h

@@ -76,12 +76,15 @@ typedef enum {
   ASCII_RT_SQUARE_BRACE = 0x5d,
   ASCII_UNDERSCORE = 0x5f,
   ASCII_BACKSLASH = 0x5c,
+  ASCII_CARET = 0x5e,
   ASCII_GRAVE_ACCENT = 0x60,
   ASCII_LT_CURLY_BRACE = 0x7b,
   ASCII_RT_CURLY_BRACE = 0x7d,
   ASCII_TILDE = 0x7e,
   ASCII_VERT_BAR = 0x7c,
-  ASCII_DEL = 0x7f
+  ASCII_DEL = 0x7f,
+  ASCII_MAX_PRINTABLE = 0x7f,
+  ASCII_MIN_PRINTABLE = 0x20,
 } ascii_defs_t;
 
 #define ASCII_NULL 0

firmware/asdf/src/asdf_buffer.c

@@ -193,7 +193,7 @@ void asdf_buffer_put(asdf_buffer_handle_t handle, asdf_keycode_t code)
 asdf_keycode_t asdf_buffer_get(asdf_buffer_handle_t handle)
 {
   asdf_keycode_t code = ASDF_INVALID_CODE;
-  if (handle < next_handle && buffers[handle].count) {
+  if (buffer_handle_valid(handle) && buffers[handle].count) {
     code = buffers[handle].buf[buffers[handle].tail];
     buffers[handle].tail = (buffers[handle].tail + 1) % buffers[handle].size;
     buffers[handle].count--;

firmware/asdf/src/asdf_config.h

@@ -83,6 +83,9 @@
 // DEFAULT value of keyboard outputs
 #define ASDF_VIRTUAL_OUT_DEFAULT_VALUE 1 // High if not used.
 
+// DEFAULT key scan routine
+#define ASDF_DEFAULT_KEY_SCANNER asdf_keyscan
+
 #endif /* !defined (CONFIG_H) */
 
 //-------|---------|---------+---------+---------+---------+---------+---------+

firmware/asdf/src/asdf_hook.c

@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include "asdf_config.h"
 #include "asdf_arch.h"
 #include "asdf_hook.h"
 
@@ -166,8 +167,9 @@ void asdf_hook_init(void)
     hook_map[i] = &asdf_hook_null_func;
   }
 
-  hook_map[ASDF_HOOK_SCANNER] = (asdf_hook_function_t) ASDF_ARCH_DEFAULT_SCANNER;
+  hook_map[ASDF_HOOK_ROW_SCANNER] = (asdf_hook_function_t) ASDF_ARCH_DEFAULT_ROW_SCANNER;
   hook_map[ASDF_HOOK_OUTPUT] = (asdf_hook_function_t) ASDF_ARCH_DEFAULT_OUTPUT;
+  hook_map[ASDF_HOOK_KEY_SCANNER] = (asdf_hook_function_t) ASDF_DEFAULT_KEY_SCANNER;
 }
 
 //-------|---------|---------+---------+---------+---------+---------+---------+

firmware/asdf/src/asdf_hook.h

@@ -29,9 +29,21 @@
 // keymap initializer commands.
 typedef enum {
   ASDF_HOOK_NULL,
-  ASDF_HOOK_SCANNER,
+  ASDF_HOOK_KEY_SCANNER,
+  ASDF_HOOK_ROW_SCANNER,
   ASDF_HOOK_OUTPUT,
   ASDF_HOOK_EACH_SCAN,
+  ASDF_HOOK_USER_1,
+  ASDF_HOOK_USER_2,
+  ASDF_HOOK_USER_3,
+  ASDF_HOOK_USER_4,
+  ASDF_HOOK_USER_5,
+  ASDF_HOOK_USER_6,
+  ASDF_HOOK_USER_7,
+  ASDF_HOOK_USER_8,
+  ASDF_HOOK_USER_9,
+  ASDF_HOOK_USER_10,
+  ASDF_HOOK_USER_11,
   ASDF_NUM_HOOKS,
 } asdf_hook_id_t;
 

firmware/asdf/src/asdf_keymap_setup.c.in

@@ -51,9 +51,7 @@
 //
 void asdf_keymap_setup(uint8_t index) {
   switch(index) {
-@keymap_table@
-    default:
-    break;
+    default: @keymap_table@
   }
 }
 
@@ -61,7 +59,7 @@ void asdf_keymap_setup(uint8_t index) {
 //
 // INPUTS: (uint8_t) index - index of the keymap setup function to check
 // OUTPUTS: (uintu_t) returns TRUE (nonzero) if valid, FALSE (0) otherwise
-////
+//
 // DESCRIPTION: This function returns TRUE if the index corresponds to
 //              a valid keymap.
 //
@@ -76,12 +74,12 @@ void asdf_keymap_setup(uint8_t index) {
 uint8_t asdf_keymap_valid(uint8_t index) {
   uint8_t valid = 0;
 
-  switch(index) {
-@keymap_valid@
-    valid= 1;
+  switch(index) { @keymap_valid@
+      valid = 1;
     break;
 
     default:
+      valid = 0;
     break;
   }
 

firmware/asdf/src/asdf_keymap_setup.h.in

@@ -27,8 +27,6 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#define ASDF_NUM_KEYMAPS @num_keymaps@
-
 // PROCEDURE: asdf_keymap_setup
 // INPUTS: (uint8_t) index - index of the keymap setup function to call
 // OUTPUTS: none

firmware/asdf/src/asdf_keymap_table.c.in

@@ -1,63 +0,0 @@
-// -*- mode: C; tab-width: 2 ; indent-tabs-mode: nil -*- 
-//
-// Unified Keyboard Project
-// ASDF keyboard firmware
-//
-// asdf_keymap_table.c
-//
-// initialize keymap setup function table
-//
-// *** AUTO-generated file.  DO NOT EDIT. ***
-// *** To modify template, edit $ROOT/src/Keymaps/asdf_keymap_table.c.in ***
-// *** To modify keymap list, edit $ROOT/keymap_list.cmake
-//
-// Copyright 2019 David Fenyes
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program. If not, see <https://www.gnu.org/licenses/>.
-//
-
-#include <stdint.h>
-
-@keymap_declarations@
-
-// PROCEDURE: asdf_keymap_setup
-//
-// INPUTS: (uint8_t) index - index of the keymap setup function to call
-// OUTPUTS: none
-////
-// DESCRIPTION: This function calls the keymap setup function specified
-//              by the index.
-//
-// SIDE EFFECTS: See Description
-//
-// NOTES: This function is necessary because functions defined in external
-// modules are not considered compile-time constants by the C99 standard, so the
-// array cannot be initialized with a compile-time declaration.
-//
-// SCOPE: public
-//
-// COMPLEXITY: 1
-//
-
-void asdf_keymap_setup(uint8_t index) {
-  switch(index) {
-@keymap_table@
-    default:
-    break;
-  }
-};
-
-//-------|---------|---------+---------+---------+---------+---------+---------+
-// Above line is 80 columns, and should display completely in the editor.
-

firmware/asdf/src/asdf_keymaps.c

@@ -25,7 +25,6 @@
 #include "asdf_config.h"
 #include "asdf.h"
 #include "asdf_arch.h"
-#include "asdf_physical.h"
 #include "asdf_virtual.h"
 #include "asdf_hook.h"
 #include "asdf_keymap_setup.h"
@@ -37,7 +36,7 @@
 static asdf_keycode_map_t keymaps[ASDF_MOD_NUM_MODIFIERS] = {};
 
 // The current keymap index.  This is stored so bitwise operators on the keymap index can be performed.
-static uint8_t current_keymap_index;
+static uint8_t current_keyboard_index;
 
 // PROCEDURE: asdf_keymaps_add_map
 // INPUTS: (asdf_keycode_t *) - pointer to the keycode matrix to add in to map
@@ -140,13 +139,12 @@ static void asdf_keymaps_reset(void)
   asdf_hook_init();
 }
 
-// PROCEDURE: asdf_keymaps_select
-// INPUTS: (uint8_t) index - index of the keymap number to select
+// PROCEDURE: asdf_keymaps_switch
+// INPUTS: (uint8_t) index - index of the keymap number to switch to
 // OUTPUTS: none
 //
-// DESCRIPTION: accepts a index value. If the requested keymap index is valid,
-// then:
-// 1) assign the value to the global (to the module) current_keymap_index variable
+// DESCRIPTION: accepts a index value.
+// 1) assign the value to the global (to the module) current_keyboard_index variable
 // 2) execute the architecture-dependent init routine, to undo any settings
 //    from the previous keymap
 // 3) execute the keymap-specific setup routine.
@@ -159,14 +157,13 @@ static void asdf_keymaps_reset(void)
 //
 // COMPLEXITY: 2
 //
-void asdf_keymaps_select(uint8_t index)
+void asdf_keymaps_switch(uint8_t index)
 {
   // we set the current keymap index in order to track the state of the DIP
   // switches, but only switch to a valid map
 
-  current_keymap_index = index;
-
   if (asdf_keymap_valid(index)) {
+    current_keyboard_index = index;
 
     asdf_arch_init();
     asdf_keymaps_reset();
@@ -175,28 +172,36 @@ void asdf_keymaps_select(uint8_t index)
   }
 }
 
-// PROCEDURE: ASDF_KEYMAPS_DUMMY_FUNCTION
-// INPUTS: none
+// PROCEDURE: asdf_keymaps_select
+// INPUTS: (uint8_t) index - index of the keymap number to select
 // OUTPUTS: none
 //
-// DESCRIPTION: null function to populate the keymap setup function table. Since
-// this function does nothing, then selecting an unregistered keymap has no
-// effect (i.e., the previous keymap persisits)
+// DESCRIPTION: accepts a index value. If the keyboard is different from the
+// currently active keyboard, then attempt to switch to the new keyboard index
 //
-// SIDE EFFECTS: See Description
+// SIDE EFFECTS: See DESCRIPTION
 //
-// SCOPE: private
+// NOTES:
 //
-// COMPLEXITY: 1
+// SCOPE: public
 //
-void asdf_keymaps_dummy_function(void) {}
+// COMPLEXITY: 2
+//
+void asdf_keymaps_select(uint8_t index)
+{
+
+  if (index != current_keyboard_index) {
+    asdf_keymaps_switch(index);
+  }
+}
 
 // PROCEDURE: asdf_keymaps_init
 // INPUTS: none
 // OUTPUTS: none
 //
 // DESCRIPTION: initialize the keymap list. Called at startup. This function
-// calls the auto-generated keymap table init function, then selects keymap 0.
+// switches to keyboard 0. The switch routine cleans up the keyboard data
+// structures.
 //
 // SIDE EFFECTS: See DESCRIPTION
 //
@@ -206,7 +211,7 @@ void asdf_keymaps_dummy_function(void) {}
 //
 void asdf_keymaps_init(void)
 {
-  asdf_keymaps_select(0);
+  asdf_keymaps_switch(0);
 }
 
 // PROCEDURE: asdf_keymaps_map_select_0_clear
@@ -226,7 +231,7 @@ void asdf_keymaps_init(void)
 //
 void asdf_keymaps_map_select_0_clear(void)
 {
-  asdf_keymaps_select(current_keymap_index & (~ASDF_KEYMAP_BIT_0));
+  asdf_keymaps_select(current_keyboard_index & (~ASDF_KEYMAP_BIT_0));
 }
 
 // PROCEDURE: asdf_keymaps_map_select_0_set
@@ -246,7 +251,7 @@ void asdf_keymaps_map_select_0_clear(void)
 //
 void asdf_keymaps_map_select_0_set(void)
 {
-  asdf_keymaps_select(current_keymap_index | ASDF_KEYMAP_BIT_0);
+  asdf_keymaps_select(current_keyboard_index | ASDF_KEYMAP_BIT_0);
 }
 
 // PROCEDURE: asdf_keymaps_map_select_1_clear
@@ -266,7 +271,7 @@ void asdf_keymaps_map_select_0_set(void)
 //
 void asdf_keymaps_map_select_1_clear(void)
 {
-  asdf_keymaps_select(current_keymap_index & (~ASDF_KEYMAP_BIT_1));
+  asdf_keymaps_select(current_keyboard_index & (~ASDF_KEYMAP_BIT_1));
 }
 
 // PROCEDURE: asdf_keymaps_map_select_1_set
@@ -286,7 +291,7 @@ void asdf_keymaps_map_select_1_clear(void)
 //
 void asdf_keymaps_map_select_1_set(void)
 {
-  asdf_keymaps_select(current_keymap_index | ASDF_KEYMAP_BIT_1);
+  asdf_keymaps_select(current_keyboard_index | ASDF_KEYMAP_BIT_1);
 }
 
 // PROCEDURE: asdf_keymaps_map_select_2_clear
@@ -306,7 +311,7 @@ void asdf_keymaps_map_select_1_set(void)
 //
 void asdf_keymaps_map_select_2_clear(void)
 {
-  asdf_keymaps_select(current_keymap_index & (~ASDF_KEYMAP_BIT_2));
+  asdf_keymaps_select(current_keyboard_index & (~ASDF_KEYMAP_BIT_2));
 }
 
 // PROCEDURE: asdf_keymaps_map_select_2_set
@@ -326,7 +331,7 @@ void asdf_keymaps_map_select_2_clear(void)
 //
 void asdf_keymaps_map_select_2_set(void)
 {
-  asdf_keymaps_select(current_keymap_index | ASDF_KEYMAP_BIT_2);
+  asdf_keymaps_select(current_keyboard_index | ASDF_KEYMAP_BIT_2);
 }
 
 // PROCEDURE: asdf_keymaps_map_select_3_clear
@@ -346,7 +351,7 @@ void asdf_keymaps_map_select_2_set(void)
 //
 void asdf_keymaps_map_select_3_clear(void)
 {
-  asdf_keymaps_select(current_keymap_index & (~ASDF_KEYMAP_BIT_3));
+  asdf_keymaps_select(current_keyboard_index & (~ASDF_KEYMAP_BIT_3));
 }
 
 // PROCEDURE: asdf_keymaps_map_select_3_set
@@ -366,7 +371,7 @@ void asdf_keymaps_map_select_3_clear(void)
 //
 void asdf_keymaps_map_select_3_set(void)
 {
-  asdf_keymaps_select(current_keymap_index | ASDF_KEYMAP_BIT_3);
+  asdf_keymaps_select(current_keyboard_index | ASDF_KEYMAP_BIT_3);
 }
 
 // PROCEDURE: asdf_keymaps_get_code
@@ -389,10 +394,10 @@ void asdf_keymaps_map_select_3_set(void)
 asdf_keycode_t asdf_keymaps_get_code(const uint8_t row, const uint8_t col,
                                      const uint8_t modifier_index)
 {
-  uint8_t num_cols = keymaps[current_keymap_index].cols;
+  uint8_t num_cols = keymaps[current_keyboard_index].cols;
   asdf_keycode_t keycode = 0;
 
-  if (keymaps[current_keymap_index].cols && keymaps[current_keymap_index].rows) {
+  if (keymaps[current_keyboard_index].cols && keymaps[current_keyboard_index].rows) {
     asdf_keycode_t (*keycode_matrix)[num_cols] = (void *) (keymaps[modifier_index].matrix);
     keycode = FLASH_READ_MATRIX_ELEMENT(keycode_matrix, row, col);
   }

firmware/asdf/src/main.c

@@ -68,10 +68,11 @@ int main(void)
     if (asdf_arch_tick()) {
       asdf_keycode_t code = asdf_next_code();
 
-      if (code != ASDF_INVALID_CODE) {
-         void (*output_function)(asdf_keycode_t) =
-         (void (*)(asdf_keycode_t)) asdf_hook_get(ASDF_HOOK_OUTPUT);
-        (*output_function)(code);
+      if (code < ASDF_INVALID_CODE) {
+          // This is inside the loop because the output function may change
+          void (*output_function)(asdf_keycode_t) =
+          (void (*)(asdf_keycode_t)) asdf_hook_get(ASDF_HOOK_OUTPUT);
+          (*output_function)(code);
       }
       asdf_keyscan();
     }

firmware/asdf/test/CmakeLists.txt

@@ -1,4 +1,4 @@
-configure_file(${ASDF_SRC_DIR}/Arch/asdf_arch_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h COPYONLY)
+configure_file(${PROJECT_SRC_DIR}/Arch/asdf_arch_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h COPYONLY)
 
 list(APPEND C_FLAGS
   "-std=c99"
@@ -21,8 +21,8 @@ list(APPEND C_FLAGS
 list(APPEND TEST_INCLUDES
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${ASDF_SRC_DIR}
-  ${ASDF_SRC_DIR}/Arch
+  ${PROJECT_SRC_DIR}
+  ${PROJECT_SRC_DIR}/Arch
   )
 
 add_library(unity
@@ -39,21 +39,21 @@ target_include_directories(unity
 add_library(asdf_core
   STATIC
   asdf_keymap_table.c
-  ${ASDF_SRC_DIR}/asdf.c
-  ${ASDF_SRC_DIR}/asdf_buffer.c
-  ${ASDF_SRC_DIR}/asdf_hook.c
-  ${ASDF_SRC_DIR}/asdf_keymaps.c
-  ${ASDF_SRC_DIR}/asdf_modifiers.c
-  ${ASDF_SRC_DIR}/asdf_physical.c
-  ${ASDF_SRC_DIR}/asdf_repeat.c
-  ${ASDF_SRC_DIR}/asdf_virtual.c
-  ${ASDF_SRC_DIR}/Arch/asdf_arch_test.c
+  ${PROJECT_SRC_DIR}/asdf.c
+  ${PROJECT_SRC_DIR}/asdf_buffer.c
+  ${PROJECT_SRC_DIR}/asdf_hook.c
+  ${PROJECT_SRC_DIR}/asdf_keymaps.c
+  ${PROJECT_SRC_DIR}/asdf_modifiers.c
+  ${PROJECT_SRC_DIR}/asdf_physical.c
+  ${PROJECT_SRC_DIR}/asdf_repeat.c
+  ${PROJECT_SRC_DIR}/asdf_virtual.c
+  ${PROJECT_SRC_DIR}/Arch/asdf_arch_test.c
   )
 
 target_include_directories(asdf_core
   PRIVATE
-  ${ASDF_SRC_DIR}
-  ${ASDF_SRC_DIR}/Arch
+  ${PROJECT_SRC_DIR}
+  ${PROJECT_SRC_DIR}/Arch
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   )
@@ -68,7 +68,7 @@ add_library(test_helpers
 target_include_directories(test_helpers
   PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${ASDF_SRC_DIR}
+  ${PROJECT_SRC_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   )
 

firmware/asdf/test/asdf_keymap_setup.c

@@ -0,0 +1,125 @@
+// -*- mode: C; tab-width: 2 ; indent-tabs-mode: nil -*- 
+//
+// Unified Keyboard Project
+// ASDF keyboard firmware
+//
+// asdf_keymap_table.c
+//
+// initialize keymap setup function table
+//
+// *** This is a special versiof for testing.
+// *** Not auto-generated.
+//
+// Copyright 2019 David Fenyes
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation, either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program. If not, see <https://www.gnu.org/licenses/>.
+//
+
+#include <stdint.h>
+#include "asdf_keymap_table.h"
+#include "test_asdf_keymap_defs.h"
+
+// PROCEDURE: asdf_keymap_setup
+//
+// INPUTS: (uint8_t) index - index of the keymap setup function to call
+// OUTPUTS: none
+////
+// DESCRIPTION: This function calls the keymap setup function specified
+//              by the index.
+//
+// SIDE EFFECTS: See Description
+//
+// NOTES: This function is necessary because functions defined in external
+// modules are not considered compile-time constants by the C99 standard, so the
+// array cannot be initialized with a compile-time declaration.
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+void asdf_keymap_setup(uint8_t index) {
+  switch(index) {
+
+    default:
+    case ASDF_TEST_PLAIN_MAP_INDEX: setup_test_plain_map(); break;
+    case ASDF_TEST_CAPS_MAP_INDEX: setup_test_caps_map(); break;
+    case ASDF_TEST2_PLAIN_MAP_INDEX: setup_test2_plain_map(); break;
+    case ASDF_TEST2_CAPS_MAP_INDEX: setup_test2_caps_map();
+      break;
+
+      // keymap assignments for the virtual device tests
+    case SINGLE_TESTS_KEYMAP: setup_test_vdevs_single(); break;
+    case DOUBLE_ASSIGN_TEST_KEYMAP: setup_test_vdevs_double(); break;
+    case TRIPLE_TESTS_KEYMAP: setup_test_vdevs_triple(); break;
+    case VCAPS_TEST_KEYMAP: setup_test_vdevs_vcaps();
+      break;
+
+      // keymap assignments for the hook mechanism tests
+    case ASDF_TEST_DEFAULT_SCANNER_MAP: setup_test_hooks_alt_scanner(); break;
+    case ASDF_TEST_ALTERNATE_OUTPUT_MAP: setup_test_hooks_alt_output(); break;
+    case ASDF_TEST_EACH_SCAN_MAP: setup_test_hooks_each_scan(); break;
+  }
+}
+
+// PROCEDURE: asdf_keymap_valid
+//
+// INPUTS: (uint8_t) index - index of the keymap setup function to check
+// OUTPUTS: (uintu_t) returns TRUE (nonzero) if valid, FALSE (0) otherwise
+//
+// DESCRIPTION: This function returns TRUE if the index corresponds to
+//              a valid keymap.
+//
+// SIDE EFFECTS: none
+//
+// NOTES:
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+uint8_t asdf_keymap_valid(uint8_t index) {
+  uint8_t valid = 0;
+
+  switch(index) {
+    case ASDF_TEST_PLAIN_MAP_INDEX:
+    case ASDF_TEST_CAPS_MAP_INDEX:
+    case ASDF_TEST2_PLAIN_MAP_INDEX:
+    case ASDF_TEST2_CAPS_MAP_INDEX:
+
+    // keymap assignments for the virtual device tests
+    case SINGLE_TESTS_KEYMAP:
+    case DOUBLE_ASSIGN_TEST_KEYMAP:
+    case TRIPLE_TESTS_KEYMAP:
+    case VCAPS_TEST_KEYMAP:
+
+    // keymap assignments for the hook mechanism tests
+    case ASDF_TEST_DEFAULT_SCANNER_MAP:
+    case ASDF_TEST_ALTERNATE_OUTPUT_MAP:
+    case ASDF_TEST_EACH_SCAN_MAP:
+
+      valid = 1;
+      break;
+
+    default:
+      valid = 0;
+    break;
+  }
+
+  return valid;
+}
+
+
+//-------|---------|---------+---------+---------+---------+---------+---------+
+// Above line is 80 columns, and should display completely in the editor.
+

firmware/asdf/test/asdf_keymap_setup.h

@@ -7,9 +7,8 @@
 //
 // initialize keymap setup function table
 //
-// *** AUTO-generated file.  DO NOT EDIT. ***
-// *** To modify template, edit $ROOT/src/Keymaps/asdf_keymap_table.c.in ***
-// *** To modify keymap list, edit $ROOT/keymap_list.cmake
+// *** This is configured for testing.
+// *** NOT auto-generated
 //
 // Copyright 2019 David Fenyes
 //
@@ -27,7 +26,10 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#define ASDF_NUM_KEYMAPS @num_keymaps@
+#define ASDF_NUM_KEYMAPS 11
+
+// define the type for a keymap setup function. Keymaps are registerd by storing
+// a keymap setup function in the keymap setup array.
 
 // PROCEDURE: asdf_keymap_setup
 // INPUTS: (uint8_t) index - index of the keymap setup function to call
@@ -37,6 +39,13 @@
 // SIDE EFFECTS: See Description
 void asdf_keymap_setup(uint8_t index);
 
+// PROCEDURE: asdf_keymap_valid
+// INPUTS: (uint8_t) index - index of the keymap setup function to check
+// OUTPUTS: (uintu_t) returns TRUE (nonzero) if valid, FALSE (0) otherwise
+// DESCRIPTION: This function returns TRUE if the index corresponds to
+//              a valid keymap.
+uint8_t asdf_keymap_valid(uint8_t index);
+
 //-------|---------|---------+---------+---------+---------+---------+---------+
 // Above line is 80 columns, and should display completely in the editor.
 

firmware/asdf/test/asdf_keymap_table.c

@@ -26,29 +26,99 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
+#include <stdint.h>
 #include "asdf_keymap_table.h"
 #include "test_asdf_keymap_defs.h"
 
-asdf_keymap_setup_function_t keymap_setup_function_lookup_table[ASDF_NUM_KEYMAPS] = {
-  [ASDF_TEST_PLAIN_MAP_INDEX] = setup_test_plain_map,
-  [ASDF_TEST_CAPS_MAP_INDEX] = setup_test_caps_map,
-  [ASDF_TEST2_PLAIN_MAP_INDEX] = setup_test2_plain_map,
-  [ASDF_TEST2_CAPS_MAP_INDEX] = setup_test2_caps_map,
-  
-  // keymap assignments for the virtual device tests
-  [SINGLE_TESTS_KEYMAP] = setup_test_vdevs_single,
-  [DOUBLE_ASSIGN_TEST_KEYMAP] = setup_test_vdevs_double,
-  [TRIPLE_TESTS_KEYMAP] = setup_test_vdevs_triple,
-  [VCAPS_TEST_KEYMAP] = setup_test_vdevs_vcaps,
+// PROCEDURE: asdf_keymap_setup
+//
+// INPUTS: (uint8_t) index - index of the keymap setup function to call
+// OUTPUTS: none
+////
+// DESCRIPTION: This function calls the keymap setup function specified
+//              by the index.
+//
+// SIDE EFFECTS: See Description
+//
+// NOTES: This function is necessary because functions defined in external
+// modules are not considered compile-time constants by the C99 standard, so the
+// array cannot be initialized with a compile-time declaration.
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+void asdf_keymap_setup(uint8_t index) {
+  switch(index) {
 
-  // keymap assignments for the hook mechanism tests
-  [ASDF_TEST_DEFAULT_SCANNER_MAP] = setup_test_hooks_alt_scanner,
-  [ASDF_TEST_ALTERNATE_OUTPUT_MAP] = setup_test_hooks_alt_output,
-  [ASDF_TEST_EACH_SCAN_MAP] = setup_test_hooks_each_scan,
-};
+    default:
+    case ASDF_TEST_PLAIN_MAP_INDEX: setup_test_plain_map(); break;
+    case ASDF_TEST_CAPS_MAP_INDEX: setup_test_caps_map(); break;
+    case ASDF_TEST2_PLAIN_MAP_INDEX: setup_test2_plain_map(); break;
+    case ASDF_TEST2_CAPS_MAP_INDEX: setup_test2_caps_map();
+      break;
 
+      // keymap assignments for the virtual device tests
+    case SINGLE_TESTS_KEYMAP: setup_test_vdevs_single(); break;
+    case DOUBLE_ASSIGN_TEST_KEYMAP: setup_test_vdevs_double(); break;
+    case TRIPLE_TESTS_KEYMAP: setup_test_vdevs_triple(); break;
+    case VCAPS_TEST_KEYMAP: setup_test_vdevs_vcaps();
+      break;
+
+      // keymap assignments for the hook mechanism tests
+    case ASDF_TEST_DEFAULT_SCANNER_MAP: setup_test_hooks_alt_scanner(); break;
+    case ASDF_TEST_ALTERNATE_OUTPUT_MAP: setup_test_hooks_alt_output(); break;
+    case ASDF_TEST_EACH_SCAN_MAP: setup_test_hooks_each_scan(); break;
+  }
+}
+
+// PROCEDURE: asdf_keymap_valid
+//
+// INPUTS: (uint8_t) index - index of the keymap setup function to check
+// OUTPUTS: (uintu_t) returns TRUE (nonzero) if valid, FALSE (0) otherwise
+//
+// DESCRIPTION: This function returns TRUE if the index corresponds to
+//              a valid keymap.
+//
+// SIDE EFFECTS: none
+//
+// NOTES:
+//
+// SCOPE: public
+//
+// COMPLEXITY: 1
+//
+uint8_t asdf_keymap_valid(uint8_t index) {
+  uint8_t valid = 0;
+
+  switch(index) {
+    case ASDF_TEST_PLAIN_MAP_INDEX:
+    case ASDF_TEST_CAPS_MAP_INDEX:
+    case ASDF_TEST2_PLAIN_MAP_INDEX:
+    case ASDF_TEST2_CAPS_MAP_INDEX:
+
+    // keymap assignments for the virtual device tests
+    case SINGLE_TESTS_KEYMAP:
+    case DOUBLE_ASSIGN_TEST_KEYMAP:
+    case TRIPLE_TESTS_KEYMAP:
+    case VCAPS_TEST_KEYMAP:
+
+    // keymap assignments for the hook mechanism tests
+    case ASDF_TEST_DEFAULT_SCANNER_MAP:
+    case ASDF_TEST_ALTERNATE_OUTPUT_MAP:
+    case ASDF_TEST_EACH_SCAN_MAP:
+
+      valid = 1;
+      break;
+
+    default:
+      valid = 0;
+    break;
+  }
+
+  return valid;
+}
 
-void asdf_keymap_table_init(void) {}
 
 //-------|---------|---------+---------+---------+---------+---------+---------+
 // Above line is 80 columns, and should display completely in the editor.

firmware/asdf/test/asdf_keymap_table.h

@@ -30,9 +30,21 @@
 
 // define the type for a keymap setup function. Keymaps are registerd by storing
 // a keymap setup function in the keymap setup array.
-typedef void (*asdf_keymap_setup_function_t)(void);
 
-void asdf_keymap_table_init(void);
+// PROCEDURE: asdf_keymap_setup
+// INPUTS: (uint8_t) index - index of the keymap setup function to call
+// OUTPUTS: none
+// DESCRIPTION: This function calls the keymap setup function specified
+//              by the index.
+// SIDE EFFECTS: See Description
+void asdf_keymap_setup(uint8_t index);
+
+// PROCEDURE: asdf_keymap_valid
+// INPUTS: (uint8_t) index - index of the keymap setup function to check
+// OUTPUTS: (uintu_t) returns TRUE (nonzero) if valid, FALSE (0) otherwise
+// DESCRIPTION: This function returns TRUE if the index corresponds to
+//              a valid keymap.
+uint8_t asdf_keymap_valid(uint8_t index);
 
 //-------|---------|---------+---------+---------+---------+---------+---------+
 // Above line is 80 columns, and should display completely in the editor.

firmware/asdf/test/test_asdf_buffer.c

@@ -10,8 +10,8 @@
 #define MAX_BUFFER ASDF_BUFFER_POOL_SIZE
 #define HALF_BUFFER (ASDF_BUFFER_POOL_SIZE / 2)
 
-static const char test_string[] = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-  "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+static const char test_string[] = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+static const int test_string_size = sizeof(test_string) - 1;
 
 static const char * const more_strings[] = {
                                       "abcdefghijkl",
@@ -32,6 +32,18 @@ void setUp(void)
 void tearDown(void) {}
 
 
+
+// function to generate pseudo-random sequence to fill buffer.
+asdf_keycode_t random_code(asdf_keycode_t seed)
+{
+    uint8_t msb = seed & 0x80;
+    seed <<= 1;
+    if (msb) {
+        seed ^= 0x88;
+    }
+    return seed;
+}
+
 // allocating first buffer returns handle 0
 void test_allocating_first_buffer_returns_handle_0(void)
 {
@@ -125,16 +137,16 @@ void test_adding_and_retrieving_string_one_by_one(void)
   }
 }
 
-// Filling the buffer first, then retrieving the characters from the buffer
+
 // should return the same string.
 void test_fill_buffer_then_retrieve_string(void)
 {
   for (int sent = 0; sent < MAX_BUFFER; sent++) {
-    asdf_buffer_put(handle, (asdf_keycode_t) test_string[sent]);
+    asdf_buffer_put(handle, (asdf_keycode_t) test_string[sent % test_string_size]);
   }
   for (int received = 0; received < MAX_BUFFER; received++) {
     int32_t code = (int32_t) asdf_buffer_get(handle);
-    TEST_ASSERT_EQUAL_INT32((int32_t) test_string[received],code);
+    TEST_ASSERT_EQUAL_INT32((int32_t) test_string[received % test_string_size],code);
   }
   // assert that next code request returns invalid code:
   TEST_ASSERT_EQUAL_INT32(ASDF_INVALID_CODE, (int32_t) asdf_buffer_get(handle));
@@ -145,15 +157,20 @@ void test_fill_buffer_then_retrieve_string(void)
 // characters back, quietly dropping the overflow.
 void test_overfilling_buffer_and_retrieve_drops_overflow(void)
 {
+  const asdf_keycode_t seed = 0x3b;
+  asdf_keycode_t next_random_code;
+
   // send the entire test string to overflow the buffer.
-  for (int i = 0; i < (int) sizeof(test_string); i++) {
-    asdf_buffer_put(handle, (asdf_keycode_t) test_string[i]);
+  for (int i = 0, next_rand_code = seed; i < MAX_BUFFER * 2; i++) {
+    next_rand_code = random_code(next_rand_code);
+    asdf_buffer_put(handle, next_rand_code);
   }
   // read until invalid character is received, testing that each character is
   // correct.
-  for (int i = 0; i < MAX_BUFFER; i++) {
+  for (int i = 0, next_rand_code = seed; i < MAX_BUFFER; i++) {
     asdf_keycode_t code = asdf_buffer_get(handle);
-    TEST_ASSERT_EQUAL_INT32((int32_t) test_string[i], (int32_t) code);
+    next_rand_code = random_code(next_rand_code);
+    TEST_ASSERT_EQUAL_INT32((int32_t) next_rand_code, (int32_t) code);
   }
 
   // the next code request returns invalid code:

firmware/asdf/test/test_asdf_hook.c

@@ -40,7 +40,7 @@ typedef asdf_cols_t (*scanner_func_t)(uint8_t);
 
 void test_default_scan_hook_is_default_scanner(void)
 {
-  scanner_func_t testfunc = (scanner_func_t) asdf_hook_get(ASDF_HOOK_SCANNER);
+  scanner_func_t testfunc = (scanner_func_t) asdf_hook_get(ASDF_HOOK_ROW_SCANNER);
   asdf_cols_t testval = 0;
 
   // make sure the pointer points to the correct function
@@ -55,7 +55,7 @@ void test_default_scan_hook_is_default_scanner(void)
 void test_alternate_scan_hook(void)
 {
   asdf_keymaps_select(ASDF_TEST_ALTERNATE_SCANNER_MAP);
-  scanner_func_t testfunc = (scanner_func_t) asdf_hook_get(ASDF_HOOK_SCANNER);
+  scanner_func_t testfunc = (scanner_func_t) asdf_hook_get(ASDF_HOOK_ROW_SCANNER);
   asdf_cols_t testval = 0;
 
   // make sure the pointer points to the correct function

firmware/asdf/test/test_asdf_keymap_defs.c

@@ -154,7 +154,7 @@ void setup_test_hooks_alt_output(void)
 
   asdf_hook_init();
   asdf_hook_assign(ASDF_HOOK_OUTPUT, (void (*)(void)) &test_hook_output);
-  asdf_hook_assign(ASDF_HOOK_SCANNER, (void (*)(void)) &test_hook_read_row);
+  asdf_hook_assign(ASDF_HOOK_ROW_SCANNER, (void (*)(void)) &test_hook_read_row);
 }
 
 void setup_test_hooks_each_scan(void)

firmware/asdf/test/test_keymapdefs.c

@@ -25,8 +25,6 @@
 // testing, both must be present to test their functionality.
 
 
-#include "test_keymapdefs.h"
-
 #define PLAIN_MATRIX_1 RESERVED_1
 #define CAPS_MATRIX_1 RESERVED_2
 #define SHIFT_MATRIX_1 RESERVED_3

hardware/common/mounting-hardware.kicad_sym

@@ -0,0 +1,785 @@
+(kicad_symbol_lib (version 20220914) (generator kicad_symbol_editor)
+  (symbol "MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
+    (property "Reference" "BOLT" (at 0 3.048 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "#4-40, 1/2\"" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "" (at 0.9652 -3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "#4-40, 1/2\"" (at 6.096 4.826 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "McMaster Carr" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.mcmaster.com/catalog/129/3390/91772A110" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "RoHs Link" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "91772A110" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "n/a" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "No" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Spacer" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "If applicable" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "If applicable" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "If applicable" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "stainless steel" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Enable" "0" (at -10.16 -7.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Bolt, #4-40, 1/2\" Long, stainless steel" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel_1_1"
+      (polyline
+        (pts
+          (xy 0.6604 -1.5748)
+          (xy 1.143 -1.4478)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -1.3208)
+          (xy 1.143 -1.1938)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -1.0668)
+          (xy 1.143 -0.9398)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.7874)
+          (xy 1.143 -0.6604)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.5334)
+          (xy 1.143 -0.4064)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.2794)
+          (xy 1.143 -0.1524)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.0508)
+          (xy 0.6604 -1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.143 -0.0508)
+          (xy 1.143 -1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.8034 0.0254)
+          (xy 0.1016 0.0254)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.661 -1.9052) (mid 0.8844 -2.013) (end 1.1182 -1.9306)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.1054 -1.867) (mid 0.8819 -1.7592) (end 0.6482 -1.8416)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.7399 0.089) (mid 0.9144 0.4309) (end 0.0889 0.089)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+    )
+  )
+  (symbol "MNT McMaster Bolt, #4-40, 7/16{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
+    (property "Reference" "BOLT" (at 0 3.048 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "#4-40, 7/16\"" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "" (at 0.9652 -3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "#4-40, 7/16\"" (at 6.096 4.826 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "McMaster Carr" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.mcmaster.com/catalog/129/3390/91772A109" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "RoHs Link" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "91772A109" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "n/a" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "No" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Spacer" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "If applicable" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "If applicable" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "If applicable" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "stainless steel" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Enable" "0" (at -2.54 -5.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Bolt, #4-40, 7/16\" Long, stainless steel" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MNT McMaster Bolt, #4-40, 7/16{dblquote} Long, stainless steel_1_1"
+      (polyline
+        (pts
+          (xy 0.6604 -1.5748)
+          (xy 1.143 -1.4478)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -1.3208)
+          (xy 1.143 -1.1938)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -1.0668)
+          (xy 1.143 -0.9398)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.7874)
+          (xy 1.143 -0.6604)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.5334)
+          (xy 1.143 -0.4064)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.2794)
+          (xy 1.143 -0.1524)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6604 -0.0508)
+          (xy 0.6604 -1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.143 -0.0508)
+          (xy 1.143 -1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.8034 0.0254)
+          (xy 0.1016 0.0254)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.661 -1.9052) (mid 0.8844 -2.013) (end 1.1182 -1.9306)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.1054 -1.867) (mid 0.8819 -1.7592) (end 0.6482 -1.8416)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.7399 0.089) (mid 0.9144 0.4309) (end 0.0889 0.089)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+    )
+  )
+  (symbol "MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
+    (property "Reference" "WASHER" (at 0 3.048 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Lockwasher, #4-40" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "" (at 0.9652 -3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Lockwasher, #4-40" (at 6.096 4.826 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "McMaster Carr" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.mcmaster.com/catalog/129/3636/95584A200" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "RoHs Link" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "95584A200" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "n/a" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "No" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Spacer" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "If applicable" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "If applicable" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "If applicable" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "stainless steel" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Enable" "0" (at -5.08 -5.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "lockwasher mounting #4" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Lockwasher, #4-40, internal teeth, stainless steel" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel_0_1"
+      (polyline
+        (pts
+          (xy 1.9812 1.2192)
+          (xy 1.9812 1.8542)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 2.1336 2.0574)
+          (xy 2.1336 1.3462)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0 0) (mid 0.5957 -1.4363) (end 2.032 -2.032)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.6858 0) (mid 1.0389 -0.9795) (end 1.9812 -1.4224)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.9558 1.2192) (mid 1.0752 0.907) (end 0.6731 0.0635)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.9558 1.8542) (mid 0.6103 1.3702) (end -0.0018 0.078)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 2.0338 -2.0338) (mid 3.4701 -1.4381) (end 4.0658 -0.0018)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 2.0447 -1.4097) (mid 3.0242 -1.0566) (end 3.4671 -0.1143)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 3.4671 -0.0635) (mid 3.114 0.916) (end 2.1717 1.3589)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 4.0658 0.0526) (mid 3.4908 1.4342) (end 2.1082 2.0066)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+    )
+  )
+  (symbol "MNT McMaster Nut, #4-40, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
+    (property "Reference" "NUT" (at 0 3.048 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "#4-40" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "" (at 0.9652 -3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "#4-40" (at 6.096 4.826 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "McMaster Carr" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.mcmaster.com/catalog/129/3582/91841A005" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "RoHs Link" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "91841A005" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "n/a" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "No" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Spacer" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "If applicable" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "If applicable" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "If applicable" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "stainless steel" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Enable" "0" (at 10.16 -2.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "nut mounting #4" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Nut, #4-40, stainless steel" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MNT McMaster Nut, #4-40, stainless steel_0_1"
+      (polyline
+        (pts
+          (xy 0 1.905)
+          (xy 1.27 1.905)
+          (xy 2.54 0)
+          (xy 1.27 -1.905)
+          (xy -1.27 -1.905)
+          (xy -2.54 0)
+          (xy -1.27 1.905)
+          (xy 0 1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (circle (center 0 0) (radius 1.0074)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+    )
+  )
+  (symbol "MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
+    (property "Reference" "SPACER" (at 0 3.048 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Standard Template" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "" (at 0.9652 -3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "3/16\" OD, 1/8\" Long, #4, nylon" (at 6.096 4.826 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "McMaster Carr" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.mcmaster.com/catalog/129/3669/94639A702" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "RoHs Link" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "94639A702" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "n/a" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "No" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Spacer" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0.0762 -0.0254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "If applicable" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "If applicable" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "If applicable" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "nylon" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Enable" "0" (at -12.7 -12.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Spacer, #4, 3/16\" OD, 1/8\" Long, white nylon" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon_1_1"
+      (polyline
+        (pts
+          (xy 0.0508 0)
+          (xy 0.0508 -1.8542)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.6858 -1.8542)
+          (xy 0.6858 -0.0254)
+        )
+        (stroke (width 0) (type dot))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.1176 -1.8796)
+          (xy 1.1176 -0.0508)
+        )
+        (stroke (width 0) (type dot))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 1.7272 -0.0508)
+          (xy 1.7272 -1.905)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.0762 -1.905) (mid 0.9017 -2.2469) (end 1.7272 -1.905)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.0762 -0.0254) (mid 0.9017 -0.3673) (end 1.7272 -0.0254)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.6604 -0.0254) (mid 0.8837 -0.1328) (end 1.1176 -0.0508)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 0.661 -1.9052) (mid 0.8844 -2.013) (end 1.1182 -1.9306)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.1048 0.0128) (mid 0.8815 0.1201) (end 0.6476 0.0382)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.1054 -1.867) (mid 0.8819 -1.7592) (end 0.6482 -1.8416)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.7145 -1.8922) (mid 0.889 -1.5503) (end 0.0635 -1.8922)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (arc (start 1.7145 -0.0126) (mid 0.889 0.3293) (end 0.0635 -0.0126)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+    )
+  )
+)

hardware/common/unikbd.pretty/D_DO-35_SOD27_P7.62mm_Horizontal_bypassed.kicad_mod

@@ -1,44 +1,57 @@
-(module D_DO-35_SOD27_P7.62mm_Horizontal_bypassed (layer F.Cu) (tedit 5EBC782E)
+(footprint "D_DO-35_SOD27_P7.62mm_Horizontal_bypassed" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5EBC782E)
   (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
-  (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
-  (fp_text reference REF** (at 3.81 -2.12) (layer F.SilkS)
+  (tags "net tie diode jumper")
+  (attr through_hole)
+  (fp_text reference "REF**" (at 3.81 -2.12) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp d08ab517-137d-4194-9e87-91361ec16cb4)
   )
-  (fp_text value D_DO-35_SOD27_P7.62mm_Horizontal (at 3.81 2.12) (layer F.Fab)
+  (fp_text value "D_DO-35_SOD27_P7.62mm_Horizontal" (at 3.81 2.12) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 5e060016-e6c0-463b-ae22-ada48d81bc6b)
   )
-  (fp_text user K (at 0 -1.8) (layer F.SilkS)
+  (fp_text user "K" (at 0 -1.8) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 489fc5b8-041c-49c7-9533-fd894fba6a3d)
   )
-  (fp_text user K (at 0 -1.8) (layer F.Fab)
+  (fp_text user "K" (at 0 -1.8) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1da2d060-9d22-487a-9e55-a63ecab0db6a)
   )
-  (fp_text user %R (at 4.11 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 4.11 0) (layer "F.Fab")
     (effects (font (size 0.8 0.8) (thickness 0.12)))
+    (tstamp 728804c3-90a5-447d-9c05-619d3e81ff51)
   )
-  (fp_line (start 8.67 -1.25) (end -1.05 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 8.67 1.25) (end 8.67 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.05 1.25) (end 8.67 1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.05 -1.25) (end -1.05 1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
-  (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
-  (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
-  (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
-  (fp_poly (pts (xy 7.239 0.127) (xy 0.381 0.127) (xy 0.381 0) (xy 7.239 0)) (layer F.Cu) (width 0.0508))
-  (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (fp_poly (pts
+      (xy 7.112 0.127)
+      (xy 0.508 0.127)
+      (xy 0.508 0)
+      (xy 7.112 0)
+    ) (layer "F.Cu") (width 0.0508) (fill solid) (tstamp 80c61bb9-37b5-4c80-807f-0e1c3664ddb4))
+  (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer "F.SilkS") (width 0.12) (tstamp 009dd38e-cd0a-4e4b-8376-e17850b40394))
+  (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer "F.SilkS") (width 0.12) (tstamp 2a85165b-8689-4651-b5b6-6e1774db45ef))
+  (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer "F.SilkS") (width 0.12) (tstamp a5430a80-d784-41d8-83de-e2f7822875c0))
+  (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer "F.SilkS") (width 0.12) (tstamp b05645bc-98a8-4a66-a19b-cd3656d6b1b2))
+  (fp_line (start 6.58 0) (end 5.93 0) (layer "F.SilkS") (width 0.12) (tstamp b84bf7e1-4132-4add-8770-3bb3b007eecb))
+  (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer "F.SilkS") (width 0.12) (tstamp d2ec4eda-d1de-4e61-8f90-8e48e063480e))
+  (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer "F.SilkS") (width 0.12) (tstamp d550ca27-957a-4a94-b532-e8fad6d6c940))
+  (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer "F.SilkS") (width 0.12) (tstamp dabd3fc4-d062-4dac-8108-1c578c07b096))
+  (fp_line (start 1.04 0) (end 1.69 0) (layer "F.SilkS") (width 0.12) (tstamp e025baa7-b570-40a0-a637-3cf1ecd6e628))
+  (fp_line (start 8.67 -1.25) (end -1.05 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 1a458631-594f-425f-aa02-07aa67b58536))
+  (fp_line (start -1.05 -1.25) (end -1.05 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 661a58f1-0459-44ad-8bd7-8469570636df))
+  (fp_line (start -1.05 1.25) (end 8.67 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 8672d9d5-76f6-47e1-8f0c-601ab662de5f))
+  (fp_line (start 8.67 1.25) (end 8.67 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp d9535cea-fada-43d6-9b66-6654a06c1456))
+  (fp_line (start 2.41 -1) (end 2.41 1) (layer "F.Fab") (width 0.1) (tstamp 0f65d06a-076d-4874-9188-171988003480))
+  (fp_line (start 1.81 1) (end 5.81 1) (layer "F.Fab") (width 0.1) (tstamp 3ae64378-0d07-479c-89ae-33112f849b31))
+  (fp_line (start 2.31 -1) (end 2.31 1) (layer "F.Fab") (width 0.1) (tstamp 4b644ed8-033d-433e-8ae3-739a5a16af29))
+  (fp_line (start 0 0) (end 1.81 0) (layer "F.Fab") (width 0.1) (tstamp 5c56dd6f-2d56-46e6-b269-df74fb784508))
+  (fp_line (start 5.81 -1) (end 1.81 -1) (layer "F.Fab") (width 0.1) (tstamp 5d7ca193-a5ec-4bd0-99b7-4f5a36b38598))
+  (fp_line (start 2.51 -1) (end 2.51 1) (layer "F.Fab") (width 0.1) (tstamp 80596ef4-98bc-4b89-9bbd-de4481e05ff4))
+  (fp_line (start 5.81 1) (end 5.81 -1) (layer "F.Fab") (width 0.1) (tstamp 9106e56e-223e-4392-904e-7644cabb99ad))
+  (fp_line (start 7.62 0) (end 5.81 0) (layer "F.Fab") (width 0.1) (tstamp bb5ff6ec-07f4-4a70-a0b3-1bb277a055b1))
+  (fp_line (start 1.81 -1) (end 1.81 1) (layer "F.Fab") (width 0.1) (tstamp f4d157a0-bcca-4ea3-a672-640ab334f7dc))
+  (pad "1" thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (tstamp 4e2c38ea-6642-4bc0-8ae3-4561e1bd1734))
+  (pad "2" thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (tstamp 9594575e-2758-42b9-905a-924e1341e2bf))
 )

hardware/common/unikbd.pretty/Key_MX.kicad_mod

@@ -1,31 +1,40 @@
-(module Key_MX (layer F.Cu) (tedit 5FEE0FFF)
-  (fp_text reference SW_** (at -5.7912 -8.6106) (layer F.SilkS)
+(footprint "Key_MX" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5FEE0FFF)
+  (attr through_hole)
+  (fp_text reference "SW_**" (at -5.7912 -8.6106) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 4b917266-b616-4b34-b81a-54ed0ba2cc45)
   )
-  (fp_text value Key_MX (at -5.334 8.6614) (layer F.SilkS)
+  (fp_text value "Key_MX" (at -5.334 8.6614) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp fded6696-7d51-4dd5-8ea2-90f4b4eea8db)
   )
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (pad 4 thru_hole circle (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
+  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874) (layer "F.CrtYd") (width 0.12) (tstamp 2a6d0c3c-f5d2-49c8-a5d7-8e4c346deef1))
+  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874) (layer "F.CrtYd") (width 0.12) (tstamp 7787030c-1f3e-482b-94d0-35e959f33ad4))
+  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer "F.CrtYd") (width 0.12) (tstamp b5acfe42-7ec2-4b59-8af6-0a75a8353d47))
+  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874) (layer "F.CrtYd") (width 0.12) (tstamp ca918f73-1d40-4cc8-a02a-3cf113953dd5))
   (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
+    (solder_mask_margin 0.0762) (tstamp 7b85e4ed-78c5-4ee2-8bda-0e2cdc7d855b))
   (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
+    (solder_mask_margin 0.0762) (tstamp 994defad-7352-4f5b-adbb-4935eaff1c63))
   (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad 3 thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (model ${PROJECT_PATH}/cherry_mx.wrl
-    (at (xyz 0 0 0))
+    (solder_mask_margin 0.0762) (tstamp bf0770ca-f766-4af6-8464-833c391420fc))
+  (pad "1" thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask) (tstamp 1975c8c2-144e-448a-a812-9b2433471950))
+  (pad "1" thru_hole custom (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
+    ) (tstamp aeda8d04-e983-4be2-b06d-f5f00510885e))
+  (pad "2" thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask) (tstamp 6fe4676a-4801-4b83-afbe-c228f5746fad))
+  (pad "2" thru_hole custom (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
+      (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
+    ) (tstamp fe3bd807-98a2-44e9-9eb1-1ffca908639e))
+  (model "${PROJECT_PATH}/cherry_mx.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

hardware/common/unikbd.pretty/Key_MX_2u.kicad_mod

@@ -1,33 +1,49 @@
-(module Key_MX_2u (layer F.Cu) (tedit 60186230)
-  (fp_text reference REF** (at -5.969 -8.763) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+(footprint "Key_MX_2u" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (attr through_hole)
+  (fp_text reference "REF**" (at -5.969 -8.763) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp ef580378-1c67-483e-b6a4-196c840de987)
   )
-  (fp_text value Key_MX_2u (at 0 -0.5) (layer F.Fab) hide
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text value "Key_MX_2u" (at 0 -0.5) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 882d61db-a3a1-483d-8bae-6904ccf5577f)
   )
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
-  (pad "" np_thru_hole circle (at 11.938 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -11.938 -6.8834) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -11.938 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 11.938 -6.8834) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad 3 thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole oval (at -11.938 -0.1016) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at 11.938 -0.1016) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
+  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp a6b82f97-c99f-4d3e-a8db-5e9fabe9cb87))
+  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp c53f1097-47a2-4400-92f1-ba0dd0fd5dc7))
+  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 5ab15849-d45f-4603-bff9-be4c05db142c))
+  (fp_line (start 7.6962 7.874) (end -7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 510742c1-8093-4709-8b84-6f5331fc1e88))
+  (pad "" np_thru_hole circle (at -11.938 -6.8834) (size 3.048 3.048) (drill 3.048) (layers "*.Cu" "*.Mask") (tstamp b46c31b9-521a-4471-859e-19e3c06da819))
+  (pad "" np_thru_hole oval (at -11.938 -0.1016) (size 5 2) (drill oval 5 2) (layers "*.Cu" "*.Mask") (tstamp 788d6ce6-802b-4840-8439-f00251eab8c6))
+  (pad "" np_thru_hole circle (at -11.938 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask") (tstamp a4ea0922-9f63-44c9-a721-3ad2329bb434))
+  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp be0a5daf-f849-476c-a808-1428a796cb47))
+  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp fb3e655c-0cf0-4011-a61a-43c06a464bdf))
+  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp 17c722fe-9e72-4e46-875e-a940f31bc49d))
+  (pad "" np_thru_hole circle (at 11.938 -6.8834) (size 3.048 3.048) (drill 3.048) (layers "*.Cu" "*.Mask") (tstamp eba0dbcc-4657-4b6c-bbd1-4fa1b02dd1ec))
+  (pad "" np_thru_hole oval (at 11.938 -0.1016) (size 5 2) (drill oval 5 2) (layers "*.Cu" "*.Mask") (tstamp 0ec215f2-8b67-4fe6-9b62-c2ac7b895686))
+  (pad "" np_thru_hole circle (at 11.938 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask") (tstamp effe77f8-9977-4f9c-bd4a-c8efb40c32a6))
+  (pad "1" thru_hole custom (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 1.27 -0.9779) (end 0.7366 -0.5715) (width 0.3048))
+      (gr_line (start 1.651 -0.9779) (end 1.27 -0.9779) (width 0.3048))
+    ) (tstamp 7ff7993c-bbaa-46af-a8d5-d37727a21d34))
+  (pad "1" thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask") (tstamp 1d1fa26e-d11b-4aed-8dc5-740665250511))
+  (pad "2" thru_hole custom (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 -0.1016) (end 1.27 2.4384) (width 0.3048))
+      (gr_line (start 1.27 2.4384) (end 1.27 3.7084) (width 0.3048))
+      (gr_line (start 1.27 3.7084) (end 3.81 6.2484) (width 0.3048))
+    ) (tstamp aa78c580-43ee-4a9b-84d1-f225054b7891))
+  (pad "2" thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask") (tstamp 2908a3a4-df35-402c-ab9f-a269756efcb1))
 )

hardware/common/unikbd.pretty/Key_MX_DIY.kicad_mod

@@ -0,0 +1,74 @@
+(footprint "Key_MX_DIY" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 60186279)
+  (attr through_hole)
+  (fp_text reference "SW_**" (at -5.7912 -8.6106) (layer "F.SilkS") hide
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 635addc9-1212-4dd8-9025-d46a1478049c)
+  )
+  (fp_text value "Key_MX" (at -5.334 8.6614) (layer "F.SilkS") hide
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 62fcada6-d502-422d-ace5-51c40c4111e6)
+  )
+  (fp_line (start -0.889 7.239) (end 0.635 7.239) (layer "F.SilkS") (width 0.1016) (tstamp 27d3534d-16f5-4ccf-9b16-2c5732c06b4d))
+  (fp_line (start 0.127 6.858) (end 0.127 7.62) (layer "F.SilkS") (width 0.12) (tstamp a988bd6f-305a-49e4-a300-383210fe668e))
+  (fp_poly (pts
+      (xy 0.127 7.239)
+      (xy -0.381 7.493)
+      (xy -0.381 6.985)
+    ) (layer "F.SilkS") (width 0.1) (fill solid) (tstamp 8d7c4863-decc-41fb-bc0f-c15564084732))
+  (fp_line (start -7.6962 7.874) (end -7.6962 -9.652) (layer "F.CrtYd") (width 0.12) (tstamp 1fe7f185-5c1e-4d8f-8a18-abb08d1a1e13))
+  (fp_line (start -7.6962 -9.652) (end 7.6962 -9.652) (layer "F.CrtYd") (width 0.12) (tstamp 6a78f426-b0f1-4a10-8b9d-203792afdc98))
+  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer "F.CrtYd") (width 0.12) (tstamp ad0afc42-584d-444a-a5d4-943137df2635))
+  (fp_line (start 7.6962 -9.652) (end 7.6962 7.874) (layer "F.CrtYd") (width 0.12) (tstamp cb063ba2-ba75-4d81-b6d1-01cb2c49d8e0))
+  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762) (tstamp 880b494c-ee53-4f2b-8304-722863728cc3))
+  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762) (tstamp acbb9c7e-a35c-43a0-a03c-5ae34b790b3c))
+  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762) (tstamp e2074221-7a62-47e7-bcd1-2b33b1dec304))
+  (pad "1" thru_hole custom (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0.1016 -0.0381) (end 1.3716 -0.0381) (width 0.2))
+      (gr_line (start 1.3716 -0.0381) (end 2.54 -0.8763) (width 0.2))
+      (gr_line (start 0 -2.8321) (end 0 0) (width 0.2))
+      (gr_line (start -1.397 -4.6355) (end 0 -2.8321) (width 0.2))
+      (gr_line (start 1.1684 -4.6355) (end -1.397 -4.6355) (width 0.2))
+    ) (tstamp 0b082f28-afa4-4577-beca-640eeac5c49e))
+  (pad "1" thru_hole circle (at -1.3716 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp 99708be6-f333-4f21-8be5-7127f6ccd79c))
+  (pad "1" thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask) (tstamp d3fbc779-09ec-46c9-8185-2a56ff83e138))
+  (pad "1" thru_hole circle (at 1.1684 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp f86c79bf-77ad-4f8c-a9b7-8ca94bfc8f71))
+  (pad "2" thru_hole circle (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers *.Cu *.Mask) (tstamp 3624f8ff-2425-4b82-a6fc-b0ddd7bfdf00))
+  (pad "2" thru_hole custom (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end -0.0254 -6.3246) (width 0.2))
+      (gr_line (start -0.0254 -6.3246) (end -2.6416 -6.2992) (width 0.2))
+      (gr_line (start 1.143 1.2192) (end 0 0) (width 0.2))
+      (gr_line (start 1.1176 3.6322) (end 1.143 1.2192) (width 0.2))
+      (gr_line (start 3.8354 6.4008) (end 1.1176 3.6322) (width 0.2))
+    ) (tstamp 43d16884-4b85-467f-a465-e8dd4ccd8dea))
+  (pad "2" thru_hole circle (at -6.4516 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp 8214e30f-4d6f-43d5-9e73-8e0c97659ab7))
+  (pad "2" thru_hole circle (at -3.9116 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp ee26d9ba-1842-4ede-9654-ad445edfaba0))
+  (pad "3" thru_hole custom (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end 1.4224 -1.2446) (width 0.2))
+      (gr_line (start 1.4224 -1.2446) (end 1.4224 -8.1534) (width 0.2))
+      (gr_line (start 1.4224 -8.1534) (end 3.048 -8.1534) (width 0.2))
+      (gr_line (start 3.048 -8.1534) (end 3.048 -12.7) (width 0.2))
+      (gr_line (start 3.048 -12.7) (end 2.4384 -13.9192) (width 0.2))
+    ) (tstamp 5d7bfcfa-2c97-4dd7-ae44-67b45a5f8d95))
+  (pad "3" thru_hole circle (at 3.7084 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp 6094d3d6-f35d-4866-9236-9f3101638c33))
+  (pad "4" thru_hole custom (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end 0 0.9652) (width 0.2))
+      (gr_line (start 0 0.9652) (end 4.6736 0.9652) (width 0.2))
+      (gr_line (start 4.6736 0.9652) (end 4.6228 -7.6454) (width 0.2))
+      (gr_line (start 4.6228 -7.6454) (end 7.5184 -7.6454) (width 0.2))
+      (gr_line (start 7.5184 -7.6454) (end 7.5184 -13.9192) (width 0.2))
+    ) (tstamp 4950c0a2-1f71-4d4a-ba69-985f703a991e))
+  (pad "4" thru_hole circle (at 6.2484 -8.7376 180) (size 1.74 1.74) (drill 1.19) (layers *.Cu *.Mask) (tstamp 9ae9aa26-ec22-48ae-b5f6-3ff2d7c07b90))
+)

hardware/common/unikbd.pretty/Key_MX_LED.kicad_mod

@@ -1,32 +1,55 @@
-(module Key_MX_LED (layer F.Cu) (tedit 60186279)
-  (fp_text reference SW_** (at -5.7912 -8.6106) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+(footprint "Key_MX_LED" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (attr through_hole)
+  (fp_text reference "SW_**" (at -5.7912 -8.6106) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 635addc9-1212-4dd8-9025-d46a1478049c)
   )
-  (fp_text value Key_MX (at -5.334 8.6614) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text value "Key_MX" (at -5.334 8.6614) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 62fcada6-d502-422d-ace5-51c40c4111e6)
   )
-  (fp_line (start 0.127 6.858) (end 0.127 7.62) (layer F.SilkS) (width 0.12))
-  (fp_poly (pts (xy 0.127 7.239) (xy -0.381 7.493) (xy -0.381 6.985)) (layer F.SilkS) (width 0.1))
-  (fp_line (start -0.889 7.239) (end 0.635 7.239) (layer F.SilkS) (width 0.1016))
-  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (pad 3 thru_hole circle (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 6 thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad 5 thru_hole circle (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
+  (fp_line (start -0.889 7.239) (end 0.635 7.239)
+    (stroke (width 0.1016) (type solid)) (layer "F.SilkS") (tstamp 27d3534d-16f5-4ccf-9b16-2c5732c06b4d))
+  (fp_line (start 0.127 6.858) (end 0.127 7.62)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a988bd6f-305a-49e4-a300-383210fe668e))
+  (fp_poly
+    (pts
+      (xy 0.127 7.239)
+      (xy -0.381 7.493)
+      (xy -0.381 6.985)
+    )
+
+    (stroke (width 0.1) (type solid)) (fill solid) (layer "F.SilkS") (tstamp 8d7c4863-decc-41fb-bc0f-c15564084732))
+  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 6a78f426-b0f1-4a10-8b9d-203792afdc98))
+  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 1fe7f185-5c1e-4d8f-8a18-abb08d1a1e13))
+  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp cb063ba2-ba75-4d81-b6d1-01cb2c49d8e0))
+  (fp_line (start 7.6962 7.874) (end -7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp ad0afc42-584d-444a-a5d4-943137df2635))
+  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp e2074221-7a62-47e7-bcd1-2b33b1dec304))
+  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp 880b494c-ee53-4f2b-8304-722863728cc3))
+  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp acbb9c7e-a35c-43a0-a03c-5ae34b790b3c))
+  (pad "1" thru_hole custom (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
+    ) (tstamp 0b082f28-afa4-4577-beca-640eeac5c49e))
+  (pad "1" thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask") (tstamp d3fbc779-09ec-46c9-8185-2a56ff83e138))
+  (pad "2" thru_hole custom (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 1.1176) (end 1.016 4.8768) (width 0.2))
+      (gr_line (start 1.016 4.8768) (end 3.81 6.3373) (width 0.2))
+    ) (tstamp 43d16884-4b85-467f-a465-e8dd4ccd8dea))
+  (pad "2" thru_hole circle (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers "*.Cu" "*.Mask") (tstamp 3624f8ff-2425-4b82-a6fc-b0ddd7bfdf00))
+  (pad "3" thru_hole circle (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask") (tstamp 4950c0a2-1f71-4d4a-ba69-985f703a991e))
+  (pad "4" thru_hole circle (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask") (tstamp 5d7bfcfa-2c97-4dd7-ae44-67b45a5f8d95))
 )

hardware/common/unikbd.pretty/Key_MX_Spacebar_5.25.kicad_mod

@@ -1,37 +1,51 @@
-(module Key_MX_Spacebar_5.25 (layer F.Cu) (tedit 601862DF)
-  (fp_text reference SW_** (at -5.7912 -8.5852) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+(footprint "Key_MX_Spacebar_5.25" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (attr through_hole)
+  (fp_text reference "SW_**" (at -5.7912 -8.5852) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3a4b3c9f-5a78-470d-8c5d-b5f4aa152a6d)
   )
-  (fp_text value Key_MX (at -5.334 8.6868) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text value "Key_MX" (at -5.334 8.6868) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c0abd6cb-d499-4a23-8a26-7e833b7aa18f)
   )
-  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 7.874) (end -7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -3.81 -2.5146) (end -2.54 0.0254) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0.0254) (end -2.54 1.2954) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.2954) (end 0 3.8354) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.0546) (end 1.27 -5.0546) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.27 -5.0546) (end 0.7366 -4.6482) (layer F.Cu) (width 0.3048))
-  (pad 4 thru_hole circle (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.0762))
-  (pad 3 thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -66.675 -6.8834) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 66.675 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 66.675 -6.8834) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -66.675 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at -66.675 -0.1016) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at 66.675 -0.1016) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
-  (model ${PROJECT_PATH}/cherry_mx.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -7.6962 -7.874) (end 7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 9edc424b-8ac8-4542-9d30-21889df7e278))
+  (fp_line (start -7.6962 7.874) (end -7.6962 -7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp a034633c-6fdb-4372-9631-e68dfb5fe4f1))
+  (fp_line (start 7.6962 -7.874) (end 7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 4f4e4819-a0de-4e7f-b014-428b73df796f))
+  (fp_line (start 7.6962 7.874) (end -7.6962 7.874)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 06dda447-7a5e-4c5a-88c9-3c9bb09d6e14))
+  (pad "" np_thru_hole circle (at -66.675 -6.8834) (size 3.048 3.048) (drill 3.048) (layers "*.Cu" "*.Mask") (tstamp d9d9da93-63be-4c28-8943-5f7bb4b31b89))
+  (pad "" np_thru_hole oval (at -66.675 -0.1016) (size 5 2) (drill oval 5 2) (layers "*.Cu" "*.Mask") (tstamp 4144a7bb-554b-49fa-b00f-adfc56c5d0f6))
+  (pad "" np_thru_hole circle (at -66.675 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask") (tstamp 3044c4fa-3589-48a0-a921-7945035047cb))
+  (pad "" np_thru_hole circle (at -5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp d8278fee-7397-4054-875a-6bbcc89a9eb4))
+  (pad "" np_thru_hole circle (at 0 0.1016) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp 06d817f3-2973-4ab5-9b4b-16299101116f))
+  (pad "" np_thru_hole circle (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
+    (solder_mask_margin 0.0762) (tstamp d7115bbe-51ca-4b7d-ba87-004da4841551))
+  (pad "" np_thru_hole circle (at 66.675 -6.8834) (size 3.048 3.048) (drill 3.048) (layers "*.Cu" "*.Mask") (tstamp abba95bf-bbd5-4fa8-9287-1625ee918451))
+  (pad "" np_thru_hole oval (at 66.675 -0.1016) (size 5 2) (drill oval 5 2) (layers "*.Cu" "*.Mask") (tstamp fe0a93c6-4511-4863-b3c0-0da3d1f25efb))
+  (pad "" np_thru_hole circle (at 66.675 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask") (tstamp 1f64c2fa-89ce-4835-bfa2-b9790d679f3f))
+  (pad "1" thru_hole custom (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
+    ) (tstamp ddbd1858-51f8-422b-8170-2a124a0465c5))
+  (pad "1" thru_hole circle (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask") (tstamp ef9e95f6-dc87-4c29-b66f-23ffb6cdd527))
+  (pad "2" thru_hole custom (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor circle))
+    (primitives
+      (gr_line (start 0 0) (end 1.27 4.9784) (width 0.2))
+      (gr_line (start 1.27 4.9784) (end 3.81 6.3373) (width 0.2))
+    ) (tstamp 3956ad20-646c-4f1c-8364-b46ce6e8171a))
+  (pad "2" thru_hole circle (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask") (tstamp 7882c9ea-c66b-4e82-b1f7-7d2c71b447ea))
+  (model "${PROJECT_PATH}/cherry_mx.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

hardware/common/unikbd.pretty/OSI mounting holes.kicad_mod

@@ -1,65 +1,111 @@
-(module "OSI mounting holes" (layer F.Cu) (tedit 5EF10B49)
-  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+(footprint "OSI mounting holes" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 0.5) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 9b3b86b5-9225-4dec-9179-82a1196a3238)
   )
-  (fp_text value "OSI mounting holes" (at 0 -0.5) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text value "OSI mounting holes" (at 0 -0.5) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 5433f4ab-233b-418b-a1b9-475411197a1a)
   )
-  (fp_circle (center 109.22 -97.9424) (end 112.72 -97.9424) (layer Cmts.User) (width 0.15))
-  (fp_circle (center -109.22 -97.9424) (end -105.72 -97.9424) (layer Cmts.User) (width 0.15))
-  (fp_circle (center 0 -97.9424) (end 3.5 -97.9424) (layer Cmts.User) (width 0.15))
-  (fp_circle (center -85.725 0.635) (end -81.975 0.635) (layer F.CrtYd) (width 0.05))
-  (fp_circle (center -85.725 0.635) (end -82.225 0.635) (layer Cmts.User) (width 0.15))
-  (fp_circle (center 85.725 0.635) (end 89.475 0.635) (layer F.CrtYd) (width 0.05))
-  (fp_circle (center 85.725 0.635) (end 89.225 0.635) (layer Cmts.User) (width 0.15))
-  (fp_circle (center 0 -92.8624) (end 3.5 -92.8624) (layer Cmts.User) (width 0.15))
-  (fp_circle (center -109.22 -92.8624) (end -105.72 -92.8624) (layer Cmts.User) (width 0.15))
-  (fp_circle (center 109.22 -92.8624) (end 112.72 -92.8624) (layer Cmts.User) (width 0.15))
-  (fp_text user %R (at -85.66658 5.27304) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "OSI" (at -85.92058 -4.32816) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 27c7889f-e62f-46c2-93f0-3c54721d011a)
   )
-  (fp_text user OSI (at -85.92058 -4.32816) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "OSI" (at 85.5726 -4.191) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2dc9c352-cdc9-4238-a8df-5b3c886cff40)
   )
-  (fp_text user %R (at 86.57082 5.65404) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "OSI" (at -104.7496 -95.3516) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 548d8c15-2483-464f-8ebd-dde37f374e29)
   )
-  (fp_text user OSI (at 85.5726 -4.191) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "OSI" (at 113.792 -95.2754) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 93f093e3-0eef-4ada-a707-8397cefb12c2)
   )
-  (fp_text user OSI (at 4.572 -95.3516) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "OSI" (at 4.572 -95.3516) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp bc8758b6-19a6-4c1e-9aa6-92ae5986edd7)
   )
-  (fp_text user %R (at 0.84582 -87.86876) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "${REFERENCE}" (at 110.75162 -87.97036) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 01ab8ce6-36bc-465a-a40f-ab8a610387f7)
   )
-  (fp_text user OSI (at -104.7496 -95.3516) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "${REFERENCE}" (at -109.31398 -87.86876) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 56570b12-1e7e-4fd3-a4c2-f8df493ac0a3)
   )
-  (fp_text user %R (at -109.31398 -87.86876) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "${REFERENCE}" (at 86.57082 5.65404) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 84b2f115-bb58-4c83-b56b-57f0ecf7c9a1)
   )
-  (fp_text user OSI (at 113.792 -95.2754) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "${REFERENCE}" (at 0.84582 -87.86876) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c16897fc-9ac2-4fab-ae3b-abcbd3e06f28)
   )
-  (fp_text user %R (at 110.75162 -87.97036) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text user "${REFERENCE}" (at -85.66658 5.27304) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp d4ef1667-3ff3-436d-b266-7faf109788fd)
   )
-  (fp_line (start -3.175 -101.6) (end -3.175 -88.9) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -3.175 -88.9) (end 3.175 -88.9) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 3.175 -88.9) (end 3.175 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 3.175 -101.6) (end -3.175 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -106.045 -88.9) (end -106.045 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -112.395 -88.9) (end -106.045 -88.9) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -106.045 -101.6) (end -112.395 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -112.395 -101.6) (end -112.395 -88.9) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 112.395 -88.9) (end 112.395 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 106.045 -88.9) (end 112.395 -88.9) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 112.395 -101.6) (end 106.045 -101.6) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 106.045 -101.6) (end 106.045 -88.9) (layer F.CrtYd) (width 0.12))
-  (pad "" np_thru_hole circle (at -85.725 0.635) (size 3.500001 3.500001) (drill 3.500001) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 85.725 0.635) (size 3.500001 3.500001) (drill 3.500001) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at 0 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at -109.22 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole oval (at 109.22 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers *.Cu *.Mask))
+  (fp_circle (center -109.22 -97.9424) (end -107.46994 -97.9424)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 01025a9a-0ad6-41c4-9e1a-ed6c3aa1b1de))
+  (fp_circle (center -109.22 -92.8624) (end -107.46994 -92.8624)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 85a60eb7-74ef-487d-b8df-eb1018fbb1b2))
+  (fp_circle (center -85.725 0.635) (end -83.97494 0.635)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 83a0bc2a-7306-41a8-a70f-85c7ca554680))
+  (fp_circle (center 0 -97.9424) (end 1.75006 -97.9424)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 12277598-7f04-4d26-9aeb-79ca8cdbe798))
+  (fp_circle (center 0 -92.8624) (end 1.75006 -92.8624)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp d52a917b-51b4-44b0-8914-2eaa76ec025d))
+  (fp_circle (center 85.725 0.635) (end 87.47506 0.635)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp bf62e63f-7499-45e8-87b3-0dfa7a0bf6da))
+  (fp_circle (center 109.22 -97.9424) (end 110.97006 -97.9424)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 2a22db23-c241-4cb7-8ef7-60a626886fb8))
+  (fp_circle (center 109.22 -92.8624) (end 110.97006 -92.8624)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp d653e6c4-5e16-4519-adbc-b961dcc328f2))
+  (fp_circle (center -109.22 -95.4024) (end -107.46994 -95.4024)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Eco2.User") (tstamp 36a746d3-6213-45ab-8211-d297e480094b))
+  (fp_circle (center -85.725 0.635) (end -83.97494 0.635)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Eco2.User") (tstamp e601c69c-696b-47b5-b5b4-f98b13cc52e6))
+  (fp_circle (center 0 -95.4024) (end 1.75006 -95.4024)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Eco2.User") (tstamp 806690bd-c645-4a45-9639-ce3c5aa7400c))
+  (fp_circle (center 85.725 0.635) (end 87.47506 0.635)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Eco2.User") (tstamp 9f8ee5e3-b2fd-452d-89e5-f83963d3742f))
+  (fp_circle (center 109.22 -95.4024) (end 110.97006 -95.4024)
+    (stroke (width 0.15) (type solid)) (fill none) (layer "Eco2.User") (tstamp 240306cf-7921-4a92-b6e8-a028102ea398))
+  (fp_line (start -112.395 -101.6) (end -112.395 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 1dba16be-dd36-4af3-99e9-3bcbda2931a5))
+  (fp_line (start -112.395 -88.9) (end -106.045 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 77045cd6-f8cd-47bc-94fb-13e8085fca7a))
+  (fp_line (start -106.045 -101.6) (end -112.395 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 50daee6d-66f5-4447-a568-a7d5202a98f4))
+  (fp_line (start -106.045 -88.9) (end -106.045 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp c511bf0f-45d0-4a9e-b11e-d3bc054bedb2))
+  (fp_line (start -3.175 -101.6) (end -3.175 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 4d3f73b6-eaab-42ad-bdb2-4b4ca09255ee))
+  (fp_line (start -3.175 -88.9) (end 3.175 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp c2c48a55-bc5f-4f97-a612-07a7bed5b142))
+  (fp_line (start 3.175 -101.6) (end -3.175 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 0f806816-bcb0-4c89-8d73-dabdd8b24da6))
+  (fp_line (start 3.175 -88.9) (end 3.175 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp a9df06a1-e144-4984-a03f-871b422a8183))
+  (fp_line (start 106.045 -101.6) (end 106.045 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp 8e00f6cb-8bd9-499e-81f5-8f26c4d40bd9))
+  (fp_line (start 106.045 -88.9) (end 112.395 -88.9)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp f9ec91da-fc55-434b-be7a-19f94dc471e3))
+  (fp_line (start 112.395 -101.6) (end 106.045 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp fceae6b7-5dab-46ec-b4a2-7153a6beddce))
+  (fp_line (start 112.395 -88.9) (end 112.395 -101.6)
+    (stroke (width 0.12) (type solid)) (layer "F.CrtYd") (tstamp a842ec8e-31dd-4466-8a6a-5db692ab613b))
+  (fp_circle (center -85.725 0.635) (end -81.975 0.635)
+    (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 0de3327e-b5c7-4d1a-8eaf-79b9a023cedc))
+  (fp_circle (center 85.725 0.635) (end 89.475 0.635)
+    (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 2639d849-c4cb-4777-84f0-6626895651a1))
+  (pad "" np_thru_hole oval (at -109.22 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers "*.Cu" "*.Mask") (tstamp 3ad54bfc-11e1-4e2c-bcea-d0e8340d063f))
+  (pad "" np_thru_hole circle (at -85.725 0.635) (size 3.500001 3.500001) (drill 3.500001) (layers "*.Cu" "*.Mask") (tstamp ebdbc4a6-54c4-4034-8831-21fb7089a0c9))
+  (pad "" np_thru_hole oval (at 0 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers "*.Cu" "*.Mask") (tstamp 94688157-bfde-4214-be32-76b106668b97))
+  (pad "" np_thru_hole circle (at 85.725 0.635) (size 3.500001 3.500001) (drill 3.500001) (layers "*.Cu" "*.Mask") (tstamp 5f64083b-e896-4b3b-a24c-2cdc7fd981fe))
+  (pad "" np_thru_hole oval (at 109.22 -95.25) (size 3.5052 8.5852) (drill oval 3.5052 8.5852) (layers "*.Cu" "*.Mask") (tstamp d4d48680-de4c-4e0d-9236-bf16bb96855f))
 )

hardware/common/unikbd.pretty/TIL311.kicad_mod

@@ -0,0 +1,29 @@
+(module TIL311 (layer F.Cu) (tedit 587952A2)
+  (fp_text reference REF** (at -9.92 0 90) (layer F.SilkS)
+    (effects (font (size 1.2 1.2) (thickness 0.15)))
+  )
+  (fp_text value TIL311 (at 0 0) (layer F.Fab)
+    (effects (font (size 1.2 1.2) (thickness 0.15)))
+  )
+  (fp_line (start 8.763 -5.334) (end 8.763 -0.762) (layer F.SilkS) (width 0.15))
+  (fp_line (start 8.763 0.762) (end 8.763 5.334) (layer F.SilkS) (width 0.15))
+  (fp_arc (start 9.525 0) (end 8.763 0.762) (angle 90) (layer F.SilkS) (width 0.15))
+  (fp_line (start -8.763 3.175) (end -8.763 5.334) (layer F.SilkS) (width 0.15))
+  (fp_line (start -8.763 -1.905) (end -8.763 1.905) (layer F.SilkS) (width 0.15))
+  (fp_line (start -8.763 -5.334) (end -8.763 -3.175) (layer F.SilkS) (width 0.15))
+  (fp_arc (start -9.398 2.54) (end -8.763 1.905) (angle 90) (layer F.SilkS) (width 0.15))
+  (fp_arc (start -9.398 -2.54) (end -8.763 -3.175) (angle 90) (layer F.SilkS) (width 0.15))
+  (fp_line (start -8.72 5.309999) (end 8.72 5.31) (layer F.SilkS) (width 0.15))
+  (fp_line (start 8.72 -5.309999) (end -8.72 -5.31) (layer F.SilkS) (width 0.15))
+  (pad 14 thru_hole oval (at -7.62 -3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at -7.62 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at -5.08 -3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at -5.08 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at -2.54 -3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at -2.54 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 2.54 -3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 2.54 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 7.62 -3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 7.62 3.81) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+)

hardware/common/unikbd.pretty/diode-combined-DIY.kicad_mod

@@ -0,0 +1,82 @@
+(footprint "diode-combined-DIY" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5F23BF4D)
+  (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+  (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+  (attr smd)
+  (fp_text reference "REF**" (at 1.3462 3.9742) (layer "B.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    (tstamp 9a5031ed-ec12-4b1a-ae77-88564238f6fa)
+  )
+  (fp_text value "D_DO-35_SOD27_P7.62mm_Horizontal" (at -2.921 -16.4474) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a3d628b6-e450-4e14-a382-ea42b01e5e46)
+  )
+  (fp_text user "${REFERENCE}" (at -1.8288 3.8862) (layer "F.SilkS")
+    (effects (font (size 0.8 0.8) (thickness 0.12)))
+    (tstamp 91433c11-a5d3-4c05-b727-fdf95e7fa55a)
+  )
+  (fp_line (start 3.4544 0.889) (end 4.064 0) (layer "F.Cu") (width 0.2) (tstamp 02b92bb8-7e53-41a2-b05f-a65905b81c9b))
+  (fp_line (start 1 0.95) (end 3.4544 0.889) (layer "F.Cu") (width 0.2) (tstamp 5bc5c3fb-5dbf-4870-88b0-362cabea70c3))
+  (fp_line (start -2.516 0) (end -1.866 0) (layer "B.SilkS") (width 0.12) (tstamp 2ebfa4c0-52f6-477d-84ae-fde44362e12d))
+  (fp_line (start 3.024 0) (end 2.374 0) (layer "B.SilkS") (width 0.12) (tstamp 319a4a95-c418-4326-a8b7-8a6c7430ffaf))
+  (fp_line (start 2.374 -1.12) (end 2.374 1.12) (layer "B.SilkS") (width 0.12) (tstamp 57f9526e-4c99-4072-97b8-066d0a57bbfa))
+  (fp_line (start -1.146 1.12) (end -1.146 -1.12) (layer "B.SilkS") (width 0.12) (tstamp 65d199a4-3f39-4027-92d8-8b96a11565c3))
+  (fp_line (start -1.266 1.12) (end -1.266 -1.12) (layer "B.SilkS") (width 0.12) (tstamp 9cfee364-0a36-4168-9a03-9e2b8aa1532c))
+  (fp_line (start -1.866 -1.12) (end 2.374 -1.12) (layer "B.SilkS") (width 0.12) (tstamp acd118ef-5003-4a76-b509-9118820b4c3a))
+  (fp_line (start -1.866 1.12) (end -1.866 -1.12) (layer "B.SilkS") (width 0.12) (tstamp b46bc59c-2358-4b59-a25d-fbb3cb16df2e))
+  (fp_line (start 2.374 1.12) (end -1.866 1.12) (layer "B.SilkS") (width 0.12) (tstamp f31b7a91-9d17-405c-9333-5c2c7b64a125))
+  (fp_line (start -1.026 1.12) (end -1.026 -1.12) (layer "B.SilkS") (width 0.12) (tstamp ffc7539d-4080-44cf-b011-f3b2023c7bdd))
+  (fp_line (start -0.76 -1.58) (end -0.76 -0.65) (layer "F.SilkS") (width 0.12) (tstamp 400aa8b9-525e-4b74-8431-08f160c18c9a))
+  (fp_line (start -0.76 1.58) (end 1.4 1.58) (layer "F.SilkS") (width 0.12) (tstamp 7dc4b7e6-40cd-4d0c-af62-f4afd387d198))
+  (fp_line (start -0.76 1.58) (end -0.76 0.65) (layer "F.SilkS") (width 0.12) (tstamp 82c6902a-689e-4107-a05f-01e99ead1a0a))
+  (fp_line (start -0.76 -1.58) (end 0.7 -1.58) (layer "F.SilkS") (width 0.12) (tstamp d79dc885-3d55-4139-9cfe-95a99b1b887f))
+  (fp_line (start -4.606 1.25) (end -4.606 -1.25) (layer "B.CrtYd") (width 0.05) (tstamp 4cbd7873-db33-4daf-831f-89f5cb785cd7))
+  (fp_line (start -4.606 -1.25) (end 5.114 -1.25) (layer "B.CrtYd") (width 0.05) (tstamp 6bacd9ba-ac8c-4654-85ad-a3b2e6b1883b))
+  (fp_line (start 5.114 1.25) (end -4.606 1.25) (layer "B.CrtYd") (width 0.05) (tstamp 8a2ceddd-9c30-4506-a364-2858aefa41cd))
+  (fp_line (start 5.114 -1.25) (end 5.114 1.25) (layer "B.CrtYd") (width 0.05) (tstamp fbd02659-b43a-4653-ac5b-34a3e6ec113e))
+  (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer "F.CrtYd") (width 0.05) (tstamp 5b422957-e485-42a4-b147-9fbfb29d049b))
+  (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer "F.CrtYd") (width 0.05) (tstamp 854b32ac-58cf-4638-9cec-37e2c2e892fb))
+  (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer "F.CrtYd") (width 0.05) (tstamp a4a5cb02-dc58-40a9-82b8-82ddeefd8d40))
+  (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer "F.CrtYd") (width 0.05) (tstamp b649cec8-89c4-4cab-b1cc-6d9e01037f63))
+  (fp_line (start 2.254 -1) (end 2.254 1) (layer "B.Fab") (width 0.1) (tstamp 0146e898-aeba-4624-b172-4002d1b7e289))
+  (fp_line (start -1.146 1) (end -1.146 -1) (layer "B.Fab") (width 0.1) (tstamp 4be72ddf-e3fd-435f-9c6b-1ab5d5e469a6))
+  (fp_line (start -1.246 1) (end -1.246 -1) (layer "B.Fab") (width 0.1) (tstamp 50603d47-6d27-4c8b-9d77-0efd2aebd9ac))
+  (fp_line (start -3.556 0) (end -1.746 0) (layer "B.Fab") (width 0.1) (tstamp 6e580d05-e9c9-4854-8b1a-75c75f6abc9e))
+  (fp_line (start -1.746 -1) (end 2.254 -1) (layer "B.Fab") (width 0.1) (tstamp a6cf9898-6005-45e9-96bb-3732f4d4f5bf))
+  (fp_line (start -1.046 1) (end -1.046 -1) (layer "B.Fab") (width 0.1) (tstamp b327189d-ef01-441d-9738-e90f2400c9ef))
+  (fp_line (start 4.064 0) (end 2.254 0) (layer "B.Fab") (width 0.1) (tstamp e105655b-06c9-4456-981a-9fb7f072f2f6))
+  (fp_line (start -1.746 1) (end -1.746 -1) (layer "B.Fab") (width 0.1) (tstamp ea82f956-26e9-49c2-b514-26649aff04be))
+  (fp_line (start 2.254 1) (end -1.746 1) (layer "B.Fab") (width 0.1) (tstamp f776b4a5-601c-4dd0-a822-65b1a7ca85ea))
+  (fp_line (start 0.7 1.52) (end 0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp 0538aa2a-99c5-43eb-83e9-ea71514cd641))
+  (fp_line (start 0.15 0.65) (end 0.15 0.25) (layer "F.Fab") (width 0.1) (tstamp 100d5a18-682a-4558-93e2-5a8dd299ab9d))
+  (fp_line (start 0.15 0.25) (end -0.15 0.45) (layer "F.Fab") (width 0.1) (tstamp 110b6b8b-3d9a-49d9-a651-062dc12fd279))
+  (fp_line (start -0.15 0.65) (end -0.15 0.25) (layer "F.Fab") (width 0.1) (tstamp 261fd709-b119-45e9-aff5-04154ebd9314))
+  (fp_line (start 0.15 0.45) (end 0.4 0.45) (layer "F.Fab") (width 0.1) (tstamp 389cedd3-c41f-4b55-b21a-f799d09847f4))
+  (fp_line (start 0.7 1.52) (end -0.7 1.52) (layer "F.Fab") (width 0.1) (tstamp 3b026976-d908-4912-bba2-893c5a17c51c))
+  (fp_line (start -0.15 0.45) (end 0.15 0.65) (layer "F.Fab") (width 0.1) (tstamp 43d7e843-b9cb-4123-8cac-3b3a3f192e82))
+  (fp_line (start -0.15 0.45) (end -0.4 0.45) (layer "F.Fab") (width 0.1) (tstamp 85ec75d8-d66b-4275-b3ab-be08ddca07df))
+  (fp_line (start -0.7 1.52) (end -0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp b88b8d93-4be3-48cb-af37-0763f35118ac))
+  (fp_line (start 0.7 -1.52) (end -0.7 -1.52) (layer "F.Fab") (width 0.1) (tstamp f13bbe1d-3f04-49c6-8270-639b62b4252f))
+  (pad "1" thru_hole custom (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (options (clearance outline) (anchor rect))
+    (primitives
+      (gr_line (start 2.556 0) (end -5.08 0) (width 0.2))
+    ) (tstamp 025dd152-58ec-477d-aeeb-143880b94e0e))
+  (pad "1" thru_hole circle (at -6.096 0) (size 1.7272 1.7272) (drill 1.1684) (layers *.Cu *.Mask) (tstamp 88896acf-590d-49f0-9331-286027ca28f9))
+  (pad "1" smd rect (at -1 0) (size 0.89916 0.8001) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c37308cf-ac2d-4fd1-9cee-f82f99ba8b51))
+  (pad "1" thru_hole circle (at -8.636 0) (size 1.7272 1.7272) (drill 1.1684) (layers *.Cu *.Mask) (tstamp c79a5ae3-bc28-4583-949d-37757a447707))
+  (pad "2" thru_hole circle (at 4.064 0) (size 1.6002 1.6002) (drill 0.8128) (layers *.Cu *.Mask) (tstamp ffd110d8-3669-49c3-9fc9-32a7868c2705))
+  (pad "NC" smd rect (at 1 0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 186d1410-c595-46e9-8d97-a7f39beed9db))
+  (pad "NC" smd rect (at 1 -0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ba3a84a4-76f0-4b7f-a7e3-771a7ac6e6a5))
+  (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
+    (offset (xyz -3.556 0 -1.4986))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 180 0 0))
+  )
+  (model "${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOT-23.wrl"
+    (offset (xyz 0 0.0762 0.0508))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 180))
+  )
+)

hardware/common/unikbd.pretty/diode-combined.kicad_mod

@@ -1,70 +1,137 @@
-(module diode-combined (layer F.Cu) (tedit 5F23BF4D)
+(footprint "diode-combined" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
   (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
   (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
   (attr smd)
-  (fp_text reference REF** (at 1.3462 3.9742) (layer B.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+  (fp_text reference "REF**" (at 7.4168 0.381) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    (tstamp 9a5031ed-ec12-4b1a-ae77-88564238f6fa)
   )
-  (fp_text value D_DO-35_SOD27_P7.62mm_Horizontal (at -2.921 -16.4474) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
+  (fp_text value "D_DO-35_SOD27_P7.62mm_Horizontal" (at -2.921 -16.4474) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a3d628b6-e450-4e14-a382-ea42b01e5e46)
   )
-  (fp_line (start -0.76 -1.58) (end 0.7 -1.58) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.7 1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.7 1.52) (end -0.7 1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.76 1.58) (end 1.4 1.58) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.7 -1.52) (end -0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.7 1.52) (end -0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.76 1.58) (end -0.76 0.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.76 -1.58) (end -0.76 -0.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.15 0.65) (end -0.15 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 0.45) (end -0.4 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 0.45) (end 0.15 0.65) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.15 0.65) (end 0.15 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.15 0.25) (end -0.15 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.15 0.45) (end 0.4 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.746 1) (end -1.746 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.746 -1) (end 2.254 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start 2.254 -1) (end 2.254 1) (layer B.Fab) (width 0.1))
-  (fp_line (start 2.254 1) (end -1.746 1) (layer B.Fab) (width 0.1))
-  (fp_line (start -3.556 0) (end -1.746 0) (layer B.Fab) (width 0.1))
-  (fp_line (start 4.064 0) (end 2.254 0) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.146 1) (end -1.146 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.046 1) (end -1.046 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.246 1) (end -1.246 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.866 1.12) (end -1.866 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.866 -1.12) (end 2.374 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start 2.374 -1.12) (end 2.374 1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start 2.374 1.12) (end -1.866 1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -2.516 0) (end -1.866 0) (layer B.SilkS) (width 0.12))
-  (fp_line (start 3.024 0) (end 2.374 0) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.146 1.12) (end -1.146 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.026 1.12) (end -1.026 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.266 1.12) (end -1.266 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -4.606 1.25) (end -4.606 -1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start -4.606 -1.25) (end 5.114 -1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start 5.114 -1.25) (end 5.114 1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start 5.114 1.25) (end -4.606 1.25) (layer B.CrtYd) (width 0.05))
-  (fp_poly (pts (xy 4.1656 0.5334) (xy 4.0132 0.5334) (xy 4.0132 0.9906) (xy 1.2192 0.9906)
-    (xy 1.2192 1.143) (xy 4.1656 1.143)) (layer F.Cu) (width 0.1))
-  (fp_poly (pts (xy -1.2192 -0.0762) (xy -3.048 -0.0762) (xy -3.048 0.0762) (xy -1.2192 0.0762)) (layer F.Cu) (width 0.1))
-  (fp_text user %R (at -1.8288 3.8862) (layer F.SilkS)
-    (effects (font (size 0.8 0.8) (thickness 0.12)))
+  (fp_text user "${REFERENCE}" (at 5.9944 -1.524) (layer "F.SilkS")
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    (tstamp 91433c11-a5d3-4c05-b727-fdf95e7fa55a)
   )
-  (pad 3 smd rect (at 1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd rect (at 1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd rect (at -1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad 1 thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
-  (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+  (fp_line (start -2.516 0) (end -1.866 0)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2ebfa4c0-52f6-477d-84ae-fde44362e12d))
+  (fp_line (start -1.866 -1.12) (end 2.374 -1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acd118ef-5003-4a76-b509-9118820b4c3a))
+  (fp_line (start -1.866 1.12) (end -1.866 -1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b46bc59c-2358-4b59-a25d-fbb3cb16df2e))
+  (fp_line (start -1.266 1.12) (end -1.266 -1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9cfee364-0a36-4168-9a03-9e2b8aa1532c))
+  (fp_line (start -1.146 1.12) (end -1.146 -1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 65d199a4-3f39-4027-92d8-8b96a11565c3))
+  (fp_line (start -1.026 1.12) (end -1.026 -1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ffc7539d-4080-44cf-b011-f3b2023c7bdd))
+  (fp_line (start 2.374 -1.12) (end 2.374 1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57f9526e-4c99-4072-97b8-066d0a57bbfa))
+  (fp_line (start 2.374 1.12) (end -1.866 1.12)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f31b7a91-9d17-405c-9333-5c2c7b64a125))
+  (fp_line (start 3.024 0) (end 2.374 0)
+    (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 319a4a95-c418-4326-a8b7-8a6c7430ffaf))
+  (fp_line (start -0.76 -1.58) (end -0.76 -0.65)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 400aa8b9-525e-4b74-8431-08f160c18c9a))
+  (fp_line (start -0.76 -1.58) (end 0.7 -1.58)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d79dc885-3d55-4139-9cfe-95a99b1b887f))
+  (fp_line (start -0.76 1.58) (end -0.76 0.65)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 82c6902a-689e-4107-a05f-01e99ead1a0a))
+  (fp_line (start -0.76 1.58) (end 1.4 1.58)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7dc4b7e6-40cd-4d0c-af62-f4afd387d198))
+  (fp_line (start -4.606 -1.25) (end 5.114 -1.25)
+    (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6bacd9ba-ac8c-4654-85ad-a3b2e6b1883b))
+  (fp_line (start -4.606 1.25) (end -4.606 -1.25)
+    (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4cbd7873-db33-4daf-831f-89f5cb785cd7))
+  (fp_line (start 5.114 -1.25) (end 5.114 1.25)
+    (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fbd02659-b43a-4653-ac5b-34a3e6ec113e))
+  (fp_line (start 5.114 1.25) (end -4.606 1.25)
+    (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8a2ceddd-9c30-4506-a364-2858aefa41cd))
+  (fp_line (start -1.7 -1.75) (end 1.7 -1.75)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 854b32ac-58cf-4638-9cec-37e2c2e892fb))
+  (fp_line (start -1.7 1.75) (end -1.7 -1.75)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a4a5cb02-dc58-40a9-82b8-82ddeefd8d40))
+  (fp_line (start 1.7 -1.75) (end 1.7 1.75)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5b422957-e485-42a4-b147-9fbfb29d049b))
+  (fp_line (start 1.7 1.75) (end -1.7 1.75)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b649cec8-89c4-4cab-b1cc-6d9e01037f63))
+  (fp_line (start -3.556 0) (end -1.746 0)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6e580d05-e9c9-4854-8b1a-75c75f6abc9e))
+  (fp_line (start -1.746 -1) (end 2.254 -1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6cf9898-6005-45e9-96bb-3732f4d4f5bf))
+  (fp_line (start -1.746 1) (end -1.746 -1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea82f956-26e9-49c2-b514-26649aff04be))
+  (fp_line (start -1.246 1) (end -1.246 -1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50603d47-6d27-4c8b-9d77-0efd2aebd9ac))
+  (fp_line (start -1.146 1) (end -1.146 -1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4be72ddf-e3fd-435f-9c6b-1ab5d5e469a6))
+  (fp_line (start -1.046 1) (end -1.046 -1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b327189d-ef01-441d-9738-e90f2400c9ef))
+  (fp_line (start 2.254 -1) (end 2.254 1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0146e898-aeba-4624-b172-4002d1b7e289))
+  (fp_line (start 2.254 1) (end -1.746 1)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f776b4a5-601c-4dd0-a822-65b1a7ca85ea))
+  (fp_line (start 4.064 0) (end 2.254 0)
+    (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e105655b-06c9-4456-981a-9fb7f072f2f6))
+  (fp_line (start -0.7 1.52) (end -0.7 -1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b88b8d93-4be3-48cb-af37-0763f35118ac))
+  (fp_line (start -0.15 0.45) (end -0.4 0.45)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 85ec75d8-d66b-4275-b3ab-be08ddca07df))
+  (fp_line (start -0.15 0.45) (end 0.15 0.65)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 43d7e843-b9cb-4123-8cac-3b3a3f192e82))
+  (fp_line (start -0.15 0.65) (end -0.15 0.25)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 261fd709-b119-45e9-aff5-04154ebd9314))
+  (fp_line (start 0.15 0.25) (end -0.15 0.45)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 110b6b8b-3d9a-49d9-a651-062dc12fd279))
+  (fp_line (start 0.15 0.45) (end 0.4 0.45)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 389cedd3-c41f-4b55-b21a-f799d09847f4))
+  (fp_line (start 0.15 0.65) (end 0.15 0.25)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 100d5a18-682a-4558-93e2-5a8dd299ab9d))
+  (fp_line (start 0.7 -1.52) (end -0.7 -1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f13bbe1d-3f04-49c6-8270-639b62b4252f))
+  (fp_line (start 0.7 1.52) (end -0.7 1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3b026976-d908-4912-bba2-893c5a17c51c))
+  (fp_line (start 0.7 1.52) (end 0.7 -1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0538aa2a-99c5-43eb-83e9-ea71514cd641))
+  (pad "1" thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp 025dd152-58ec-477d-aeeb-143880b94e0e))
+  (pad "1" smd custom (at -1 0 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor rect))
+    (primitives
+      (gr_poly
+        (pts
+          (xy 0.2192 0.0762)
+          (xy 2.048 0.0762)
+          (xy 2.048 -0.0762)
+          (xy 0.2192 -0.0762)
+        )
+        (width 0.1) (fill yes))
+    ) (tstamp 4425e3e4-bfde-49cd-b6d0-87896ea0174a))
+  (pad "2" smd custom (at 1 0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask")
+    (thermal_bridge_angle 45)
+    (options (clearance outline) (anchor rect))
+    (primitives
+      (gr_poly
+        (pts
+          (xy -3.1656 0.4166)
+          (xy -3.0132 0.4166)
+          (xy -3.0132 -0.0406)
+          (xy -0.2192 -0.0406)
+          (xy -0.2192 -0.193)
+          (xy -3.1656 -0.193)
+        )
+        (width 0.1) (fill yes))
+    ) (tstamp 32524cff-711f-4252-b868-dbe08915a525))
+  (pad "2" thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp ffd110d8-3669-49c3-9fc9-32a7868c2705))
+  (pad "NC" smd rect (at 1 -0.95 180) (size 0.9 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ba3a84a4-76f0-4b7f-a7e3-771a7ac6e6a5))
+  (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
     (offset (xyz -3.556 0 -1.4986))
     (scale (xyz 1 1 1))
     (rotate (xyz 180 0 0))
   )
-  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOT-23.wrl
+  (model "${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOT-23.wrl"
     (offset (xyz 0 0.0762 0.0508))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 180))

hardware/common/unikbd.pretty/diode-combined_copy.kicad_mod

@@ -1,72 +0,0 @@
-(module diode-combined_copy (layer F.Cu) (tedit 5F23BF4D)
-  (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
-  (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
-  (attr smd)
-  (fp_text reference REF** (at 1.3462 3.9742) (layer B.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-  )
-  (fp_text value D_DO-35_SOD27_P7.62mm_Horizontal (at -2.921 -16.4474) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_poly (pts (xy -1.2192 -0.0762) (xy -3.048 -0.0762) (xy -3.048 0.0762) (xy -1.2192 0.0762)) (layer F.Cu) (width 0.1))
-  (fp_poly (pts (xy 4.1656 0.5334) (xy 4.0132 0.5334) (xy 4.0132 0.9906) (xy 1.2192 0.9906)
-    (xy 1.2192 1.143) (xy 4.1656 1.143)) (layer F.Cu) (width 0.1))
-  (fp_line (start 5.114 1.25) (end -4.606 1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start 5.114 -1.25) (end 5.114 1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start -4.606 -1.25) (end 5.114 -1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start -4.606 1.25) (end -4.606 -1.25) (layer B.CrtYd) (width 0.05))
-  (fp_line (start -1.266 1.12) (end -1.266 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.026 1.12) (end -1.026 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.146 1.12) (end -1.146 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start 3.024 0) (end 2.374 0) (layer B.SilkS) (width 0.12))
-  (fp_line (start -2.516 0) (end -1.866 0) (layer B.SilkS) (width 0.12))
-  (fp_line (start 2.374 1.12) (end -1.866 1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start 2.374 -1.12) (end 2.374 1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.866 -1.12) (end 2.374 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.866 1.12) (end -1.866 -1.12) (layer B.SilkS) (width 0.12))
-  (fp_line (start -1.246 1) (end -1.246 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.046 1) (end -1.046 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.146 1) (end -1.146 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start 4.064 0) (end 2.254 0) (layer B.Fab) (width 0.1))
-  (fp_line (start -3.556 0) (end -1.746 0) (layer B.Fab) (width 0.1))
-  (fp_line (start 2.254 1) (end -1.746 1) (layer B.Fab) (width 0.1))
-  (fp_line (start 2.254 -1) (end 2.254 1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.746 -1) (end 2.254 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start -1.746 1) (end -1.746 -1) (layer B.Fab) (width 0.1))
-  (fp_line (start 0.15 0.45) (end 0.4 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.15 0.25) (end -0.15 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.15 0.65) (end 0.15 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 0.45) (end 0.15 0.65) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 0.45) (end -0.4 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 0.65) (end -0.15 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.76 -1.58) (end -0.76 -0.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.76 1.58) (end -0.76 0.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.7 1.52) (end -0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.7 -1.52) (end -0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.76 1.58) (end 1.4 1.58) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.7 1.52) (end -0.7 1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.7 1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.76 -1.58) (end 0.7 -1.58) (layer F.SilkS) (width 0.12))
-  (fp_text user %R (at -1.8288 3.8862) (layer F.SilkS)
-    (effects (font (size 0.8 0.8) (thickness 0.12)))
-  )
-  (pad 3 smd rect (at 1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd rect (at 1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd rect (at -1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad 1 thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
-  (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
-    (offset (xyz -3.556 0 -1.4986))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 180 0 0))
-  )
-  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOT-23.wrl
-    (offset (xyz 0 0.0762 0.0508))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 180))
-  )
-)

hardware/documents/Keyboard_build.html

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Keyboard_build.html</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+
+</head>
+
+<body>
+
+<h1 id="keyboard-build-notes">Keyboard build notes</h1>
+<h2 id="preparing-the-keyboard-pcb">Preparing the Keyboard PCB</h2>
+<h2 id="preparing-the-aligner">Preparing the Aligner</h2>
+<h2 id="combining-the-pcb-and-aligner">Combining the PCB and aligner</h2>
+<h3 id="the-spacebar-stabilizer">The Spacebar Stabilizer</h3>
+<h4 id="cherry-mx-keys">Cherry MX keys</h4>
+<h5 id="stabilizer-hardware">Stabilizer hardware</h5>
+<p>The keyboard is designed to accommodate PCB-mounted Cherry-MX compatible Spacebar aligner hardware. Most standard aligner kits come with pre-bend rods for a 6.25u spacebar. Since the 8u spacebar in the retro-keyboards, you will need to bend your own rod. I have included some sources for the rods below (1). ##### Bending the stabilizer rod The aligner PCB includes a guide for bending the stabilizer.</p>
+<ol type="1">
+<li><p>Start by creating a 90 degree bend about 2 cm from the end of the rod. This allows enough room to clip the end down to the correct length later.</p>
+<p><img alt="First Bend" src="build-images/rod_first_bend.jpg" height=50% width=50%></p></li>
+<li><p>Insert the bent end into one guide hole, and, keeping the rod as flat to the board as possible, use the second guide hole to estimate the position of the second bend. Your estimate should be about 1mm short to allow for a bending radius. Once you have the pliers positioned on the rod, make your 90 degree bend.</p>
+<p><img alt="Insert Rod in Guide" src="build-images/rod_insert_first_arm.jpg" height=50% width=50%></p></li>
+<li><p>Look along the length of the rod to make sure that both “arms” are in line. If necessary, align the two arms by twisting about the axis of the axis of the rod.</p></li>
+<li><p>Test the fit of the rod by inserting it into the guide holes. Adjust as needed.</p>
+<p><img alt="Test Fit" src="build-images/test_fit_too_long.jpg" height=50% width=50%></p></li>
+<li><p>Clip the arms of the rod to about 11 mm.</p>
+<p><img alt="Clip Arms to Length" src="build-images/stabilizer_rod_timmed_arms.jpg" height=50% width=50%></p></li>
+<li><p>Install the Cherry MX stabilizers to the board.</p></li>
+<li><p>Install the spacebar and insert the rod.</p></li>
+</ol>
+<h4 id="futaba-md4-pcs-keys">Futaba MD4-PCS keys</h4>
+<h5 id="stabilizer-hardware-1">Stabilizer hardware</h5>
+<p>See the Cherry MX section above for notes on installing the Cherry MX stabilizer hardware and bending the spacebar stabilizer rod.</p>
+<h5 id="longer-stabilizer-posts-for-futaba">Longer Stabilizer posts for Futaba</h5>
+<p>The Futaba aligner PCB includes two stabilizer posts, allowing the futaba keys to be used with the Cherry MX PCB-mount stabilizers.</p>
+<p><img alt="Futaba stabilizer adapter posts" src="build-images/pre-breakaway.jpg" height=50% width=50%></p>
+<ol type="1">
+<li><p>Remove both posts from the PCB. Newer revisions of the aligner board include perforations for easier break-away of the posts.</p>
+<p><img alt="Break away posts from aligner" src="build-images/cutting_post.jpg" height=50% width=50%></p></li>
+<li><p>Be sure to file away any excess material from the breakaway tab.</p>
+<p><img alt="Broken offfiling" src="build-images/futaba_posts_before_filing.jpg" height=38% width=38%> <img alt="Removed breakaway tabs" src="build-images/futaba_posts_breakaway_filed_off.jpg" height=38% width=38%></p></li>
+<li><p>File away the area marked “File to 1.5mm”. The aligner includes a thickness gauge to test fitting, but it turns out that manufacturing tolerances are not adequate, and the gauge is not reliable. Use a spare key cap to test the thickness. The post should require some pressure to inert into the keycap base.</p></li>
+<li><p>The post should be just under 4mm wide. The post in this example is an early revision that was specified at 4mm, and ended being a sliver too wide to fit the keycap base. It required a alittle extra filing along one side to fit properly. The posts on newer revs are thinner and should not require extra filing to narrow side-to-side width.</p>
+<p><img alt="Posts before and after filing" src="build-images/futaba_posts_before_and_after.jpg" height=50% width=50%></p>
+<p><img alt="Posts ready to install" src="build-images/filed_futaba_posts.jpg" height=50% width=50%></p></li>
+<li><p>The posts should be just tight enough to require a pair of pliers to insert. Use pliers to insert both posts fully. Use a ruler or caliper to ensure the prodruding portions of both posts are the same length.</p></li>
+</ol>
+<p><img alt="Press the posts into the spacebar" src="build-images/futaba_posts_press_into_spacebar.jpg" height=50% width=50%></p>
+<ol type="1">
+<li><p>Install the spacebar center mount on the spacebar key, aligning the posts so that they slide into the PCB-mounted stabilizers.</p></li>
+<li><p>Holding down the spacebar, align the arms stabilizer rod with the holes in the posts, and then snap the rod into place at the front of the stabilizer mounts.</p></li>
+</ol>
+<p><img alt="Stabilizer installed" src="build-images/stabilizer_installed_futaba.jpg" height=50% width=50%></p>
+
+</body>
+</html>

hardware/franklin-ace-1000-keyboard/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

hardware/franklin-ace-1000-keyboard/README.md

@@ -0,0 +1,9 @@
+# Franklin-ACE-1000-Keyboard
+Replacement Franklin ACE 1000 keyboard for use with osiweb's Unified Retro Keyboard
+
+## Images
+![Image 1](images/2023-03-18%2010.09.14.jpg?raw=true "Image 1")
+![Image 4](images/2023-03-18%2010.15.01.jpg?raw=true "Image 4")
+![Image 2](images/2023-03-18%2010.15.10.jpg?raw=true "Image 2")
+![Image 5](images/2023-03-18%2010.16.16.jpg?raw=true "Image 5")
+![Image 3](images/2023-03-18%2010.19.41.jpg?raw=true "Image 3")

hardware/interface-ascii/bom.ini

@@ -0,0 +1,124 @@
+[BOM_OPTIONS]
+; General BoM options here
+; If 'ignore_dnf' option is set to 1, rows that are not to be fitted on the PCB will not be written to the BoM file
+ignore_dnf = 0
+; If 'html_generate_dnf' option is set to 1, also generate a list of components not fitted on the PCB (HTML only)
+html_generate_dnf = 1
+; If 'use_alt' option is set to 1, grouped references will be printed in the alternate compressed style eg: R1-R7,R18
+use_alt = 1
+; If 'alt_wrap' option is set to and integer N, the references field will wrap after N entries are printed
+alt_wrap = 0
+; If 'number_rows' option is set to 1, each row in the BoM will be prepended with an incrementing row number
+number_rows = 1
+; If 'group_connectors' option is set to 1, connectors with the same footprints will be grouped together, independent of the name of the connector
+group_connectors = 1
+; If 'test_regex' option is set to 1, each component group will be tested against a number of regular-expressions (specified, per column, below). If any matches are found, the row is ignored in the output file
+test_regex = 1
+; If 'merge_blank_fields' option is set to 1, component groups with blank fields will be merged into the most compatible group, where possible
+merge_blank_fields = 1
+; Specify output file name format, %O is the defined output name, %v is the version, %V is the variant name which will be ammended according to 'variant_file_name_format'.
+output_file_name = %O_bom_%v%V
+; Specify the variant file name format, this is a unique field as the variant is not always used/specified. When it is unused you will want to strip all of this.
+variant_file_name_format = _(%V)
+; Field name used to determine if a particular part is to be fitted
+fit_field = Fitted
+; Make a backup of the bom before generating the new one, using the following template
+make_backup = %O.tmp
+; Default number of boards to produce if none given on CLI with -n
+number_boards = 1
+; Default PCB variant if none given on CLI with -r
+board_variant = ['default']
+; Whether to hide headers from output file
+hide_headers = False
+; Whether to hide PCB info from output file
+hide_pcb_info = False
+
+[IGNORE_COLUMNS]
+; Any column heading that appears here will be excluded from the Generated BoM
+; Titles are case-insensitive
+
+Class
+Component Type
+Footprint
+Footprint Lib
+Material
+Number of Pins
+Package Variant
+Part
+Part Lib
+Power Rating
+RoHS China Link
+RoHS Europe Link
+SheetPath
+Standards Version
+Temp (Operating)
+Temp (Soldering)
+Temp (Storage)
+Temp Coeff.
+Tolerance
+Value
+Voltage Rating
+Current Rating
+
+
+[COLUMN_ORDER]
+; Columns will apear in the order they are listed here
+; Titles are case-insensitive
+References
+Fitted
+Quantity Per PCB
+Description
+Part Value
+Manufacturer
+Manufacturer PN
+Label
+BOM Comment
+
+
+[GROUP_FIELDS]
+; List of fields used for sorting individual components into groups
+; Components which match (comparing *all* fields) will be grouped together
+; Field names are case-insensitive
+Part
+Part Lib
+Value
+Footprint
+Footprint Lib
+
+[COMPONENT_ALIASES]
+; A series of values which are considered to be equivalent for the part name
+; Each line represents a list of equivalent component name values separated by white space
+; e.g. 'c c_small cap' will ensure the equivalent capacitor symbols can be grouped together
+; Aliases are case-insensitive
+c	c_small	cap	capacitor
+r	r_small	res	resistor
+sw	switch
+l	l_small	inductor
+zener	zenersmall
+d	diode	d_small
+
+[REGEX_INCLUDE]
+; A series of regular expressions used to include parts in the BoM
+; If there are any regex defined here, only components that match against ANY of them will be included in the BOM
+; Column names are case-insensitive
+; Format is: "[ColumName] [Regex]" (white-space separated)
+
+[REGEX_EXCLUDE]
+; A series of regular expressions used to exclude parts from the BoM
+; If a component matches ANY of these, it will be excluded from the BoM
+; Column names are case-insensitive
+; Format is: "[ColumName] [Regex]" (white-space separated)
+References	^TP[0-9]*
+References	^FID
+Part	mount.*hole
+Part	solder.*bridge
+Part	test.*point
+Footprint	test.*point
+Footprint	mount.*hole
+Footprint	fiducial
+Allow Substitution
+Tracking
+Package
+Manufacturer Link
+Component Value
+Datasheet

hardware/interface-ascii/production-package/Makefile

@@ -0,0 +1,320 @@
+NAME=interface-ascii
+PROJECT_DESC=Unified retro keyboard ASCII interface, ATMega 328P version
+VARIANTNAME=Production
+BOARDREV=3
+BOARDREVMINOR=
+SCHEMATIC_REV=0
+PROJECT_REV=0
+LAYERS=2
+
+PCBDIR="./PCB_dir"
+
+PROGRAMMING_DIR=programming_files_dir
+DIAGRAMS_DIR=diagrams_dir
+WORK_INSTR_DIR=work_instructions_dir
+LABELS_DIR=labels_dir
+
+SUBDIRS=$(PROGRAMMING_DIR) $(DIAGRAMS_DIR) $(WORK_INSTR_DIR) $(LABELS_DIR)
+
+PCBREV=$(BOARDREV)
+SCHREV=$(BOARDREV).$(SCHEMATIC_REV)
+PRJREV=$(BOARDREV).$(SCHEMATIC_REV).$(PROJECT_REV)
+PCBNAME=$(NAME)-Rev_$(PCBREV)$(BOARDREVMINOR)
+PCBFULLNAME=$(PCBNAME)-$(VARIANTNAME)
+SCHNAME=$(NAME)-Rev_$(SCHREV)-$(VARIANTNAME)
+PRJNAME=$(NAME)-Rev_$(PRJREV)$(BOARDREVMINOR)-$(VARIANTNAME)
+
+SCHEMATIC_SRC=$(NAME).kicad_sch
+BOARD_SRC=$(NAME).kicad_pcb
+
+PCBZIPFILE=$(PCBNAME)-pcbfab.zip
+PKGZIPFILE=$(PRJNAME)-package.zip
+GENERATED_BOMFILE = ../$(NAME)_bom_$(SCHREV).csv
+BOMFILE=BOM-$(SCHNAME).csv
+BOMINITFILE=../bom.ini
+BOMINITTEMPLATE=./templates/bom.ini
+#README_STYLE=rst
+README_STYLE=pdf
+
+READMEFILEBASE=README-$(PRJNAME)
+READMEFILETXT=$(READMEFILEBASE).rst
+READMEFILEPDF=$(READMEFILEBASE).pdf
+READMETARGET=readme$(README_STYLE)
+
+RENDERFILE_TOP=Renderings-top-$(PCBFULLNAME).jpg
+RENDERFILE_BOTTOM=Renderings-bottom-$(PCBFULLNAME).jpg
+RENDERFILES=$(RENDERFILE_TOP) $(RENDERFILE_BOTTOM)
+DUMMY_RENDERFILES=$(addsuffix _, $(RENDERFILES))
+GENERATED_SCHEMFILE=../$(NAME).pdf
+SCHEMFILE=Schematic-$(PRJNAME).pdf
+STEPFILE=Model-3D-$(PCBNAME)-$(VARIANTNAME).STEP
+DUMMY_STEPFILE="$(STEPFILE)_"
+DUMMY_TARGETS=$(DUMMY_STEPFILE) $(DUMMY_RENDERFILES)
+
+define MAKEFILE_SWITCHES
+NAME="$(NAME)" PROJECT_DESC="$(PROJECT_DESC)" \
+BOARDREV="$(BOARDREV)" BOARDREVMINOR="$(BOARDREVMINOR)" \
+LAYERS="$(LAYERS)"
+endef
+
+define README_TEXT
+"$(NAME) Rev $(PRJREV) \($(PROJECT_DESC)\)"\
+|-----------------------------------------------------------------------------------------------|\
+|This is the package for $(NAME) rev $(PRJREV).|\
+|Service Requested\
+|=================|\
+|   * Manufacturing and inspection to IPC class 3 standard.\
+|   * RoHS compliant\
+|   * PCB Material: FR4\
+|   * Solder mask color: Green\
+|   * Silk screen color: White\
+|   * Layers: $(LAYERS)\
+|   * Copper thickness: 1 oz all layers\
+|   * Finish: HASL|\
+||Programming and labeling of microcontroller\
+|===========================================|\
+|None\
+||Testing\
+|=======\
+|   * Test 100% testing of assemblies\
+|   * Standard PCB QA (bed of nails, test for shorts and opens)\
+|\
+||Tracking\
+|========|\
+|None\
+|\
+||Packaging\
+|=========|\
+|Standard Packaging\
+||Production Package\
+|==================|\
+|The  ZIP file contains the following files:\
+|   $(PCBZIPFILE)\
+|+++A ZIP file containing Gerbers; drill file;\
+|+++readme.txt\
+|++++++readme file containing PCB fabrication directions; fab renderings, etc.\
+|\
+|$(READMEFILE)\
+|+++This letter.\
+|\
+|$(RENDERFILE_TOP)\
+|+++A JPEG file containing a reference for PCB parts placement, and 3D renderings of the front of the populated board (with components).\
+|\
+|$(RENDERFILE_BOTTOM)\
+|+++A JPEG file containing a reference for PCB parts placement, and 3D renderings of the back of the populated board (with components).\
+|\
+|$(STEPFILE):\
+|+++An exported 3D STEP file of the PCB with all components fitted.\
+|\
+|$(SCHEMFILE)\
+|+++A PDF file containing the schematics for this PCB.\
+|\
+|$(BOMFILE)\
+|+++BOM file, csv format\
+|\
+|Subdirectory: labels_dir\
+|+++:$(PROJNAME)_labels.doc: Labels for final packaging.\
+|\
+|Subdirectory: programming_files_dir\
+|+++empty, not applicable.\
+|\
+|Subdirectory containing programming files\
+|+++empty, not applicable\
+|\
+|Subdirectory: diagrams_dir\
+|+++empty\
+|\
+|Subdirectory containing diagrams or pictures related to production\
+|+++empty\
+|\
+|Subdirectory: work_instructions_dir\
+|+++Subdirectory containing work instructions, test procedures, etc.|\
+|.. figure:: ./$(RENDERFILE_TOP)|\
+|   TOP side rendering of populated PCB\
+|.. figure:: ./$(RENDERFILE_BOTTOM)|\
+|   BOTTOM side rendering of populated PCB
+endef
+
+
+define RENDER_TOP_MSG
+|------------------------------------------------------------------------\
+|The assembly rendering \"$(RENDERFILE_TOP)\"\
+|must be manually generated with the following steps:|\
+|1) Bring up the 3D rendering from PCBNEW (ALT-3).  Select\
+|the TOP view (RightClick-"View Top").|\
+|2) Perform a screen capture.  Save the capture to the\
+|production-package directory.  Select the dummy file name|\
+|"    \"$(RENDERFILE_TOP)_\""|\
+|and delete the trailing \"_\".  Then click Save.
+endef
+
+define RENDER_BOTTOM_MSG
+|------------------------------------------------------------------------\
+|The assembly rendering \"$(RENDERFILE_BOTTOM)\"\
+|must be manually generated with the following steps:|\
+|1) Bring up the 3D rendering from PCBNEW (ALT-3).  Select\
+|the BOTTOM view (RightClick-"View Bottom").|\
+|2) Perform a screen capture.  Save the capture to the\
+|production-package directory.  Select the dummy file name|\
+|"    \"$(RENDERFILE_BOTTOM)_\""|\
+|and delete the trailing \"_\".  Then click Save.
+endef
+
+define BOM_MSG
+|------------------------------------------------------------------------\
+|The BOM file must be manually generated.  The BOM file requires the KiBOM plugin.\
+|Please ensure that KiBOM is installed.  To generate the BOM file:\
+|1) Copy the file 'bom.ini' in the templates directory to the main directory:\
+|\"   cp templates_dir/bom.ini ..\"\
+|2) In EESChema, select Tools->Generate BOM.|\
+|3) Select KIBOM_CLI and click \"Generate\"|
+endef
+
+define SCHEM_MSG
+|------------------------------------------------------------------------\
+|The Schematic PDF file must be manually generated:\
+|1) In EESChema, select File->Plot to bring up the Plot dialog\
+|2) Select PDF output format.\
+|3) Check "Plot Drawing Sheet"\
+|4) Click "Plot All Pages"
+endef
+
+define STEPFILE_MSG
+|------------------------------------------------------------------------\
+|The STEP file must be manually generated.\
+|1) From PCBNEW, select File->Export->STEP\
+|2) Check the following boxes:\
+|   - Board Center Origin\
+|   - Substitute similarly named models\
+|   - Overwrite old file\
+|2) Save to the production package directory.  Select the placeholder filename:\
+|"    $(STEPFILE)_"\
+|3) Remove the trailing \"_\" and click "Save"
+endef
+
+# KiCad doesn't automate saving of rendering files, which must be
+# screen-captured and saved as JPEG files. The STEP file must similarly be
+# exported manually. the "dummies" target creates filename templates that can be
+# selected and edited (by removing the trailing "_") to help ensure that the
+
+all: dummies bomfile renderfiles schemfile $(READMETARGET) pkgzip subdirs
+
+.phony: dummies
+dummies:
+	@echo "$(DUMMY_TARGETS)" | xargs -n 1 echo "+++ Creating placeholder: "
+	@touch $(DUMMY_TARGETS)
+
+.Phony: clean
+clean:
+	rm -fv  *.zip  $(DUMMY_TARGETS) *~ *_ makefile.log
+	rm -fv  *pdf *rst *csv
+
+	(cd PCB_dir; make $(MAKEFILE_SWITCHES) clean)
+
+.phony: veryclean
+veryclean: clean
+	rm -fv $(SCHEMFILE) $(RENDERFILES) $(BOMFILE)
+	rm -rfv *.jpg *.JPG *.pdf *.pdf *.png *.PNG
+	rm -f README* *rst *pdf *dvi
+	(cd PCB_dir; make $(MAKEFILE_SWITCHES) veryclean)
+
+bominit: $(BOMINITFILE)
+
+$(BOMINITFILE): $(BOMINITTEMPLATE)
+	cp -i $(BOMINITTEMPLATE) $(BOMINITFILE)
+
+$(BOMFILE):
+	@if [ ! -f "$(GENERATED_BOMFILE)" ]; then \
+		echo "XXX Didn't find BOM: $(GENERATED_BOMFILE).  See makefile.log. . .";\
+		echo "|$(BOM_MSG)|"|tr '|' '\n' >> makefile.log;\
+	else \
+		echo "--> Found BOM: $(GENERATED_BOMFILE).  Copying. . .";\
+		cp $(GENERATED_BOMFILE) $(BOMFILE);\
+	fi
+
+bomfile: $(BOMFILE)
+
+$(SCHEMFILE):
+	@if [ ! -f "$(GENERATED_SCHEMFILE)" ]; then \
+		echo "XXX Didn't find Schematic PDF: $(GENERATED_SCHEMFILE). See makefile.log";\
+		echo "$(SCHEM_MSG)"|tr '|' '\n'  >> makefile.log; \
+	else \
+		echo "--> Found Schematic PDF: $(GENERATED_SCHEMFILE)";\
+		cp $(GENERATED_SCHEMFILE) $(SCHEMFILE);\
+	fi
+
+schemfile: $(SCHEMFILE)
+
+$(STEPFILE):
+	@if [ ! -f "$(STEPFILE)" ]; then\
+		echo; \
+		echo "XXX Didn't find assembly STEP file: $(STEPFILE). See makefile.log"; \
+		echo "$(STEPFILE_MSG)"|tr '|' '\n' >> makefile.log; \
+		echo; \
+	else \
+		echo "--> Found assembly STEP file: $(STEPFILE)"; \
+	fi
+
+.Phony: stepfile
+stepfile: $(STEPFILE)
+
+.Phony: renderfiles
+renderfiles: renderfile_top renderfile_bottom
+
+.Phony: renderfile_top
+renderfile_top:
+	@if [ ! -f "$(RENDERFILE_TOP)" ]; then\
+		echo; \
+		echo "XXX Didn't find assembly rendering: $(RENDERFILE_TOP) See makefile.log"; \
+		echo "$(RENDER_BOTTOM_MSG)"|tr '|' '\n' >> makefile.log; \
+		echo; \
+	else \
+		echo "--> Found top assembly rendering: $(RENDERFILE_TOP)"; \
+	fi
+
+.Phony: renderfile_bottom
+renderfile_bottom:
+	@if [ ! -f "$(RENDERFILE_BOTTOM)" ]; then\
+		echo; \
+		echo "XXX Didn't find bottom assembly rendering: $(RENDERFILE_BOTTOM) See makefile.log"; \
+		echo "$(RENDER_TOP_MSG)"|tr '|' '\n' >> makefile.log; \
+		echo; \
+	else \
+		echo "--> Found bottom assembly rendering: $(RENDERFILE_BOTTOM)"; \
+	fi
+
+pcbzip: $(PCBZIPFILE)
+
+$(PCBZIPFILE):
+	echo "Building PCB Zip file..."; (cd $(PCBDIR); make $(MAKEFILE_SWITCHES) zip)
+
+renderfiles: renderfile_top renderfile_bottom
+
+readmetxt: $(READMEFILETXT)
+
+readmepdf: $(READMEFILEPDF)
+
+$(READMEFILETXT): Makefile
+	@echo "Creating Readme File $(READMEFILETXT)."; \
+	echo "$(README_TEXT)"|tr '|' '\n' | sed 's/+++/   /g'  > $(READMEFILETXT);
+
+$(READMEFILEPDF): $(READMEFILETXT)
+	@echo "Creating Readme File $(READMEFILEPDF)."; \
+	pandoc -f rst -t pdf -o "$(READMEFILEPDF)" "$(READMEFILETXT)";
+
+.phony subdirs:
+	@mkdir -p $(SUBDIRS)
+
+pkgzip: $(PCBZIPFILE) $(BOMFILE) $(RENDERFILES) $(READMEFILE) $(STEPFILE)
+	@echo removing old zip. . .; \
+	rm -rf $(PKGZIPFILE); \
+	echo creating zip. . .; \
+	zip -9r $(PKGZIPFILE) \
+	$(PCBZIPFILE) \
+	$(READMEFILETXT) \
+	$(READMEFILEPDF) \
+	$(SCHEMFILE) \
+	$(RENDERFILES) \
+	$(BOMFILE) \
+	$(STEPFILE) \
+	$(SUBDIRS)

hardware/interface-ascii/production-package/PCB_dir/Makefile

@@ -0,0 +1,337 @@
+PROJECT_DESC="PCB"
+NAME="PCB"
+BOARDREV=1
+BOARDREVMINOR=
+LAYERS=2
+SMT=no
+
+#README_STYLE=rst
+README_STYLE=pdf
+
+PCBNAME=$(NAME)-Rev_$(BOARDREV)$(BOARDREVMINOR)
+
+READMEFILEBASE=README-PCB-$(PCBNAME)
+READMEFILETXT=$(READMEFILEBASE).rst
+READMEFILEPDF=$(READMEFILEBASE).pdf
+READMETARGET=readme$(README_STYLE)
+
+TOP_SOLDER_EXT = gts
+TOP_SOLDER_DSC = F_Mask
+TOP_SOLDER_GBR = "$(PCBNAME)_$(TOP_SOLDER_DSC).$(TOP_SOLDER_EXT)"
+TOP_COPPER_EXT = gtl
+TOP_COPPER_DSC = F_Cu
+TOP_COPPER_GBR = "$(PCBNAME)_$(TOP_COPPER_DSC).$(TOP_COPPER_EXT)"
+TOP_SILK_EXT = gto
+TOP_SILK_DSC = F_Silkscreen
+TOP_SILK_GBR = "$(PCBNAME)_$(TOP_SILK_DSC).$(TOP_SILK_EXT)"
+BOT_SOLDER_EXT = gbs
+BOT_SOLDER_DSC = B_Mask
+BOT_SOLDER_GBR = "$(PCBNAME)_$(BOT_SOLDER_DSC).$(BOT_SOLDER_EXT)"
+BOT_COPPER_EXT = gbl
+BOT_COPPER_DSC = B_Cu
+BOT_COPPER_GBR = "$(PCBNAME)_$(BOT_COPPER_DSC).$(BOT_COPPER_EXT)"
+BOT_SILK_EXT = gbo
+BOT_SILK_DSC = B_Silkscreen
+BOT_SILK_GBR = "$(PCBNAME)_$(BOT_SILK_DSC).$(BOT_SILK_EXT)"
+OUTLN_EXT = gm1
+OUTLN_DSC = Edge_Cuts
+OUTLN_GBR = "$(PCBNAME)_$(OUTLN_DSC).$(OUTLN_EXT)"
+DRILL_EXT = DRL
+DRILL_PTH = "$(PCBNAME)-PTH.$(DRILL_EXT)"
+DRILL_NPTH = "$(PCBNAME)-NPTH.$(DRILL_EXT)"
+TOP_PASTE_EXT = gtp
+TOP_PASTE_DSC = F_Paste
+TOP_PASTE_GBR = "$(PCBNAME)_$(TOP_PASTE_DSC).$(TOP_PASTE_EXT)"
+BOT_PASTE_EXT = gbp
+BOT_PASTE_DSC = B_Paste
+BOT_PASTE_GBR = "$(PCBNAME)_$(BOT_PASTE_DSC).$(BOT_PASTE_EXT)"
+
+GND1_EXT = g2
+GND1_DSC = In1_Cu
+GND1_GBR = "$(PCBNAME)_$(GND1_DSC).$(GND1_EXT)"
+GND2_EXT = g3
+GND2_DSC = In2_Cu
+GND2_GBR = "$(PCBNAME)_$(GND2_DSC).$(GND2_EXT)"
+
+ifeq ($(SMT),yes)
+PASTE_LAYERS= $(TOP_PASTE_GBR) $(BOT_PASTE_GBR)
+endif
+
+ifeq ($(LAYERS),4)
+OUTPUT_EXTS = $(addprefix *., $(TOP_SOLDER_EXT) $(TOP_COPPER_EXT) $(TOP_SILK_EXT) \
+               $(BOT_SOLDER_EXT) $(BOT_COPPER_EXT) $(BOT_SILK_EXT) \
+			   $(OUTLN_EXT) $(DRILL_EXT)) \
+			   $(TOP_PASTE_EXT) $(BOT_PASTE_EXT) \
+			   $(GND1_EXT) $(GND2_EXT)
+
+define STACKUP_DESC
+|   * Stackup: All tolerances 10%\
+|       1. Total thickness: 0.062 inch\
+|       1. top layer    1oz copper\
+|       1. prepreg      2x2116\
+|       1. second layer 1oz copper\
+|       1. core         0.039 inch core\
+|       1. third layer  1oz copper\
+|       1. prepreg      2x2116\
+|       1. bottom layer 1oz copper
+endef
+
+define INNER_PLANE_DESC
+|:INNER_PLANE 1: - :code:\`"$(GND1_GBR)"\`\
+|:INNER_PLANE 2: - :code:\`"$(GND2_GBR)"\`
+endef
+
+INNER_PLANES = $(GND1_GBR) $(GND2_GBR)
+
+define INNER_LAYERS
+ * In1.Cu\
+|  * In2.Cu
+endef
+
+endif
+
+ifeq ($(LAYERS),2)
+OUTPUT_EXTS = $(addprefix *., $(TOP_SOLDER_EXT) $(TOP_COPPER_EXT) $(TOP_SILK_EXT) \
+               $(BOT_SOLDER_EXT) $(BOT_COPPER_EXT) $(BOT_SILK_EXT) \
+			   $(OUTLN_EXT) $(DRILL_EXT)) \
+			   $(TOP_PASTE_EXT) $(BOT_PASTE_EXT)
+
+define STACKUP_DESC
+|   * Stackup: All tolerances 10%\
+|       1. Total thickness: 0.062 inch\
+|       1. top layer    1oz copper\
+|       1. core         0.059 inch\
+|       1. bottom layer 1oz copper
+endef
+
+
+endif
+
+DRILDIR = outputs
+GERBDIR = outputs
+FAB_TOP = $(PCBNAME)-render-top-view.jpg
+FAB_BOTTOM = $(PCBNAME)-render-bottom-view.jpg
+FAB_FILES = $(FAB_TOP) $(FAB_BOTTOM)
+FAB_DUMMIES = $(FAB_TOP)_ $(FAB_BOTTOM)_
+
+DUMMY_TARGETS = $(FAB_DUMMIES)
+
+ZIPFILE = ../$(PCBNAME)-pcbfab.zip
+
+define FAB_TOP_MSG
+|------------------------------------------------------------------------\
+|The assembly rendering \"$(FAB_TOP)\"\
+|must be manually generated with the following steps:|\
+|1) Bring up the 3D rendering from PCBNEW \(ALT-3\).|\
+|2) Deselect the 3D model visibility for all components.|\
+|3) Select the TOP view \(RightClick-"View Top"\).|\
+|2) Perform a screen capture.  Save the capture to the\
+|\"production-package/PCB_dir\" directory.  Select the dummy file name|\
+|"    \"$(FAB_TOP)_\""|\
+|and delete the trailing \"_\".  Then click Save.
+endef
+
+define FAB_BOTTOM_MSG
+|------------------------------------------------------------------------\
+|The assembly rendering \"$(FAB_BOTTOM)\"\
+|must be manually generated with the following steps:|\
+|1) Bring up the 3D rendering from PCBNEW \(ALT-3\).|\
+|2) Deselect the 3D model visibility for all components.|\
+|3) Select the BOTTOM view \(RightClick-"View Bottom"\).|\
+|2) Perform a screen capture.  Save the capture to the\
+|\"production-package/PCB_dir\" directory.  Select the dummy file name|\
+|"    \"$(FAB_BOTTOM)_\""|\
+|and delete the trailing \"_\".  Then click Save.
+endef
+
+define README_TEXT
+"$(NAME) Rev $(BOARDREV) \($(PROJECT_DESC)\)"\
+|------------------------------------------------------------------------------------|\
+||:Board: "$(BASENAME)"\
+||Service\
+|=======|\
+|   * Manufacturing and inspection to IPC class 3 standard.\
+|   * PCB Material: FR4\
+|   * Solder mask color: Green\
+|   * Silk screen color: White\
+|   * Layers: $(LAYERS)\
+|   * Copper thickness: 1 oz all layers\
+|   * Finish: HASL|\
+$(STACKUP_DESC)\
+|\
+|Files\
+|=====|\
+|:BOARD OUTLINE: - :code:\`"$(OUTLN_GBR)"\`\
+|:TOP LAYER: - :code:\`"$(TOP_COPPER_GBR)"\`\
+$(INNER_PLANE_DESC)\
+|:BOTTOM LAYER: - :code:\`"$(BOT_COPPER_GBR)"\`\
+|:TOP SOLDER MASK: - :code:\`"$(TOP_PASTE_GBR)"\`\
+|:BOTTOM SOLDER MASK: - :code:\`"$(BOT_PASTE_GBR)"\`\
+|:TOP PASTE MASK: - :code:\`"$(TOP_PASTE_GBR)"\`\
+|:BOTTOM PASTE MASK: - :code:\`"$(BOT_PASTE_GBR)"\`\
+|:TOP SILK SCREEN: - :code:\`"$(TOP_SILK_GBR)"\`\
+|:BOTTOM SILK SCREEN: - :code:\`"$(BOT_SILK_GBR)"\`\
+|:EXCELLON DRILL (Plated): - :code:\`"$(DRILL_PTH)"\`\
+|:EXCELLON DRILL (Non-plated): :code:\`"$(DRILL_NPTH)"\`\
+||Fab Drawings\
+|============|\
+|:$(FAB_TOP): - :code:\`3D rendering of the top of the bare PCB\`\
+|:$(FAB_BOTTOM): - :code:\`3D rendering of the bottom of the bare PCB\`\
+|\
+|.. figure:: ./$(FAB_TOP)||\
+|   TOP side rendering of bare PCB||\
+|.. figure:: ./$(FAB_BOTTOM)||\
+|   BOTTOM side rendering of bare PCB||\
+|General Info\
+|============|\
+|   * This board was developed with Kicad 6\
+|   * The Gerber files are in 2.5 RS274X format.\
+||Special Instructions\
+|====================|\
+|  * Please note there are TWO Excellon Drill files, one for plated through holes (PTH), and one for non-plated through holes (NPTH).\
+|  * The board outline is delineated in the Gerber file "$(OUTLN_GBR)"|\
+|Thanks.
+endef
+
+define DRL_FAIL
+|Missing drill file.  To generate the drill files, within PCBNew:|\
+|- Select File->Plot.  Click "Generate Drill Files" at the bottom right side of the dialog.\
+|- Select the following options:\
+|  * Excellon, \"Use route command\"\
+|  * Drill origin: Absolute\
+|  * Drill units: inches\
+|  * Zeros Format: Decimal format\
+|  * Precision: 2.4\
+|- Select \"Generate Drill File\"|
+endef
+
+define GBR_FAIL
+|Missing gerber file.  To generate the gerber files, within PCBNew:|\
+|- Select File->Plot.  Click "Generate Drill Files" at the bottom right side of the dialog.\
+|- Select the following layers:\
+|  * F.Cu\
+|  * B.Cu\
+|  * F.Silkscreen\
+|  * B.Silkscreen|\
+$(INNER_LAYERS)\
+|  * F.Paste\
+|  * B.Paste\
+|  * F.Mask\
+|  * B.Mask\
+|  * Edge.Cuts|
+endef
+
+
+all: dummies copy renderfiles $(READMETARGET)
+
+readmetxt: $(READMEFILETXT)
+
+readmepdf: $(READMEFILEPDF)
+
+$(READMEFILETXT): Makefile
+	@echo "Creating Readme File $(READMEFILETXT)."; \
+	echo "$(README_TEXT)"|tr '|' '\n' | sed 's/+++/   /g'  > $(READMEFILETXT);
+
+$(READMEFILEPDF): $(READMEFILETXT)
+	@echo "Creating Readme File $(READMEFILEPDF)."; \
+	pandoc -f rst -t pdf -o "$(READMEFILEPDF)" "$(READMEFILETXT)";
+
+
+.Phony: renderfiles
+renderfiles: renderfile_top renderfile_bottom
+
+.Phony: renderfile_top
+renderfile_top:
+	@if [ ! -f "$(FAB_TOP)" ]; then\
+		echo; \
+		echo "XXX Didn't find top assembly rendering: $(FAB_TOP). See makefile.log"; \
+		echo "|$(FAB_TOP_MSG)|"|tr '|' '\n' >> makefile.log; \
+		echo; \
+	else \
+		echo "--> Found top assembly rendering: $(FAB_TOP)"; \
+	fi
+
+.Phony: renderfile_bottom
+renderfile_bottom:
+	@if [ ! -f "$(FAB_BOTTOM)" ]; then\
+		echo; \
+		echo "XXX Didnt' find assembly rendering $(FAB_BOTTOM).  See makefile.log";\
+		echo "|$(FAB_TOP_MSG)|"|tr '|' '\n' >> makefile.log; \
+		echo; \
+	else \
+		echo "--> Found bottom assembly rendering: $(FAB_BOTTOM)"; \
+	fi
+
+renderfiles: renderfile_top renderfile_bottom
+
+clean:
+	rm -f $(OUTPUT_EXTS) *rst *pdf *.zip $(DUMMY_TARGETS) *_
+	rm -f makefile.log
+
+veryclean:
+	rm -rfv outputs $(PCBNAME)* $(NAME)*
+	rm -rfv *.jpg *.JPG *.pdf *.pdf *.png *.PNG
+	rm -f README* *rst *pdf *dvi
+
+.PHONY: dummies
+dummies:
+	@echo "Making placeholder filenames:"
+	@echo "$(DUMMY_TARGETS)" | xargs -n 1 echo +++
+	@touch $(DUMMY_TARGETS)
+
+
+gvp: gvp_template.gvp
+	sed -e "s/@@NAME@@/$(PCBNAME)/" < $< > $(PCBNAME).gvp
+
+copy:
+	cp $(DRILDIR)/$(NAME)-PTH.$(DRILL_EXT) $(DRILL_PTH) || echo "$(DRILL_FAIL)"|tr '|' '\n'
+	cp $(DRILDIR)/$(NAME)-NPTH.$(DRILL_EXT) $(DRILL_NPTH) || echo "$(DRILL_FAIL)"|tr '|' '\n'
+	cp $(GERBDIR)/$(NAME)-$(TOP_SOLDER_DSC).$(TOP_SOLDER_EXT) $(TOP_SOLDER_GBR) || echo "$(GBR_FAIL)" | tr '|' '\n'
+	cp $(GERBDIR)/$(NAME)-$(TOP_COPPER_DSC).$(TOP_COPPER_EXT) ./$(TOP_COPPER_GBR)
+	cp $(GERBDIR)/$(NAME)-$(TOP_SILK_DSC).$(TOP_SILK_EXT) ./$(TOP_SILK_GBR)
+	cp $(GERBDIR)/$(NAME)-$(BOT_SILK_DSC).$(BOT_SILK_EXT) ./$(BOT_SILK_GBR)
+	cp $(GERBDIR)/$(NAME)-$(BOT_SOLDER_DSC).$(BOT_SOLDER_EXT) ./$(BOT_SOLDER_GBR)
+	cp $(GERBDIR)/$(NAME)-$(BOT_COPPER_DSC).$(BOT_COPPER_EXT) ./$(BOT_COPPER_GBR)
+ifeq ($(SMT),yes)
+	cp $(GERBDIR)/$(NAME)-$(TOP_PASTE_DSC).$(TOP_PASTE_EXT) ./$(TOP_PASTE_GBR)
+	cp $(GERBDIR)/$(NAME)-$(BOT_PASTE_DSC).$(BOT_PASTE_EXT) ./$(BOT_PASTE_GBR)
+endif
+ifeq ($(LAYERS),4)
+	cp $(GERBDIR)/$(NAME)-$(GND1_DSC).$(GND1_EXT) ./$(GND1_GBR)
+	cp $(GERBDIR)/$(NAME)-$(GND2_DSC).$(GND2_EXT) ./$(GND2_GBR)
+endif
+	cp $(GERBDIR)/$(NAME)-$(OUTLN_DSC).$(OUTLN_EXT) ./$(OUTLN_GBR)
+
+gerbv:
+	gerbv \
+	$(OUTLN_GBR) \
+	$(DRILL_PTH) \
+	$(DRILL_NPTH) \
+	$(TOP_SOLDER_GBR) \
+	$(TOP_COPPER_GBR) \
+	$(PASTE_LAYERS) \
+	$(TOP_SILK_GBR) \
+	$(BOT_SILK_GBR) \
+	$(BOT_SOLDER_GBR) \
+	$(BOT_COPPER_GBR) \
+	$(INNER_PLANES) \
+	$(BOT_SILK_GBR)
+
+
+zip: all
+	rm -f $(ZIPFILE)
+	zip -9 $(ZIPFILE) \
+	$(OUTLN_GBR) \
+	$(DRILL_PTH) \
+	$(DRILL_NPTH) \
+	$(TOP_SOLDER_GBR) \
+	$(TOP_COPPER_GBR) \
+	$(PASTE_LAYERS) \
+	$(TOP_SILK_GBR) \
+	$(BOT_SOLDER_GBR) \
+	$(BOT_COPPER_GBR) \
+	$(BOT_SILK_GBR) \
+	$(INNER_PLANES) \
+	$(FAB_FILES) \
+	$(READMEFILEPDF) \
+	$(READMEFILETXT)

hardware/interface-ascii/production-package/programming_files_dir/README.rst

@@ -0,0 +1,4 @@
+Firmware Downloads
+==================
+
+Download the latest release of the firmware [here](https://osiweb.github.io/unified_retro_keyboard)

hardware/interface-ascii/production-package/templates_dir/bom.ini

@@ -0,0 +1,124 @@
+[BOM_OPTIONS]
+; General BoM options here
+; If 'ignore_dnf' option is set to 1, rows that are not to be fitted on the PCB will not be written to the BoM file
+ignore_dnf = 0
+; If 'html_generate_dnf' option is set to 1, also generate a list of components not fitted on the PCB (HTML only)
+html_generate_dnf = 1
+; If 'use_alt' option is set to 1, grouped references will be printed in the alternate compressed style eg: R1-R7,R18
+use_alt = 1
+; If 'alt_wrap' option is set to and integer N, the references field will wrap after N entries are printed
+alt_wrap = 0
+; If 'number_rows' option is set to 1, each row in the BoM will be prepended with an incrementing row number
+number_rows = 1
+; If 'group_connectors' option is set to 1, connectors with the same footprints will be grouped together, independent of the name of the connector
+group_connectors = 1
+; If 'test_regex' option is set to 1, each component group will be tested against a number of regular-expressions (specified, per column, below). If any matches are found, the row is ignored in the output file
+test_regex = 1
+; If 'merge_blank_fields' option is set to 1, component groups with blank fields will be merged into the most compatible group, where possible
+merge_blank_fields = 1
+; Specify output file name format, %O is the defined output name, %v is the version, %V is the variant name which will be ammended according to 'variant_file_name_format'.
+output_file_name = %O_bom_%v%V
+; Specify the variant file name format, this is a unique field as the variant is not always used/specified. When it is unused you will want to strip all of this.
+variant_file_name_format = _(%V)
+; Field name used to determine if a particular part is to be fitted
+fit_field = Fitted
+; Make a backup of the bom before generating the new one, using the following template
+make_backup = %O.tmp
+; Default number of boards to produce if none given on CLI with -n
+number_boards = 1
+; Default PCB variant if none given on CLI with -r
+board_variant = ['default']
+; Whether to hide headers from output file
+hide_headers = False
+; Whether to hide PCB info from output file
+hide_pcb_info = False
+
+[IGNORE_COLUMNS]
+; Any column heading that appears here will be excluded from the Generated BoM
+; Titles are case-insensitive
+
+Class
+Component Type
+Footprint
+Footprint Lib
+Material
+Number of Pins
+Package Variant
+Part
+Part Lib
+Power Rating
+RoHS China Link
+RoHS Europe Link
+SheetPath
+Standards Version
+Temp (Operating)
+Temp (Soldering)
+Temp (Storage)
+Temp Coeff.
+Tolerance
+Value
+Voltage Rating
+Current Rating
+
+
+[COLUMN_ORDER]
+; Columns will apear in the order they are listed here
+; Titles are case-insensitive
+References
+Fitted
+Quantity Per PCB
+Description
+Part Value
+Manufacturer
+Manufacturer PN
+Label
+BOM Comment
+
+
+[GROUP_FIELDS]
+; List of fields used for sorting individual components into groups
+; Components which match (comparing *all* fields) will be grouped together
+; Field names are case-insensitive
+Part
+Part Lib
+Value
+Footprint
+Footprint Lib
+
+[COMPONENT_ALIASES]
+; A series of values which are considered to be equivalent for the part name
+; Each line represents a list of equivalent component name values separated by white space
+; e.g. 'c c_small cap' will ensure the equivalent capacitor symbols can be grouped together
+; Aliases are case-insensitive
+c	c_small	cap	capacitor
+r	r_small	res	resistor
+sw	switch
+l	l_small	inductor
+zener	zenersmall
+d	diode	d_small
+
+[REGEX_INCLUDE]
+; A series of regular expressions used to include parts in the BoM
+; If there are any regex defined here, only components that match against ANY of them will be included in the BOM
+; Column names are case-insensitive
+; Format is: "[ColumName] [Regex]" (white-space separated)
+
+[REGEX_EXCLUDE]
+; A series of regular expressions used to exclude parts from the BoM
+; If a component matches ANY of these, it will be excluded from the BoM
+; Column names are case-insensitive
+; Format is: "[ColumName] [Regex]" (white-space separated)
+References	^TP[0-9]*
+References	^FID
+Part	mount.*hole
+Part	solder.*bridge
+Part	test.*point
+Footprint	test.*point
+Footprint	mount.*hole
+Footprint	fiducial
+Allow Substitution
+Tracking
+Package
+Manufacturer Link
+Component Value
+Datasheet

hardware/interface-osi/addon.kicad-pcb.pro

@@ -0,0 +1,33 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]

hardware/interface-osi/interface-osi.kicad_pro

@@ -0,0 +1,563 @@
+{
+  "board": {
+    "3dviewports": [],
+    "design_settings": {
+      "defaults": {
+        "board_outline_line_width": 0.049999999999999996,
+        "copper_line_width": 0.19999999999999998,
+        "copper_text_italic": false,
+        "copper_text_size_h": 1.5,
+        "copper_text_size_v": 1.5,
+        "copper_text_thickness": 0.3,
+        "copper_text_upright": false,
+        "courtyard_line_width": 0.049999999999999996,
+        "dimension_precision": 4,
+        "dimension_units": 3,
+        "dimensions": {
+          "arrow_length": 1270000,
+          "extension_offset": 500000,
+          "keep_text_aligned": true,
+          "suppress_zeroes": false,
+          "text_position": 0,
+          "units_format": 1
+        },
+        "fab_line_width": 0.09999999999999999,
+        "fab_text_italic": false,
+        "fab_text_size_h": 1.0,
+        "fab_text_size_v": 1.0,
+        "fab_text_thickness": 0.15,
+        "fab_text_upright": false,
+        "other_line_width": 0.09999999999999999,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": false,
+        "pads": {
+          "drill": 3.9878,
+          "height": 3.9878,
+          "width": 3.9878
+        },
+        "silk_line_width": 0.12,
+        "silk_text_italic": false,
+        "silk_text_size_h": 1.0,
+        "silk_text_size_v": 1.0,
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": false,
+        "zones": {
+          "45_degree_only": false,
+          "min_clearance": 0.508
+        }
+      },
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
+      "drc_exclusions": [],
+      "meta": {
+        "filename": "board_design_settings.json",
+        "version": 2
+      },
+      "rule_severities": {
+        "annular_width": "error",
+        "clearance": "error",
+        "connection_width": "warning",
+        "copper_edge_clearance": "error",
+        "copper_sliver": "warning",
+        "courtyards_overlap": "error",
+        "diff_pair_gap_out_of_range": "error",
+        "diff_pair_uncoupled_length_too_long": "error",
+        "drill_out_of_range": "error",
+        "duplicate_footprints": "warning",
+        "extra_footprint": "warning",
+        "footprint": "error",
+        "footprint_type_mismatch": "error",
+        "hole_clearance": "error",
+        "hole_near_hole": "error",
+        "invalid_outline": "error",
+        "isolated_copper": "warning",
+        "item_on_disabled_layer": "error",
+        "items_not_allowed": "error",
+        "length_out_of_range": "error",
+        "lib_footprint_issues": "warning",
+        "lib_footprint_mismatch": "warning",
+        "malformed_courtyard": "error",
+        "microvia_drill_out_of_range": "error",
+        "missing_courtyard": "ignore",
+        "missing_footprint": "warning",
+        "net_conflict": "warning",
+        "npth_inside_courtyard": "ignore",
+        "padstack": "error",
+        "pth_inside_courtyard": "ignore",
+        "shorting_items": "error",
+        "silk_edge_clearance": "warning",
+        "silk_over_copper": "warning",
+        "silk_overlap": "warning",
+        "skew_out_of_range": "error",
+        "solder_mask_bridge": "error",
+        "starved_thermal": "error",
+        "text_height": "warning",
+        "text_thickness": "warning",
+        "through_hole_pad_without_hole": "error",
+        "too_many_vias": "error",
+        "track_dangling": "warning",
+        "track_width": "error",
+        "tracks_crossing": "error",
+        "unconnected_items": "error",
+        "unresolved_variable": "error",
+        "via_dangling": "warning",
+        "zones_intersect": "error"
+      },
+      "rule_severitieslegacy_courtyards_overlap": true,
+      "rule_severitieslegacy_no_courtyard_defined": false,
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "max_error": 0.005,
+        "min_clearance": 0.0,
+        "min_connection": 0.0,
+        "min_copper_edge_clearance": 0.049999999999999996,
+        "min_hole_clearance": 0.25,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.19999999999999998,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_resolved_spokes": 1,
+        "min_silk_clearance": 0.0,
+        "min_text_height": 0.7999999999999999,
+        "min_text_thickness": 0.08,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.19999999999999998,
+        "min_via_annular_width": 0.049999999999999996,
+        "min_via_diameter": 0.39999999999999997,
+        "solder_mask_to_copper_clearance": 0.0,
+        "use_height_for_length_calcs": true
+      },
+      "teardrop_options": [
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 5,
+          "td_on_pad_in_zone": false,
+          "td_onpadsmd": true,
+          "td_onroundshapesonly": false,
+          "td_ontrackend": false,
+          "td_onviapad": true
+        }
+      ],
+      "teardrop_parameters": [
+        {
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_target_name": "td_round_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_target_name": "td_rect_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_target_name": "td_track_end",
+          "td_width_to_size_filter_ratio": 0.9
+        }
+      ],
+      "track_widths": [
+        0.0,
+        0.254,
+        0.508,
+        1.27
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        },
+        {
+          "diameter": 1.27,
+          "drill": 0.7112
+        }
+      ],
+      "zones_allow_external_fillets": false,
+      "zones_use_no_outline": true
+    },
+    "layer_presets": [],
+    "viewports": []
+  },
+  "boards": [],
+  "cvpcb": {
+    "equivalence_files": []
+  },
+  "erc": {
+    "erc_exclusions": [],
+    "meta": {
+      "version": 0
+    },
+    "pin_map": [
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        2
+      ],
+      [
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        2,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        2,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2
+      ]
+    ],
+    "rule_severities": {
+      "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
+      "bus_to_bus_conflict": "error",
+      "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
+      "different_unit_footprint": "error",
+      "different_unit_net": "error",
+      "duplicate_reference": "error",
+      "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
+      "extra_units": "error",
+      "global_label_dangling": "warning",
+      "hier_label_mismatch": "error",
+      "label_dangling": "error",
+      "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
+      "multiple_net_names": "warning",
+      "net_not_bus_member": "warning",
+      "no_connect_connected": "warning",
+      "no_connect_dangling": "warning",
+      "pin_not_connected": "error",
+      "pin_not_driven": "error",
+      "pin_to_pin": "error",
+      "power_pin_not_driven": "error",
+      "similar_labels": "warning",
+      "simulation_model_issue": "ignore",
+      "unannotated": "error",
+      "unit_value_mismatch": "error",
+      "unresolved_variable": "error",
+      "wire_dangling": "error"
+    }
+  },
+  "libraries": {
+    "pinned_footprint_libs": [],
+    "pinned_symbol_libs": []
+  },
+  "meta": {
+    "filename": "interface-osi.kicad_pro",
+    "version": 1
+  },
+  "net_settings": {
+    "classes": [
+      {
+        "bus_width": 12,
+        "clearance": 0.2,
+        "diff_pair_gap": 0.254,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2032,
+        "line_style": 0,
+        "microvia_diameter": 0.3048,
+        "microvia_drill": 0.1016,
+        "name": "Default",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.254,
+        "via_diameter": 0.8128,
+        "via_drill": 0.4064,
+        "wire_width": 6
+      },
+      {
+        "bus_width": 12,
+        "clearance": 0.254,
+        "diff_pair_gap": 0.254,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2032,
+        "line_style": 0,
+        "microvia_diameter": 0.3048,
+        "microvia_drill": 0.1016,
+        "name": "power1",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 1.27,
+        "via_diameter": 1.27,
+        "via_drill": 0.7112,
+        "wire_width": 6
+      },
+      {
+        "bus_width": 12,
+        "clearance": 0.2032,
+        "diff_pair_gap": 0.254,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2032,
+        "line_style": 0,
+        "microvia_diameter": 0.3048,
+        "microvia_drill": 0.1016,
+        "name": "signal",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.254,
+        "via_diameter": 0.8128,
+        "via_drill": 0.4064,
+        "wire_width": 6
+      }
+    ],
+    "meta": {
+      "version": 3
+    },
+    "net_colors": null,
+    "netclass_assignments": null,
+    "netclass_patterns": [
+      {
+        "netclass": "power1",
+        "pattern": "+5V"
+      },
+      {
+        "netclass": "signal",
+        "pattern": "/Col0"
+      }
+    ]
+  },
+  "pcbnew": {
+    "last_paths": {
+      "gencad": "",
+      "idf": "",
+      "netlist": "unikbd.net",
+      "specctra_dsn": "",
+      "step": "",
+      "vrml": ""
+    },
+    "page_layout_descr_file": ""
+  },
+  "schematic": {
+    "annotate_start_num": 0,
+    "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
+      "default_line_thickness": 6.0,
+      "default_text_size": 50.0,
+      "field_names": [],
+      "intersheets_ref_own_page": false,
+      "intersheets_ref_prefix": "",
+      "intersheets_ref_short": false,
+      "intersheets_ref_show": false,
+      "intersheets_ref_suffix": "",
+      "junction_size_choice": 3,
+      "label_size_ratio": 0.25,
+      "pin_symbol_size": 25.0,
+      "text_offset_ratio": 0.08
+    },
+    "legacy_lib_dir": "",
+    "legacy_lib_list": [],
+    "meta": {
+      "version": 1
+    },
+    "net_format_name": "",
+    "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0,
+      "workbook_filename": ""
+    },
+    "page_layout_descr_file": "",
+    "plot_directory": "",
+    "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
+    "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_voltages": false,
+    "subpart_first_id": 65,
+    "subpart_id_separator": 0
+  },
+  "sheets": [
+    [
+      "50196238-bbf7-4088-9344-c43b4f7afe2f",
+      ""
+    ],
+    [
+      "00000000-0000-0000-0000-00006013a2e7",
+      "Sound"
+    ],
+    [
+      "00000000-0000-0000-0000-00005d770c6b",
+      "special_keys"
+    ]
+  ],
+  "text_variables": {}
+}