Refactor keymap and RGB settings for Cheapino2: update manufacturer name, adjust default hue, and optimize layer color mappings

Tried 16, but bumped in to some memory restriction...
Reft: https://github.com/tompi/cheapino/issues/51

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,41 +0,0 @@
-name: Bug report
-description: Create a report to help us improve QMK Firmware.
-title: "[Bug] "
-labels: ["bug", "help wanted"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Provide a general summary of the bug in the title above.
-  - type: textarea
-    attributes:
-      label: Describe the Bug
-      description: A clear and concise description of what the bug is.
-  - type: input
-    attributes:
-      label: Keyboard Used
-      description: The name of the keyboard from the `make` or `qmk compile`/`qmk flash` commands, eg. `planck/rev6`.
-  - type: input
-    attributes:
-      label: Link to product page (if applicable)
-  - type: input
-    attributes:
-      label: Operating System
-  - type: textarea
-    attributes:
-      label: qmk doctor Output
-      description: Output from running the `qmk doctor` command.
-      render: text
-  - type: checkboxes
-    attributes:
-      label: Is AutoHotKey / Karabiner installed
-      options:
-        - label: AutoHotKey (Windows)
-        - label: Karabiner (macOS)
-  - type: input
-    attributes:
-      label: Other keyboard-related software installed
-  - type: textarea
-    attributes:
-      label: Additional Context
-      description: Add any other relevant information about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: QMK Discord
-    url: https://discord.gg/Uq7gcHh
-    about: Ask questions, discuss issues and features. Chill.
-  - name: OLKB Subreddit
-    url: https://www.reddit.com/r/olkb
-    about: All things OLKB and QMK.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,24 +0,0 @@
-name: Feature request
-description: Suggest a new feature or changes to existing features.
-title: "[Feature Request] "
-labels: ["enhancement", "help wanted"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Provide a general summary of the changes you want in the title above.
-
-        Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
-        Your best bet is to take the initiative, add support, then submit a PR yourself.
-  - type: checkboxes
-    attributes:
-      label: Feature Request Type
-      options:
-        - label: Core functionality
-        - label: Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
-        - label: Alteration (enhancement/optimization) of existing feature(s)
-        - label: New behavior
-  - type: textarea
-    attributes:
-      label: Description
-      description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.

.github/ISSUE_TEMPLATE/other_issues.yml

@@ -1,19 +0,0 @@
-name: Other issues
-description: Anything else that doesn't fall into the above categories.
-labels: ["help wanted", "question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Provide a general summary of the changes you want in the title above.
-  - type: markdown
-    attributes:
-      value: |
-        Please check [https://docs.qmk.fm/#/support](https://docs.qmk.fm/#/support) for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate.
-
-        Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
-        Your best bet is to take the initiative, add support, then submit a PR yourself.
-  - type: textarea
-    attributes:
-      label: Issue Description
-      description: Describe your issue in as much detail as possible.

.github/ISSUE_TEMPLATE/zzz_blank.md

@@ -1,11 +0,0 @@
----
-name: Blank issue
-about: If you're 100% sure that you don't need one of the other issue templates, use
-  this one instead.
-title: ''
-labels: help wanted, question
-assignees: ''
-
----
-
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,35 +1,29 @@
-<!--- Provide a general summary of your changes in the title above. -->
+<!---
 
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
+    If you are submitting a Vial-enabled keymap for a keyboard in QMK:
 
-## Description
+    - Keymaps will not be accepted with VIAL_INSECURE=yes.
+    - Avoid changing keyboard-level code if possible. (ex: switching the encoder pins in info.json)
+    - Please name your keymap "vial". Personal keymaps are not accepted at this time.
+      - If your Vial keymap only works for a specific keyboard revision, place it under that revision's folder. (ex: keyboards/planck/rev6_drop/keymaps/vial and keyboards/planck/ez/glow/keymaps/vial)
 
-<!--- Describe your changes in detail here. -->
+    If you are submitting a new keyboard with keymaps:
 
-## Types of Changes
+    - If you are also submitting this keyboard to QMK, please try to submit mostly the same code to both repos if possible.
+    - If you are not submitting this keyboard to QMK, only include "default" and "vial" keymaps. VIA firmware can no longer be built by this repository.
 
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->
-- [ ] Core
-- [ ] Bugfix
-- [ ] New feature
-- [ ] Enhancement/optimization
-- [ ] Keyboard (addition or update)
-- [ ] Keymap/layout/userspace (addition or update)
-- [ ] Documentation
+    ------
 
-## Issues Fixed or Closed by This PR
+    For all keyboard and keymap submissions:
 
-* 
+    As the submitter, you are ultimately responsible for maintaining the keyboards/keymaps you submit.
+    Vial contributors will try to fix compilation issues as updates are made, but are not always familiar with and often can't test specific keymaps/keyboards.
 
-## Checklist
+    Vial is decentralized, so inclusion in the vial-qmk repository is optional. Unmaintained keymaps/keyboards which are broken and cannot be fixed without extensive rework or strong familiarity with the hardware may be removed from this repository, with or without warning.
 
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project: [**C**](https://docs.qmk.fm/#/coding_conventions_c), [**Python**](https://docs.qmk.fm/#/coding_conventions_python)
-- [ ] I have read the [**PR Checklist** document](https://docs.qmk.fm/#/pr_checklist) and have made the appropriate changes.
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
-- [ ] I have read the [**CONTRIBUTING** document](https://docs.qmk.fm/#/contributing).
-- [ ] I have added tests to cover my changes.
-- [ ] I have tested the changes and verified that they work and don't break anything (as well as I can manage).
+    ------
+
+    For core changes, please explain what you are changing and why.
+
+    Before submitting a PR, delete the entirety of this comment and document your changes.
+-->

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    labels: CI
-    reviewers:
-      - "qmk/collaborators"
-    schedule:
-      interval: "daily"

.github/labeler.yml

@@ -1,46 +0,0 @@
-core:
-  - quantum/**/*
-  - tmk_core/**/*
-  - drivers/**/*
-  - tests/**/*
-  - util/**/*
-  - platforms/**/*
-  - builddefs/**/*
-  - Makefile
-  - '*.mk'
-dependencies:
-  - any:
-    - 'lib/**/*'
-    - '!lib/python/**/*'
-keyboard:
-  - any:
-    - 'keyboards/**/*'
-    - '!keyboards/**/keymaps/**/*'
-keymap:
-  - users/**/*
-  - layouts/**/*
-  - keyboards/**/keymaps/**/*
-via:
-  - keyboards/**/keymaps/via/*
-cli:
-  - requirements.txt
-  - lib/python/**/*
-python:
-  - '**/*.py'
-documentation:
-  - docs/**/*
-translation:
-  - docs/fr-fr/**/*
-  - docs/es/**/*
-  - docs/ja/**/*
-  - docs/he-il/**/*
-  - docs/pt-br/**/*
-  - docs/zh-cn/**/*
-  - docs/de/**/*
-  - docs/ru-ru/**/*
-CI:
-  - .github/**/*
-dd:
-  - data/constants/**/*
-  - data/mappings/**/*
-  - data/schemas/**/*

.github/workflows/api.yml

@@ -1,50 +0,0 @@
-name: Update API Data
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-    - master
-    - develop
-    paths:
-    - 'keyboards/**'
-    - 'layouts/community/**'
-    - 'lib/python/**'
-    - 'data/**'
-    - '.github/workflows/api.yml'
-  workflow_dispatch:
-
-jobs:
-  api_data:
-    runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
-
-    # protect against those who work in their fork on 'important' branches
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-        persist-credentials: false
-
-    - name: Install dependencies
-      run: |
-        pip3 install -r requirements-dev.txt
-
-    - name: Generate API Data
-      run: |
-        qmk generate-api
-
-    - name: Upload API Data
-      uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --acl public-read --follow-symlinks --delete
-      env:
-        AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
-        AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
-        AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
-        SOURCE_DIR: '.build/api_data'

.github/workflows/auto_approve.yml

@@ -1,20 +0,0 @@
-name: Automatic Approve
-
-permissions: {}
-
-on:
-  schedule:
-    - cron: "*/5 * * * *"
-
-jobs:
-  automatic_approve:
-    runs-on: ubuntu-latest
-
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: mheap/automatic-approve-action@v1
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        workflows: "format.yml,lint.yml,unit_test.yml"
-        dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"

.github/workflows/auto_tag.yml

@@ -1,38 +0,0 @@
-name: Essential files modified
-
-permissions:
-  contents: write
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-    - master
-    paths:
-    - builddefs/**/*
-    - drivers/**/*
-    - platforms/**/*
-    - quantum/**/*
-    - tests/**/*
-    - tmk_core/**/*
-    - util/**/*
-    - Makefile
-    - '*.mk'
-
-jobs:
-  tag:
-    runs-on: ubuntu-latest
-
-    # protect against those who develop with their fork on master
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.66.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DEFAULT_BUMP: 'patch'

.github/workflows/ci.yml

@@ -0,0 +1,102 @@
+name: CI
+on: [ pull_request, push, workflow_dispatch ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  REGEX_ANSI_COLOR: 's/\x1b\[[0-9;]*[mGKHF]//g'
+  REGEX_MAKE_OUTPUT: '/^g*make\[1]: \(Enter\|Leav\)ing directory ''/d'
+
+permissions: {}
+
+jobs:
+  check-uid:
+    name: Check Vial UIDs
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: (actions) Checkout Vial repo
+      uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+
+    - name: Verify Vial UID is unique per-keyboard
+      run: python3 util/ci_vial_verify_uid.py
+
+  build-default:
+    name: Build default keymaps for Vial
+    runs-on: ubuntu-latest
+    container: ghcr.io/qmk/qmk_cli
+    env:
+      KEYMAP: default
+
+    steps:
+    - name: (actions) Checkout Vial repo
+      uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+        submodules: recursive
+
+    - name: Build
+      id: build
+      run: |
+        git config --global --add safe.directory $(pwd)
+        if ! qmk mass-compile -j $(nproc) $(qmk find -km vial | sed "s/:vial$/:${KEYMAP}/");
+          then
+          echo "::error::$(ls -1 .build/failed.log.* | wc -l) keymaps failed to build. See logs and/or job summary for details."
+          exit 1
+        fi
+
+    - name: Dump failure logs
+      if: ${{ failure() && steps.build.conclusion == 'failure' }}
+      run: |
+        echo '### Failure logs' | tee -a "${GITHUB_STEP_SUMMARY}"
+
+        cd .build || exit 1
+        for log in failed.log.*; do
+          pretty_logname="$(echo "${log}" | sed "s/^failed\.log\.[0-9]\+\.// ; s/\.${KEYMAP}$//")"
+
+          printf '\n::group::%s\n%s\n::endgroup::\n' "${pretty_logname}" "$(sed "${REGEX_MAKE_OUTPUT}" < "${log}")"
+          printf '\n<details>\n<summary>%s</summary>\n\n```\n%s\n```\n\n</details>\n' \
+             "${pretty_logname}" "$(sed "${REGEX_MAKE_OUTPUT} ; ${REGEX_ANSI_COLOR}" < "${log}")" >> "${GITHUB_STEP_SUMMARY}"
+        done
+
+  build-vial:
+    name: Build Vial keymaps
+    runs-on: ubuntu-latest
+    container: ghcr.io/qmk/qmk_cli
+    env:
+      KEYMAP: vial
+
+    steps:
+    - name: (actions) Checkout Vial repo
+      uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+        submodules: recursive
+
+    - name: Build
+      id: build
+      run: |
+        git config --global --add safe.directory $(pwd)
+        if ! qmk mass-compile -km "${KEYMAP}" -j $(nproc);
+          then
+          echo "::error::$(ls -1 .build/failed.log.* | wc -l) keymaps failed to build. See logs and/or job summary for details."
+          exit 1
+        fi
+
+    - name: Dump failure logs
+      if: ${{ failure() && steps.build.conclusion == 'failure' }}
+      run: |
+        echo '### Failure logs' | tee -a "${GITHUB_STEP_SUMMARY}"
+
+        cd .build || exit 1
+        for log in failed.log.*; do
+          pretty_logname="$(echo "${log}" | sed "s/^failed\.log\.[0-9]\+\.// ; s/\.${KEYMAP}$//")"
+
+          printf '\n::group::%s\n%s\n::endgroup::\n' "${pretty_logname}" "$(sed "${REGEX_MAKE_OUTPUT}" < "${log}")"
+          printf '\n<details>\n<summary>%s</summary>\n\n```\n%s\n```\n\n</details>\n' \
+            "${pretty_logname}" "$(sed "${REGEX_MAKE_OUTPUT} ; ${REGEX_ANSI_COLOR}" < "${log}")" >> "${GITHUB_STEP_SUMMARY}"
+        done

.github/workflows/ci_builds.yml

@@ -1,74 +0,0 @@
-name: CI Builds
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches: [master, develop]
-  workflow_dispatch:
-    inputs:
-      branch:
-        type: choice
-        description: 'Branch to build'
-        options: [master, develop]
-
-concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
-
-jobs:
-  ci_builds:
-    if: github.repository == 'qmk/qmk_firmware'
-    name: "CI Build"
-    runs-on: self-hosted
-    timeout-minutes: 1380
-
-    strategy:
-      fail-fast: false
-      matrix:
-        keymap: [default, via]
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        ref: ${{ github.event.inputs.branch || github.ref }}
-
-    - name: Install dependencies
-      run: pip3 install -r requirements.txt
-
-    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
-      run: |
-        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
-        # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
-        # Exit with failure if the compilation stage failed
-        [ ! -f .failed ] || exit 1
-
-    - name: 'Upload artifacts'
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
-        if-no-files-found: ignore
-        path: |
-          *.bin
-          *.hex
-          *.uf2
-          .build/failed.*
-
-    - name: 'CI Discord Notification'
-      if: always()
-      working-directory: util/ci/
-      env:
-        DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
-      run: |
-        python3 -m pip install -r requirements.txt
-        python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/cli.yml

@@ -1,34 +0,0 @@
-name: CLI CI
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-    - master
-    - develop
-  pull_request:
-    paths:
-    - 'lib/python/**'
-    - 'requirements.txt'
-    - '.github/workflows/cli.yml'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
-    - name: Run tests
-      run: qmk pytest

.github/workflows/develop_update.yml

@@ -1,37 +0,0 @@
-name: Update develop after master merge
-
-permissions:
-  contents: write
-
-on:
-  push:
-    branches:
-    - master
-
-jobs:
-  develop_update:
-    runs-on: ubuntu-latest
-
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        fetch-depth: 0
-
-    - name: Disable automatic eol conversion
-      run: |
-        echo "* -text" > .git/info/attributes
-
-    - name: Checkout develop
-      run: |
-        git fetch origin master develop
-        git checkout develop
-
-    - name: Update develop from master
-      run: |
-        git config --global user.name "QMK Bot"
-        git config --global user.email "hello@qmk.fm"
-        git merge origin/master
-        git push origin develop

.github/workflows/docs.yml

@@ -1,46 +0,0 @@
-name: Generate Docs
-
-permissions:
-  contents: write
-
-on:
-  push:
-    branches:
-    - master
-    paths:
-    - 'tmk_core/**'
-    - 'quantum/**'
-    - 'platforms/**'
-    - 'docs/**'
-    - '.github/workflows/docs.yml'
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
-
-    # protect against those who develop with their fork on master
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-
-    - name: Install dependencies
-      run: |
-        apt-get update && apt-get install -y rsync nodejs npm doxygen
-        npm install -g moxygen
-
-    - name: Build docs
-      run: |
-        qmk --verbose generate-docs
-
-    - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        BASE_BRANCH: master
-        BRANCH: gh-pages
-        FOLDER: .build/docs
-        GIT_CONFIG_EMAIL: hello@qmk.fm

.github/workflows/feature_branch_update.yml

@@ -1,43 +0,0 @@
-name: Update feature branches after develop merge
-
-permissions:
-  contents: write
-
-on:
-  push:
-    branches:
-    - develop
-
-jobs:
-  feature_branch_update:
-    runs-on: ubuntu-latest
-
-    if: github.repository == 'qmk/qmk_firmware'
-
-    strategy:
-      matrix:
-        branch:
-        - xap
-        - riot
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        fetch-depth: 0
-
-    - name: Disable automatic eol conversion
-      run: |
-        echo "* -text" > .git/info/attributes
-
-    - name: Checkout branch
-      run: |
-        git fetch origin develop ${{ matrix.branch }}
-        git checkout ${{ matrix.branch }}
-
-    - name: Update branch from develop
-      run: |
-        git config --global user.name "QMK Bot"
-        git config --global user.email "hello@qmk.fm"
-        git merge origin/develop
-        git push origin ${{ matrix.branch }}

.github/workflows/format.yml

@@ -1,55 +0,0 @@
-name: PR Lint Format
-
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    paths:
-    - 'drivers/**'
-    - 'lib/arm_atsam/**'
-    - 'lib/lib8tion/**'
-    - 'lib/python/**'
-    - 'platforms/**'
-    - 'quantum/**'
-    - 'tests/**'
-    - 'tmk_core/**'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Install dependencies
-      run: |
-        pip3 install -r requirements-dev.txt
-
-    - name: Get changed files
-      id: file_changes
-      uses: tj-actions/changed-files@v40
-
-    - name: Run qmk formatters
-      shell: 'bash {0}'
-      run: |
-        echo '${{ steps.file_changes.outputs.added_files}}' '${{ steps.file_changes.outputs.modified_files}}' > ~/files_changed.txt
-        qmk format-c --core-only $(< ~/files_changed.txt) || true
-        qmk format-python $(< ~/files_changed.txt) || true
-        qmk format-text $(< ~/files_changed.txt) || true
-
-    - name: Fail when formatting required
-      run: |
-        git diff
-        for file in $(git diff --name-only); do
-          echo "File '${file}' Requires Formatting"
-          echo "::error file=${file}::Requires Formatting"
-        done
-        test -z "$(git diff --name-only)"

.github/workflows/format_push.yml

@@ -1,59 +0,0 @@
-name: Lint Format
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-    - master
-    - develop
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Disable automatic eol conversion
-      run: |
-        echo "* -text" > .git/info/attributes
-
-    - name: Install dependencies
-      run: |
-        pip3 install -r requirements-dev.txt
-
-    - name: Run qmk formatters
-      shell: 'bash {0}'
-      run: |
-        qmk format-c -a
-        qmk format-python -a
-        qmk format-text -a
-        git diff
-
-    - uses: rlespinasse/github-slug-action@v3.x
-
-    - name: Become QMK Bot
-      run: |
-        git config user.name 'QMK Bot'
-        git config user.email 'hello@qmk.fm'
-
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
-      if: ${{ github.repository == 'qmk/qmk_firmware'}}
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        delete-branch: true
-        branch: bugfix/format_${{ env.GITHUB_REF_SLUG }}
-        author: QMK Bot <hello@qmk.fm>
-        committer: QMK Bot <hello@qmk.fm>
-        commit-message: Format code according to conventions
-        title: '[CI] Format code according to conventions'

.github/workflows/labeler.yml

@@ -1,18 +0,0 @@
-name: "Pull Request Labeler"
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, ready_for_review, locked]
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: '.github/labeler.yml'

.github/workflows/lint.yml

@@ -1,83 +0,0 @@
-name: PR Lint keyboards
-
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    paths:
-    - 'keyboards/**'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
-
-    - name: Get changed files
-      id: file_changes
-      uses: tj-actions/changed-files@v40
-
-    - name: Print info
-      run: |
-        git rev-parse --short HEAD
-        echo ${{ github.event.pull_request.base.sha }}
-        echo '${{ steps.file_changes.outputs.all_changed_files}}'
-
-    - name: Run qmk lint
-      if: always()
-      shell: 'bash {0}'
-      run: |
-        QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.all_changed_files}}' | sed 's/ /\n/g')
-        QMK_KEYBOARDS=$(qmk list-keyboards)
-
-        exit_code=0
-
-        for KB in $QMK_KEYBOARDS; do
-          KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
-          if [[ -z "$KEYBOARD_CHANGES" ]]; then
-            # skip as no changes for this keyboard
-            continue
-          fi
-
-          KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
-          if [[ $KEYMAP_ONLY -gt 0 ]]; then
-            echo "linting ${KB}"
-
-            qmk lint --keyboard ${KB} && qmk info -l --keyboard ${KB}
-            exit_code=$(($exit_code + $?))
-          fi
-        done
-
-        qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
-        for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
-          if ! git diff --quiet $file; then
-            echo "File '${file}' Requires Formatting"
-            echo "::error file=${file}::Requires Formatting"
-            exit_code=$(($exit_code + 1))
-          fi
-        done
-
-        if [[ $exit_code -gt 255 ]]; then
-            exit 255
-        fi
-        exit $exit_code
-
-    - name: Verify keyboard aliases
-      if: always()
-      shell: 'bash {0}'
-      run: |
-        git reset --hard
-        git clean -xfd
-        qmk ci-validate-aliases

.github/workflows/regen.yml

@@ -1,36 +0,0 @@
-name: PR Regenerate Files
-
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    paths:
-    - 'data/constants/**'
-    - 'lib/python/**'
-
-jobs:
-  regen:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-
-    - name: Run qmk generators
-      run: |
-        util/regen.sh
-        git diff
-
-    - name: Fail when regeneration required
-      run: |
-        git diff
-        for file in $(git diff --name-only); do
-          echo "File '${file}' Requires Regeneration"
-          echo "::error file=${file}::Requires Regeneration"
-        done
-        test -z "$(git diff --name-only)"

.github/workflows/regen_push.yml

@@ -1,46 +0,0 @@
-name: Regenerate Files
-
-permissions:
-  contents: write
-
-on:
-  push:
-    branches:
-    - master
-    - develop
-
-jobs:
-  regen:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-
-    - name: Run qmk generators
-      run: |
-        util/regen.sh
-        git diff
-
-    - uses: rlespinasse/github-slug-action@v3.x
-
-    - name: Become QMK Bot
-      run: |
-        git config user.name 'QMK Bot'
-        git config user.email 'hello@qmk.fm'
-
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
-      if: ${{ github.repository == 'qmk/qmk_firmware'}}
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        delete-branch: true
-        branch: bugfix/regen_${{ env.GITHUB_REF_SLUG }}
-        author: QMK Bot <hello@qmk.fm>
-        committer: QMK Bot <hello@qmk.fm>
-        commit-message: Regenerate Files
-        title: '[CI] Regenerate Files'

.github/workflows/stale.yml

@@ -1,66 +0,0 @@
-name: 'Close stale issues and PRs'
-
-permissions:
-  issues: write
-  pull-requests: write
-  actions: write
-
-on:
-  schedule:
-    - cron: '30 1 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@main
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-          remove-stale-when-updated: true
-          exempt-draft-pr: true
-          ascending: true
-          operations-per-run: 150
-
-          stale-issue-label: stale
-          days-before-issue-stale: 90
-          days-before-issue-close: 30
-          exempt-issue-labels: bug,in progress,on hold,discussion,to do
-
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had activity in the
-            last 90 days. It will be closed in the next 30 days unless it is tagged properly or other activity
-            occurs.
-
-            For maintainers: Please label with `bug`, `in progress`, `on hold`, `discussion` or `to do` to prevent
-            the issue from being re-flagged.
-
-          close-issue-message: >
-            This issue has been automatically closed because it has not had activity in the last 30 days.
-            If this issue is still valid, re-open the issue and let us know.
-
-            // [stale-action-closed]
-
-          stale-pr-label: stale
-          days-before-pr-stale: 45
-          days-before-pr-close: 30
-          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold
-
-          stale-pr-message: >
-            Thank you for your contribution!
-
-            This pull request has been automatically marked as stale because it has not had
-            activity in the last 45 days. It will be closed in 30 days if no further activity occurs.
-            Please feel free to give a status update now, or re-open when it's ready.
-
-            For maintainers: Please label with `bug`, `awaiting review`, `breaking_change`, `in progress`, or `on hold`
-            to prevent the issue from being re-flagged.
-
-          close-pr-message: >
-            Thank you for your contribution!
-
-            This pull request has been automatically closed because it has not had activity in the last 30 days.
-            Please feel free to give a status update now, ping for review, or re-open when it's ready.
-
-            // [stale-action-closed]

.github/workflows/unit_test.yml

@@ -1,35 +0,0 @@
-name: Unit Tests
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-    - master
-    - develop
-  pull_request:
-    paths:
-    - 'builddefs/**'
-    - 'quantum/**'
-    - 'platforms/**'
-    - 'tmk_core/**'
-    - 'tests/**'
-    - '*.mk'
-    - 'Makefile'
-    - '.github/workflows/unit_test.yml'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
-    - name: Run tests
-      run: make test:all

.gitignore

@@ -29,6 +29,7 @@ quantum/version.h
 *.hex
 *.qmk
 *.uf2
+*.vfw
 
 # DD config at wrong location
 /keyboards/**/keymaps/*/info.json
@@ -107,7 +108,3 @@ user_song_list.h
 compile_commands.json
 .clangd/
 .cache/
-
-# VIA(L) files that don't belong in QMK repo
-via*.json
-/keyboards/**/keymaps/vial/*

builddefs/build_keyboard.mk

@@ -60,6 +60,7 @@ endif
 
 # Generate the board's version.h file.
 $(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
+$(shell python3 util/build_id.py >> $(INTERMEDIATE_OUTPUT)/src/version.h)
 
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)

builddefs/build_vial.mk

@@ -0,0 +1,36 @@
+# Copyright 2023 Ilya Zhuravlev
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+QMK_SETTINGS ?= yes
+TAP_DANCE_ENABLE ?= yes
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+    OPT_DEFS += -DTAPPING_TERM_PER_KEY
+endif
+COMBO_ENABLE ?= yes
+KEY_OVERRIDE_ENABLE ?= yes
+SRC += $(QUANTUM_DIR)/vial.c
+OPT_DEFS += -DVIAL_ENABLE -DNO_DEBUG -DSERIAL_NUMBER=\"vial:f64c2b3c\"
+
+ifeq ($(strip $(VIAL_INSECURE)), yes)
+    OPT_DEFS += -DVIAL_INSECURE
+endif
+
+ifeq ($(strip $(VIALRGB_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/vialrgb.c
+    OPT_DEFS += -DVIALRGB_ENABLE
+endif
+
+ifeq ($(strip $(QMK_SETTINGS)), yes)
+    AUTO_SHIFT_ENABLE := yes
+    SRC += $(QUANTUM_DIR)/qmk_settings.c
+    OPT_DEFS += -DQMK_SETTINGS \
+        -DAUTO_SHIFT_NO_SETUP -DAUTO_SHIFT_REPEAT_PER_KEY -DAUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY \
+        -DPERMISSIVE_HOLD_PER_KEY -DHOLD_ON_OTHER_KEY_PRESS_PER_KEY -DTAPPING_FORCE_HOLD_PER_KEY -DRETRO_TAPPING_PER_KEY \
+        -DCOMBO_TERM_PER_COMBO
+endif
+
+# Generate Vial layout definition header from JSON
+$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
+
+$(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json
+	python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h

builddefs/common_features.mk

@@ -615,6 +615,10 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     TRI_LAYER_ENABLE := yes
 endif
 
+ifeq ($(strip $(VIAL_ENABLE)), yes)
+    include $(BUILDDEFS_PATH)/build_vial.mk
+endif
+
 VALID_MAGIC_TYPES := yes
 BOOTMAGIC_ENABLE ?= no
 ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)

builddefs/common_rules.mk

@@ -267,6 +267,9 @@ gccversion :
 	fi
 	#$(SILENT) || printf "$(MSG_EXECUTING) '$(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null':\n" ;\
 	$(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
+	if [ ! -z "$(VIBL)" ]; then \
+		python3 util/vial_generate_vfw.py $(TARGET).bin $(TARGET).vfw $(CONFIG_H) ;\
+	fi
 
 BEGIN = gccversion sizebefore
 

data/schemas/keyboard.jsonschema

@@ -193,6 +193,7 @@
         "bootloader": {
             "type": "string",
             "enum": [
+                "vibl",
                 "apm32-dfu",
                 "atmel-dfu",
                 "bootloadhid",

keyboards/1upkeyboards/super16v2/keymaps/vial/config.h

@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x9D, 0xD0, 0xD5, 0xE1, 0x87, 0xF3, 0x54, 0xE2}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
+#define VIAL_UNLOCK_COMBO_COLS { 3, 3 }

keyboards/1upkeyboards/super16v2/keymaps/vial/keymap.c

@@ -0,0 +1,54 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4( /* Base */
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
+  ),
+
+  [2] = LAYOUT_ortho_4x4(
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [3] = LAYOUT_ortho_4x4(
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};

keyboards/1upkeyboards/super16v2/keymaps/vial/rules.mk

@@ -0,0 +1,8 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+QMK_SETTINGS = no
+TAP_DANCE_ENABLE = no
+COMBO_ENABLE = no
+KEY_OVERRIDE_ENABLE = no

keyboards/1upkeyboards/super16v2/keymaps/vial/vial.json

@@ -0,0 +1,48 @@
+{
+    "name": "Super16 V2",
+    "vendorId": "0x6F75",
+    "productId": "0x5517",
+    "lighting": "qmk_rgblight",
+    "matrix": {
+      "rows": 4,
+      "cols": 4
+    },
+    "layouts": {
+       "keymap":
+      [
+        [
+            "0,0\n\n\n\n\n\n\n\n\ne",
+            "0,1\n\n\n\n\n\n\n\n\ne",
+            "1,0\n\n\n\n\n\n\n\n\ne",
+            "1,1\n\n\n\n\n\n\n\n\ne"
+         ],
+         [
+            {
+               "y":0.25
+            },
+            "0,0",
+            "0,1",
+            "0,2",
+            "0,3"
+         ],
+         [
+            "1,0",
+            "1,1",
+            "1,2",
+            "1,3"
+         ],
+         [
+            "2,0",
+            "2,1",
+            "2,2",
+            "2,3"
+         ],
+         [
+            "3,0",
+            "3,1",
+            "3,2",
+            "3,3"
+         ]
+      ]
+    }
+  }

keyboards/3by2/3by2.c

@@ -0,0 +1 @@
+#include "3by2.h"

keyboards/3by2/3by2.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_h( K00, K01, K02, K03, K04, K05 ) \
+{ { K00, K01, K02 }, { K03, K04, K05 } }
+#define LAYOUT LAYOUT_h

keyboards/3by2/config.h

@@ -0,0 +1,26 @@
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xEEEE
+#define PRODUCT_ID      0x2019
+#define DEVICE_VER		0x0001
+#define MANUFACTURER    "Jan Lunge"
+#define PRODUCT         "3by2"
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+
+/* key matrix pins  for beccas board*/
+#define MATRIX_ROW_PINS { F6,B2 }
+#define MATRIX_COL_PINS { F7, B1, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define VIAL_KEYBOARD_UID {0x6F, 0xD2, 0x03, 0xC4, 0x16, 0xAF, 0x61, 0x27}
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 1 }

keyboards/3by2/info.json

@@ -0,0 +1,50 @@
+{
+    "keyboard_name": "3by2",
+    "keyboard": "3by2",
+    "url": "https://blog.heaper.de/3d-printed-macropad/",
+    "maintainer": "wlard",
+    "width": 3,
+    "height": 2,
+    "keymap": "default",
+    "layouts": {
+        "LAYOUT_horizontal": {
+            "key_count": 6,
+            "layout": [
+                {
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "x": 2,
+                    "y": 1
+                }
+            ]
+        }
+    },
+    "layers": [
+        [
+            "KC_F13",
+            "KC_F14",
+            "KC_F15",
+            "KC_F16",
+            "KC_F17",
+            "KC_F18"
+        ]
+    ]
+}

keyboards/3by2/keymaps/default/keymap.c

@@ -0,0 +1,8 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_h(
+		KC_F13 , KC_F14 , KC_F15,
+        KC_F16 , KC_F17 , KC_F18 
+    )
+};

keyboards/3by2/keymaps/vial/keymap.c

@@ -0,0 +1,54 @@
+#include QMK_KEYBOARD_H
+#include "raw_hid.h"
+#include "quantum.h"
+
+#define ____ KC_TRNS
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+       	KC_F13 , KC_F14 , KC_F15,
+        KC_F16 , KC_F17 , KC_F18
+    ),
+
+    [1] = LAYOUT(
+        ____, ____, ____,
+        ____, ____, ____
+    ),
+
+    [2] = LAYOUT(
+        ____, ____, ____,
+        ____, ____, ____
+    ),
+
+    [3] = LAYOUT(
+        ____, ____, ____,
+        ____, ____, ____ 
+    ),
+
+};
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    if(data[0] == 0xFC){
+        switch (data[1]) {
+            case 0x01:{
+                // move to layer
+                data[1] = 0xFD;
+                layer_move(data[2]);
+                break;
+            }
+            case 0x02:{
+                // turn on layer
+                data[1] = 0xFD;
+                layer_on(data[2]);
+                break;
+            }
+            case 0x03:{
+                // turn off layer
+                data[1] = 0xFD;
+                layer_off(data[2]);
+                break;
+            }
+        }
+    }
+    raw_hid_send(data, length);
+}

keyboards/3by2/keymaps/vial/rules.mk

@@ -0,0 +1,5 @@
+VIA_ENABLE 		= yes
+VIAL_ENABLE		= yes
+QMK_SETTINGS = no
+TAP_DANCE_ENABLE = no
+COMBO_ENABLE = no

keyboards/3by2/keymaps/vial/vial.json

@@ -0,0 +1,24 @@
+{
+    "name": "3by2",
+    "vendorId": "0xEEEE",
+    "productId": "0x2019",
+    "lighting": "none",
+    "matrix": {
+        "rows": 2,
+        "cols": 3
+    },
+    "layouts": {
+        "keymap": [
+            [
+                "0,0",
+                "0,1",
+                "0,2"
+            ],
+            [
+                "1,0",
+                "1,1",
+                "1,2"
+            ]
+        ]
+    }
+}

keyboards/3by2/readme.md

@@ -0,0 +1,21 @@
+# 3by2
+  ┌───┬───┬───┐
+  │K00│K01│K02│
+  ├───┼───┼───┤
+  │K03│K04│K05│
+  └───┴───┴───┘
+
+A 6 key mechanical keypad.
+
+Keyboard Maintainer: [wlard](https://github.com/wlard)  
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 3by2:default
+    
+or with vial support
+
+    make 3by2:via
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/3by2/rules.mk

@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+EXTRAKEY_ENABLE 	= yes
+NKRO_ENABLE 		= yes
+CONSOLE_ENABLE		= yes
+COMMAND_ENABLE		= yes
+MOUSEKEY_ENABLE 	= yes
+

keyboards/40percentclub/4x4/keymaps/vial/config.h

@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xAC, 0xB5, 0x77, 0x09, 0x6A, 0x6C, 0xB2, 0x28}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } //top left and bottom left corner
+#define VIAL_UNLOCK_COMBO_COLS { 0, 0 }
+
+#define VIAL_COMBO_ENTRIES 8

keyboards/40percentclub/4x4/keymaps/vial/keymap.c

@@ -0,0 +1,105 @@
+ /* Copyright 2021 Milan Düwel
+  *
+  * 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 2 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 <http://www.gnu.org/licenses/>.
+  */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    PAD,
+    _QW,
+    NUM,
+    DIR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Single 4x4 board only
+ * .-----------------------------------.
+ * |   7    |   8    |   9    |   /    |
+ * |--------+--------+--------+--------|
+ * |   4    |   5    |   6    |   *    |
+ * |--------+--------+--------+--------|
+ * |   1    |   2    |   3    |   -    |
+ * |--------+--------+--------+--------|
+ * |   0    | QWERTY |   .    |   +    |
+ * '-----------------------------------'
+ */
+
+  [PAD] = LAYOUT_ortho_4x16(
+  KC_KP_7, KC_KP_8, KC_KP_9,   KC_PSLS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW),
+  KC_KP_4, KC_KP_5, KC_KP_6,   KC_PAST, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW),
+  KC_KP_1, KC_KP_2, KC_KP_3,   KC_PMNS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW),
+  KC_KP_0, MO(DIR), KC_KP_DOT, KC_PPLS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW)
+  ),
+
+/* QWERTY
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | ESC    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BACKSP |   7    |   8    |   9    |   /    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | TAB    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |   4    |   5    |   6    |   *    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | SHIFT  | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | ENT/SFT|   1    |   2    |   3    |   -    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LCTRL  | LGUI   | ALT    | ALT    | NUM    | SHIFT  | SPACE  | DIR    | RGUI   | RALT   | DEL    | CTRL   |   0    |   0    |   .    |   +    |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_QW] = LAYOUT_ortho_4x16(
+  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_KP_7, KC_KP_8, KC_KP_9, KC_PSLS,
+  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, MO(NUM), KC_LSFT, KC_SPC,  MO(DIR), KC_RGUI, KC_RALT, KC_DEL,  KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT, KC_PPLS
+  ),
+
+/* NUMBERS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | NUMLOCK|   /    |   *    |   -    |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |    `   | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        |   +    |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | F11    | F12    |        |        |        | ENTER  | SHIFT  | RGUI   | ./ALT  | BKSC   |        |        |        | ENTER  |        |
+ * |        |        |        |        |        |        |        |        |        |        |CTRLhold|		   |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        | ENTER  | SHIFT  |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [NUM] = LAYOUT_ortho_4x16(
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______,
+   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS, _______,
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
+  _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______, _______
+  ),
+
+/* DIRECTIONS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | RESET  | TAB    |   up   |        | INS    | CTRL   | SHIFT  | PgUp   | Home   |   -    |   =    |  DEL   |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | CAPSLK | left   |  down  | right  | PrScr  | SHIFT  | CTRL   | PgDn   | End    |   [    |   ]    |   \    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | P-Brk  |        |        |        |        |        |        | RGUI   | ALT    |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | KEYPAD |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [DIR] = LAYOUT_ortho_4x16(
+  QK_BOOT,   KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL,  _______, _______, _______, _______,
+  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
+  _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, _______,
+  DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+};

keyboards/40percentclub/4x4/keymaps/vial/rules.mk

@@ -0,0 +1,6 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+
+LTO_ENABLE = yes
+TAP_DANCE_ENABLE = no
+QMK_SETTINGS = no

keyboards/40percentclub/4x4/keymaps/vial/vial.json

@@ -0,0 +1,30 @@
+{
+  "name": "The 4x4 Keyboard",
+  "vendorId": "0x4025",
+  "productId": "0x0A0C",
+  "lighting": "none",
+  "matrix": {"rows": 4, "cols": 16},
+  "layouts": {
+    "keymap": [
+      ["0,0","0,1","0,2","0,3",{"w": 12,"h": 4,"d": true},"3,15\n\n\n0,0"],
+      ["1,0","1,1","1,2","1,3"],
+      ["2,0","2,1","2,2","2,3"],
+      ["3,0","3,1","3,2","3,3"],
+      [{"y": 0.5,"x": 4},"0,4\n\n\n0,1","0,5\n\n\n0,1","0,6\n\n\n0,1","0,7\n\n\n0,1",{"w": 8,"h": 4,"d": true},"3,15\n\n\n0,1"],
+      [{"x": 4},"1,4\n\n\n0,1","1,5\n\n\n0,1","1,6\n\n\n0,1","1,7\n\n\n0,1"],
+      [{"x": 4},"2,4\n\n\n0,1","2,5\n\n\n0,1","2,6\n\n\n0,1","2,7\n\n\n0,1"],
+      [{"x": 4},"3,4\n\n\n0,1","3,5\n\n\n0,1","3,6\n\n\n0,1","3,7\n\n\n0,1"],
+      [{"y": 0.5,"x": 4},"0,4\n\n\n0,2","0,5\n\n\n0,2","0,6\n\n\n0,2","0,7\n\n\n0,2","0,8\n\n\n0,2","0,9\n\n\n0,2","0,10\n\n\n0,2","0,11\n\n\n0,2",{"w": 4,"h": 4,"d": true},"3,15\n\n\n0,2"],
+      [{"x": 4},"1,4\n\n\n0,2","1,5\n\n\n0,2","1,6\n\n\n0,2","1,7\n\n\n0,2","1,8\n\n\n0,2","1,9\n\n\n0,2","1,10\n\n\n0,2","1,11\n\n\n0,2"],
+      [{"x": 4},"2,4\n\n\n0,2","2,5\n\n\n0,2","2,6\n\n\n0,2","2,7\n\n\n0,2","2,8\n\n\n0,2","2,9\n\n\n0,2","2,10\n\n\n0,2","2,11\n\n\n0,2"],
+      [{"x": 4},"3,4\n\n\n0,2","3,5\n\n\n0,2","3,6\n\n\n0,2","3,7\n\n\n0,2","3,8\n\n\n0,2","3,9\n\n\n0,2","3,10\n\n\n0,2","3,11\n\n\n0,2"],
+      [{"y": 0.5,"x": 4},"0,4\n\n\n0,3","0,5\n\n\n0,3","0,6\n\n\n0,3","0,7\n\n\n0,3","0,8\n\n\n0,3","0,9\n\n\n0,3","0,10\n\n\n0,3","0,11\n\n\n0,3","0,12\n\n\n0,3","0,13\n\n\n0,3","0,14\n\n\n0,3","0,15\n\n\n0,3"],
+      [{"x": 4},"1,4\n\n\n0,3","1,5\n\n\n0,3","1,6\n\n\n0,3","1,7\n\n\n0,3","1,8\n\n\n0,3","1,9\n\n\n0,3","1,10\n\n\n0,3","1,11\n\n\n0,3","1,12\n\n\n0,3","1,13\n\n\n0,3","1,14\n\n\n0,3","1,15\n\n\n0,3"],
+      [{"x": 4},"2,4\n\n\n0,3","2,5\n\n\n0,3","2,6\n\n\n0,3","2,7\n\n\n0,3","2,8\n\n\n0,3","2,9\n\n\n0,3","2,10\n\n\n0,3","2,11\n\n\n0,3","2,12\n\n\n0,3","2,13\n\n\n0,3","2,14\n\n\n0,3","2,15\n\n\n0,3"],
+      [{"x": 4},"3,4\n\n\n0,3","3,5\n\n\n0,3","3,6\n\n\n0,3","3,7\n\n\n0,3","3,8\n\n\n0,3","3,9\n\n\n0,3","3,10\n\n\n0,3","3,11\n\n\n0,3","3,12\n\n\n0,3","3,13\n\n\n0,3","3,14\n\n\n0,3","3,15\n\n\n0,3"]
+    ],
+    "labels": [
+      ["Layout", "4x4", "4x8", "4x12", "4x16"]
+    ]
+  }
+}

keyboards/42keebs/basketweave_s/basketweave_s.c

@@ -0,0 +1,17 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "basketweave_s.h"

keyboards/42keebs/basketweave_s/basketweave_s.h

@@ -0,0 +1,40 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define ____ KC_NO
+
+#include "quantum.h"
+
+enum encoder_names {
+  _LEFT,
+  _RIGHT,
+};
+
+#define LAYOUT_default( \
+	  K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015, \
+	  K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115, \
+	  K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,         K215, \
+	         K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K214,  K315, \
+	         K401,  K402,         K404,         K406,         K408,         K410,  K411,         K412,  K413,  K314  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
+	{ ____,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315 }, \
+	{ ____,  K401,  K402,  ____,  K404,  ____,  K406,  ____,  K408,  ____,  K410,  K411,  K412,  K413,  ____,  ____ }  \
+}

keyboards/42keebs/basketweave_s/config.h

@@ -0,0 +1,59 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define VENDOR_ID       0x6B62
+#define PRODUCT_ID      0x6869
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    "42. Keebs"
+#define PRODUCT         "Basketweave-S"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
+#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1, C0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USB_MAX_POWER_CONSUMPTION 100
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+#define ENCODERS_PAD_A { B3, D1 }
+#define ENCODERS_PAD_B { B4, D0 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+

keyboards/42keebs/basketweave_s/info.json

@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Basketweave",
+    "url": "https://github.com/piit79/basketweave-s",
+    "maintainer": "piit79",
+    "width": 20,
+    "height": 5.25,
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"~", "x":1.5, "y":0},
+                {"label":"!", "x":2.5, "y":0},
+                {"label":"@", "x":3.5, "y":0},
+                {"label":"#", "x":4.5, "y":0},
+                {"label":"$", "x":5.5, "y":0},
+                {"label":"%", "x":6.5, "y":0},
+                {"label":"^", "x":7.5, "y":0},
+                {"label":"&", "x":10.5, "y":0},
+                {"label":"*", "x":11.5, "y":0},
+                {"label":"(", "x":12.5, "y":0},
+                {"label":")", "x":13.5, "y":0},
+                {"label":"_", "x":14.5, "y":0},
+                {"label":"+", "x":15.5, "y":0},
+                {"label":"Backspace", "x":16.5, "y":0, "w":2},
+                {"label":"Del", "x":17.5, "y":0},
+                {"label":"Page Up", "x":19, "y":0},
+                {"label":"Insert", "x":0, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":10, "y":1},
+                {"label":"U", "x":11, "y":1},
+                {"label":"I", "x":12, "y":1},
+                {"label":"O", "x":13, "y":1},
+                {"label":"P", "x":14, "y":1},
+                {"label":"{", "x":15, "y":1},
+                {"label":"}", "x":16, "y":1},
+                {"label":"|", "x":17, "y":1, "w":1.5},
+                {"label":"Page Dn", "x":19, "y":1},
+                {"label":"Mute", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+                {"label":"A", "x":3.25, "y":2},
+                {"label":"S", "x":4.25, "y":2},
+                {"label":"D", "x":5.25, "y":2},
+                {"label":"F", "x":6.25, "y":2},
+                {"label":"G", "x":7.25, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":":", "x":14.25, "y":2},
+                {"label":"\"", "x":15.25, "y":2},
+                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+                {"label":"Del", "x":19, "y":2},
+                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3},
+                {"label":"X", "x":4.75, "y":3},
+                {"label":"C", "x":5.75, "y":3},
+                {"label":"V", "x":6.75, "y":3},
+                {"label":"B", "x":7.75, "y":3},
+                {"label":"B", "x":9.75, "y":3},
+                {"label":"N", "x":10.75, "y":3},
+                {"label":"M", "x":11.75, "y":3},
+                {"label":"<", "x":12.75, "y":3},
+                {"label":">", "x":13.75, "y":3},
+                {"label":"?", "x":14.75, "y":3},
+                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
+                {"label":"Up", "x":17.75, "y":3.25},
+                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
+                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
+                {"label":"Space", "x":6, "y":4, "w":2},
+                {"label":"Fn", "x":8, "y":4},
+                {"label":"Space", "x":9.75, "y":4, "w":2.75},
+                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
+                {"label":"Left", "x":16.75, "y":4.25},
+                {"label":"Down", "x":17.75, "y":4.25},
+                {"label":"Right", "x":18.75, "y":4.25}
+            ]
+        }
+    }
+}

keyboards/42keebs/basketweave_s/keymaps/default/keymap.c

@@ -0,0 +1,59 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_default(  /* base */
+      KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PGUP,
+      KC_INS,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+      KC_MUTE, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_DEL,
+               KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+               KC_LCTL, KC_LALT,          KC_SPC,           MO(1),            KC_SPC,           KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+
+  [1] = LAYOUT_default(  /* fn */
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_LCTL, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_RALT, KC_RCTL,          KC_HOME, KC_PGDN, KC_END
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _LEFT) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == _RIGHT) {
+        if (clockwise) {
+            tap_code(KC_MS_WH_DOWN);
+        } else {
+            tap_code(KC_MS_WH_UP);
+        }
+    }
+    return true;
+}

keyboards/42keebs/basketweave_s/keymaps/via/keymap.c

@@ -0,0 +1,59 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_default(  /* base */
+      KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PGUP,
+      KC_INS,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+      KC_MUTE, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_DEL,
+               KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+               KC_LCTL, KC_LALT,          KC_SPC,           MO(1),            KC_SPC,           KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+
+  [1] = LAYOUT_default(  /* fn */
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_LCTL, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_RALT, KC_RCTL,          KC_HOME, KC_PGDN, KC_END
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _LEFT) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == _RIGHT) {
+        if (clockwise) {
+            tap_code(KC_MS_WH_DOWN);
+        } else {
+            tap_code(KC_MS_WH_UP);
+        }
+    }
+    return true;
+}

keyboards/42keebs/basketweave_s/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

keyboards/42keebs/basketweave_s/keymaps/vial/config.h

@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x82, 0x1C, 0x92, 0xC7, 0x6B, 0xC1, 0xB2, 0xA9}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 1, 13 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+#define VIAL_TAP_DANCE_ENTRIES 5
+#define VIAL_COMBO_ENTRIES 5
+#define VIAL_KEY_OVERRIDE_ENTRIES 5
+
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE

keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c

@@ -0,0 +1,75 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_default(  /* base */
+      KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PGUP,
+      KC_INS,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+      KC_MUTE, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_DEL,
+               KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+               KC_LCTL, KC_LALT,          KC_SPC,           MO(1),            KC_SPC,           KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+
+  [1] = LAYOUT_default(  /* fn */
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_LCTL, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_RALT, KC_RCTL,          KC_HOME, KC_PGDN, KC_END
+    ),
+
+  [2] = LAYOUT_default(
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+  [3] = LAYOUT_default(
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP), ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};

keyboards/42keebs/basketweave_s/keymaps/vial/rules.mk

@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes

keyboards/42keebs/basketweave_s/keymaps/vial/vial.json

@@ -0,0 +1,381 @@
+{
+  "name": "Basketweave",
+  "vendorId": "0x6B62",
+  "productId": "0x6869",
+  "lighting": "none",
+  "matrix": {
+    "rows": 5,
+    "cols": 16
+  },
+  "layouts": {
+    "labels": [
+      "Split Backspace",
+      "Encoder Left",
+      "Encoder Right"
+    ],
+    "keymap": [
+      {
+        "name": "Basketweave"
+      },
+      [
+        {
+          "y": 0.25,
+          "x": 16.15,
+          "c": "#aaaaaa"
+        },
+        "0,14\n\n\n0,1",
+        "3,15\n\n\n0,1"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 0.25,
+          "c": "#cccccc",
+          "d": true
+        },
+        "0,1\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "x": 18.5,
+          "d": true
+        },
+        "1,1\n\n\n2,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.3500000000000001,
+          "x": 1.5,
+          "c": "#aaaaaa"
+        },
+        "0,0",
+        {
+          "x": 16
+        },
+        "0,15"
+      ],
+      [
+        {
+          "y": -0.95,
+          "x": 4.75,
+          "c": "#cccccc"
+        },
+        "0,3",
+        {
+          "x": 8.4
+        },
+        "0,12"
+      ],
+      [
+        {
+          "y": -0.95,
+          "x": 2.75,
+          "c": "#777777"
+        },
+        "0,1",
+        {
+          "c": "#cccccc"
+        },
+        "0,2",
+        {
+          "x": 10.4
+        },
+        "0,13",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "0,14\n\n\n0,0"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 0.25,
+          "c": "#cccccc"
+        },
+        "0,1\n\n\n1,1\n\n\n\n\n\ne",
+        {
+          "x": 18.5
+        },
+        "1,1\n\n\n2,1\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.3500000000000001,
+          "x": 1.25,
+          "c": "#aaaaaa"
+        },
+        "1,0",
+        {
+          "x": 16.5
+        },
+        "1,15"
+      ],
+      [
+        {
+          "y": -0.9499999999999997,
+          "x": 14,
+          "c": "#cccccc"
+        },
+        "1,11"
+      ],
+      [
+        {
+          "y": -0.9500000000000002,
+          "x": 2.5,
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,1",
+        {
+          "c": "#cccccc"
+        },
+        "1,2",
+        {
+          "x": 10
+        },
+        "1,12",
+        "1,13",
+        {
+          "w": 1.5
+        },
+        "1,14"
+      ],
+      [
+        {
+          "y": -0.75
+        },
+        "0,0\n\n\n1,1\n\n\n\n\n\ne",
+        {
+          "x": 19
+        },
+        "1,0\n\n\n2,1\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.3500000000000001,
+          "x": 1,
+          "c": "#aaaaaa"
+        },
+        "2,0",
+        {
+          "x": 17
+        },
+        "2,15"
+      ],
+      [
+        {
+          "y": -0.8999999999999999,
+          "x": 2.25,
+          "w": 1.75
+        },
+        "2,1",
+        {
+          "c": "#cccccc"
+        },
+        "2,2",
+        {
+          "x": 9.4
+        },
+        "2,11",
+        "2,12",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,13"
+      ],
+      [
+        {
+          "y": -0.75,
+          "c": "#cccccc",
+          "d": true
+        },
+        "0,0\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "x": 19,
+          "d": true
+        },
+        "1,0\n\n\n2,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.25,
+          "x": 2,
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,1",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        {
+          "x": 8.85
+        },
+        "3,11",
+        "3,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,13"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 18.1,
+          "c": "#777777"
+        },
+        "2,14"
+      ],
+      [
+        {
+          "y": -0.25,
+          "x": 2,
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,1",
+        {
+          "x": 11.85,
+          "w": 1.5
+        },
+        "4,11"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 17.1,
+          "c": "#777777"
+        },
+        "4,12",
+        {
+          "x": 1
+        },
+        "3,14"
+      ],
+      [
+        {
+          "ry": 0.25,
+          "y": 5.25,
+          "x": 18.1
+        },
+        "4,13"
+      ],
+      [
+        {
+          "r": 12,
+          "ry": 0,
+          "x": 6.1,
+          "c": "#cccccc"
+        },
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7"
+      ],
+      [
+        {
+          "x": 5.6
+        },
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6"
+      ],
+      [
+        {
+          "x": 5.85
+        },
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6"
+      ],
+      [
+        {
+          "x": 6.3
+        },
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6"
+      ],
+      [
+        {
+          "x": 7.55,
+          "w": 2
+        },
+        "4,4",
+        {
+          "x": 0.05000000000000071,
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,6"
+      ],
+      [
+        {
+          "y": -0.8899999999999997,
+          "x": 6,
+          "w": 1.5
+        },
+        "4,2"
+      ],
+      [
+        {
+          "r": -12,
+          "y": -1.0099999999999998,
+          "x": 9.45,
+          "c": "#cccccc"
+        },
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11"
+      ],
+      [
+        {
+          "x": 9.05
+        },
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10"
+      ],
+      [
+        {
+          "x": 9.2
+        },
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10"
+      ],
+      [
+        {
+          "x": 8.75
+        },
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10"
+      ],
+      [
+        {
+          "x": 8.75,
+          "w": 2.75
+        },
+        "4,8"
+      ],
+      [
+        {
+          "y": -0.9000000000000004,
+          "x": 11.55,
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10"
+      ]
+    ]
+  }
+}

keyboards/42keebs/basketweave_s/readme.md

@@ -0,0 +1,17 @@
+# Basketweave-S
+
+![Basketweave-S](https://i.imgur.com/lXhMxQUl.jpg)
+
+A through-hole Alice style keyboard with arrow keys, symmetric macro keys, and rotary encoders
+
+Based on [null-l's Basketweave](https://github.com/null-l/basketweave)
+
+* Keyboard Maintainer: [piit79](https://github.com/piit79)
+* Hardware Supported: atmega32a
+* Hardware Availability: [42. Keebs](https://42keebs.eu), [Github](https://github.com/piit79/basketweave-s)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 42keebs/basketweave_s:vial
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/42keebs/basketweave_s/rules.mk

@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

keyboards/42keebs/discipline/config.h

@@ -0,0 +1,55 @@
+/*Copyright 2019 coseyfannitutti
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define VENDOR_ID       0x6B62
+#define PRODUCT_ID      0x6869
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    "coseyfannitutti"
+#define PRODUCT         "DISCIPLINE"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
+#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USB_MAX_POWER_CONSUMPTION 100
+
+#define ENCODERS_PAD_A { D0 }
+#define ENCODERS_PAD_B { D1 }
+#define ENCODER_DIRECTION_FLIP
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+

keyboards/42keebs/discipline/discipline.c

@@ -0,0 +1,16 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include "discipline.h"

keyboards/42keebs/discipline/discipline.h

@@ -0,0 +1,49 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define _x_ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_65_ansi( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+	{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+	{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_65_iso( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E }, \
+{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E }, \
+{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E }  \
+}

keyboards/42keebs/discipline/info.json

@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "DISCIPLINE",
+    "url": "https://github.com/coseyfannitutti/discipline",
+    "maintainer": "coseyfannitutti",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+                { "x": 14, "y": 0 },
+                { "x": 15, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+                { "x": 15, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+                { "x": 15, "y": 2 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+                { "x": 15, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4 },
+                { "x": 11, "y": 4 },
+                { "x": 12, "y": 4 },
+                { "x": 13, "y": 4 },
+                { "x": 14, "y": 4 },
+                { "x": 15, "y": 4 }
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+                { "x": 14, "y": 0 },
+                { "x": 15, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 15, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+                { "x": 15, "y": 2 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+                { "x": 15, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4 },
+                { "x": 11, "y": 4 },
+                { "x": 12, "y": 4 },
+                { "x": 13, "y": 4 },
+                { "x": 14, "y": 4 },
+                { "x": 15, "y": 4 }
+            ]
+        }
+    }
+}

keyboards/42keebs/discipline/keymaps/default/keymap.c

@@ -0,0 +1,46 @@
+/* Copyright 2019 COSEYFANNITUTTI
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_65_ansi(
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_DEL,  KC_ENT,   KC_PGUP,
+      KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN, 
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
+
+  [1] = LAYOUT_65_ansi(
+     /* esc    1        2        3        4       5       6       7       8       9        0        -         =        bkspc     `~  */
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PSCR,
+     /* tab    Q        W        E        R       T       Y       U       I       O        P        [         ]        \         delete*/ 
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,  KC_TRNS,
+     /* caps   A        S        D        F       G       H       J       K       L        ;        '         splitbs  enter     pg up*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_DEL,  KC_INS,   KC_HOME,
+     /* shift           Z        X        C       V       B       N       M       ,        .        /         shift    up        pg dn*/
+      KC_LSFT,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_TRNS, KC_TRNS, KC_TRNS,  KC_RSFT, KC_VOLU,  KC_END,
+     /* ctrl   win      alt                               space                   alt      fn       ctrl      left     down      right*/
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS, KC_RCTL,  KC_TRNS, KC_VOLD,  KC_TRNS)
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}

keyboards/42keebs/discipline/keymaps/vial/config.h

@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xD8, 0x84, 0x19, 0x63, 0x85, 0x1F, 0xCF, 0x6A}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+#define VIAL_TAP_DANCE_ENTRIES 7

keyboards/42keebs/discipline/keymaps/vial/keymap.c

@@ -0,0 +1,68 @@
+/* Copyright 2019 COSEYFANNITUTTI
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_65_iso(
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_DEL,   KC_DEL,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,   KC_PGUP,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
+
+  [1] = LAYOUT_65_iso(
+     /* esc    1        2        3        4       5       6       7       8       9        0        -         =        bkspc     `~  */
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PSCR,
+     /* tab    Q        W        E        R       T       Y       U       I       O        P        [         ]        spltbs    delete*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,  KC_TRNS,
+     /* caps   A        S        D        F       G       H       J       K       L        ;        '         #        enter     pg up*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,  KC_TRNS,  KC_HOME,
+     /* shift  \        Z        X        C       V       B       N       M       ,        .        /         shift    up        pg dn*/
+      KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_TRNS, KC_TRNS, KC_TRNS,  KC_RSFT, KC_VOLU,  KC_END,
+     /* ctrl   win      alt                               space                   alt      fn       ctrl      left     down      right*/
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS, KC_RCTL,  KC_TRNS, KC_VOLD,  KC_TRNS),
+
+  [2] = LAYOUT_65_iso(
+     /* esc    1        2        3        4       5       6       7       8       9        0        -         =        bkspc     `~  */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* tab    Q        W        E        R       T       Y       U       I       O        P        [         ]        spltbs    delete*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* caps   A        S        D        F       G       H       J       K       L        ;        '         #        enter     pg up*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* shift  \        Z        X        C       V       B       N       M       ,        .        /         shift    up        pg dn*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* ctrl   win      alt                               space                   alt      fn       ctrl      left     down      right*/
+      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS),
+
+  [3] = LAYOUT_65_iso(
+     /* esc    1        2        3        4       5       6       7       8       9        0        -         =        bkspc     `~  */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* tab    Q        W        E        R       T       Y       U       I       O        P        [         ]        spltbs    delete*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* caps   A        S        D        F       G       H       J       K       L        ;        '         #        enter     pg up*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* shift  \        Z        X        C       V       B       N       M       ,        .        /         shift    up        pg dn*/
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+     /* ctrl   win      alt                               space                   alt      fn       ctrl      left     down      right*/
+      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS)
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};

keyboards/42keebs/discipline/keymaps/vial/rules.mk

@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes

keyboards/42keebs/discipline/keymaps/vial/vial.json

@@ -0,0 +1,229 @@
+{
+    "matrix": { "rows": 5, "cols": 15 },
+    "layouts": {
+        "labels": [
+            "ISO Enter",
+            "Split Left Shift",
+            ["Spacebar", "6.25U", "7U"],
+            ["Right Modifiers", "1U", "1.5U"],
+            "Split Backspace",
+            "Encoder"
+        ],
+        "keymap": [
+            [
+                {
+                    "x": 2.5,
+                    "c": "#777777"
+                },
+                "0,0",
+                {
+                    "c": "#cccccc"
+                },
+                "0,1",
+                "0,2",
+                "0,3",
+                "0,4",
+                "0,5",
+                "0,6",
+                "0,7",
+                "0,8",
+                "0,9",
+                "0,10",
+                "0,11",
+                "0,12",
+                {
+                    "c": "#aaaaaa",
+                    "w": 2
+                },
+                "0,13\n\n\n4,0",
+                "0,14",
+                {
+                    "c": "#cccccc",
+                    "d": true
+                },
+                "\n\n\n5,0",
+                {
+                    "x": 1.5,
+                    "c": "#aaaaaa"
+                },
+                "0,13\n\n\n4,1",
+                "2,12\n\n\n4,1"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "w": 1.5
+                },
+                "1,0",
+                {
+                    "c": "#cccccc"
+                },
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9",
+                "1,10",
+                "1,11",
+                "1,12",
+                {
+                    "w": 1.5
+                },
+                "1,13\n\n\n0,0",
+                {
+                    "c": "#aaaaaa"
+                },
+                "1,14",
+                {
+                    "x": 3.25,
+                    "c": "#777777",
+                    "w": 1.25,
+                    "h": 2,
+                    "w2": 1.5,
+                    "h2": 1,
+                    "x2": -0.25
+                },
+                "1,13\n\n\n0,1"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "c": "#aaaaaa",
+                    "w": 1.75
+                },
+                "2,0",
+                {
+                    "c": "#cccccc"
+                },
+                "2,1",
+                "2,2",
+                "2,3",
+                "2,4",
+                "2,5",
+                "2,6",
+                "2,7",
+                "2,8",
+                "2,9",
+                "2,10",
+                "2,11",
+                {
+                    "c": "#777777",
+                    "w": 2.25
+                },
+                "2,13\n\n\n0,0",
+                {
+                    "c": "#aaaaaa"
+                },
+                "2,14",
+                {
+                    "x": 2.25,
+                    "c": "#cccccc"
+                },
+                "2,13\n\n\n0,1"
+            ],
+            [
+                {
+                    "c": "#aaaaaa",
+                    "w": 1.25
+                },
+                "3,0\n\n\n1,1",
+                {
+                    "c": "#cccccc"
+                },
+                "3,1\n\n\n1,1",
+                {
+                    "x": 0.25,
+                    "c": "#aaaaaa",
+                    "w": 2.25
+                },
+                "3,0\n\n\n1,0",
+                {
+                    "c": "#cccccc"
+                },
+                "3,2",
+                "3,3",
+                "3,4",
+                "3,5",
+                "3,6",
+                "3,7",
+                "3,8",
+                "3,9",
+                "3,10",
+                "3,11",
+                {
+                    "c": "#aaaaaa",
+                    "w": 1.75
+                },
+                "3,12",
+                "3,13",
+                "3,14",
+                {
+                    "x": 2.5,
+                    "c": "#cccccc"
+                },
+                "0,0\n\n\n5,1\n\n\n\n\n\ne",
+                "0,1\n\n\n5,1\n\n\n\n\n\ne"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "c": "#aaaaaa",
+                    "w": 1.25
+                },
+                "4,0\n\n\n2,0",
+                {
+                    "w": 1.25
+                },
+                "4,1\n\n\n2,0",
+                {
+                    "w": 1.25
+                },
+                "4,2\n\n\n2,0",
+                {
+                    "c": "#cccccc",
+                    "w": 6.25
+                },
+                "4,6\n\n\n2,0",
+                {
+                    "c": "#aaaaaa"
+                },
+                "4,9\n\n\n3,0",
+                "4,10\n\n\n3,0",
+                "4,11\n\n\n3,0",
+                "4,12",
+                "4,13",
+                "4,14"
+            ],
+            [
+                {
+                    "y": 0.25,
+                    "x": 2.5,
+                    "w": 1.5
+                },
+                "4,0\n\n\n2,1",
+                {
+                    "w": 1.5
+                },
+                "4,2\n\n\n2,1",
+                {
+                    "c": "#cccccc",
+                    "w": 7
+                },
+                "4,6\n\n\n2,1",
+                {
+                    "c": "#aaaaaa",
+                    "w": 1.5
+                },
+                "4,9\n\n\n3,1",
+                {
+                    "w": 1.5
+                },
+                "4,10\n\n\n3,1"
+            ]
+        ]
+    }
+}

keyboards/42keebs/discipline/readme.md

@@ -0,0 +1,21 @@
+# DISCIPLINE
+
+![discipline](https://i.imgur.com/OqQ1Ko8.jpg)
+
+A 65% keyboard that can be assembled with only through hole components, including usb type-c
+
+Based on [coseyfannitutti's](https://github.com/coseyfannitutti) [Discipline](https://github.com/coseyfannitutti/discipline)
+
+* Keyboard Maintainer: [piit79](https://github.com/piit79)
+* Hardware Supported: atmega32a
+* Hardware Availability: [42. Keebs](https://42keebs.eu), [Github](https://github.com/piit79/discipline)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 42keebs/discipline:vial
+
+Flashing example for this keyboard:
+
+    make 42keebs/discipline:vial:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/42keebs/discipline/rules.mk

@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = 65_ansi 65_iso

keyboards/42keebs/mysterium/config.h

@@ -0,0 +1,44 @@
+/*Copyright 2019 coseyfannitutti
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define VENDOR_ID       0x6B62
+#define PRODUCT_ID      0x8769
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    "coseyfannitutti"
+#define PRODUCT         "MYSTERIUM"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+#define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 }
+#define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D6, D5, D1, D0, D7 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0

keyboards/42keebs/mysterium/keymaps/default/keymap.c

@@ -0,0 +1,43 @@
+/* Copyright 2019 COSEYFANNITUTTI
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_tkl_ansi(
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,             KC_PSCR,  KC_SCRL, KC_MUTE,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,   KC_HOME, KC_PGUP,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,            KC_DEL,   KC_END,  KC_PGDN,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+      KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),                        KC_UP,
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, KC_RGUI, MO(1),    KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RIGHT),
+
+  [1] = LAYOUT_tkl_ansi(
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                      KC_VOLU,
+      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,  KC_VOLD, KC_TRNS)
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}

keyboards/42keebs/mysterium/keymaps/vial/config.h

@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x7F, 0x33, 0x72, 0x72, 0x50, 0x89, 0x55, 0x33}
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+#define VIAL_KEY_OVERRIDE_ENTRIES 6
+#define VIAL_COMBO_ENTRIES 6
+#define VIAL_TAP_DANCE_ENTRIES 6

keyboards/42keebs/mysterium/keymaps/vial/keymap.c

@@ -0,0 +1,48 @@
+/* Copyright 2019 COSEYFANNITUTTI
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_tkl_iso(
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,             KC_PSCR,  KC_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,   KC_HOME, KC_PGUP,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                     KC_DEL,   KC_END,  KC_PGDN,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),                        KC_UP,
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, KC_RGUI, MO(1),    KC_RCTL,                     KC_LEFT,  KC_DOWN, KC_RIGHT),
+
+  [1] = LAYOUT_tkl_iso(
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                      KC_VOLU,
+      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,  KC_VOLD, KC_TRNS),
+
+  [2] = LAYOUT_tkl_iso(
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                      KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_TRNS)
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(KC_NO, KC_NO) }
+};

keyboards/42keebs/mysterium/keymaps/vial/rules.mk

@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/42keebs/mysterium/keymaps/vial/vial.json

@@ -0,0 +1,327 @@
+{
+  "name": "Mysterium",
+  "vendorId": "0x6B62",
+  "productId": "0x8769",
+  "lighting": "none",
+  "matrix": {
+    "rows": 6,
+    "cols": 18
+  },
+  "layouts": {
+    "labels": [
+      [
+        "Bottom Row",
+        "6.25U",
+        "7U",
+        "Winkeyless"
+      ],
+      "ISO Enter",
+      "Split Left Shift",
+      "Split Backspace",
+      "Split Right Shift"
+    ],
+    "keymap": [
+      {
+        "name": "Mysterium VIAL"
+      },
+      [
+        {
+          "x": 2.5,
+          "c": "#777777"
+        },
+        "0,0",
+        {
+          "x": 1,
+          "c": "#cccccc"
+        },
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        {
+          "x": 0.5,
+          "c": "#aaaaaa"
+        },
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        {
+          "x": 0.5,
+          "c": "#cccccc"
+        },
+        "0,11",
+        "0,12",
+        "0,13",
+        "0,14",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa"
+        },
+        "0,15",
+        "0,16",
+        "0,17"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5,
+          "c": "#cccccc"
+        },
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "1,13\n\n\n3,0",
+        {
+          "x": 0.25
+        },
+        "1,15",
+        "1,16",
+        "1,17",
+        {
+          "x": 0.5
+        },
+        "1,13\n\n\n3,1",
+        "1,14\n\n\n3,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        "2,12",
+        {
+          "w": 1.5
+        },
+        "2,13\n\n\n1,0",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa"
+        },
+        "2,15",
+        "2,16",
+        "2,17",
+        {
+          "x": 1.25,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "3,13\n\n\n1,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "3,13\n\n\n1,0",
+        {
+          "x": 0.75,
+          "c": "#aaaaaa"
+        },
+        "0,0\n\n\n\n\n\n\n\n\ne",
+        "0,1\n\n\n\n\n\n\n\n\ne",
+        {
+          "x": 0.75,
+          "c": "#cccccc"
+        },
+        "2,13\n\n\n1,1"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,0\n\n\n2,1",
+        {
+          "c": "#cccccc"
+        },
+        "4,11\n\n\n2,1",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "4,0\n\n\n2,0",
+        {
+          "c": "#cccccc"
+        },
+        "4,1",
+        "4,2",
+        "4,3",
+        "4,4",
+        "4,5",
+        "4,6",
+        "4,7",
+        "4,8",
+        "4,9",
+        "4,10",
+        {
+          "c": "#aaaaaa",
+          "w": 2.75
+        },
+        "4,13\n\n\n4,0",
+        {
+          "x": 1.25
+        },
+        "4,16",
+        {
+          "x": 0.75,
+          "w": 1.75
+        },
+        "4,13\n\n\n4,1",
+        "4,14\n\n\n4,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.25
+        },
+        "5,0\n\n\n0,0",
+        {
+          "w": 1.25
+        },
+        "5,1\n\n\n0,0",
+        {
+          "w": 1.25
+        },
+        "5,2\n\n\n0,0",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "5,6\n\n\n0,0",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "5,9\n\n\n0,0",
+        {
+          "w": 1.25
+        },
+        "5,10\n\n\n0,0",
+        {
+          "w": 1.25
+        },
+        "5,12\n\n\n0,0",
+        {
+          "w": 1.25
+        },
+        "5,14\n\n\n0,0",
+        {
+          "x": 0.25
+        },
+        "5,15",
+        "5,16",
+        "5,17"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n0,1",
+        "5,1\n\n\n0,1",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n0,1",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "5,6\n\n\n0,1",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "5,10\n\n\n0,1",
+        "5,12\n\n\n0,1",
+        {
+          "w": 1.5
+        },
+        "5,14\n\n\n0,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n0,2",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "5,2\n\n\n0,2",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "5,6\n\n\n0,2",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "5,10\n\n\n0,2",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "5,14\n\n\n0,2"
+      ]
+    ]
+  }
+}

keyboards/42keebs/mysterium/mysterium.c

@@ -0,0 +1,16 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include "mysterium.h"

keyboards/42keebs/mysterium/mysterium.h

@@ -0,0 +1,30 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define _x_ KC_NO
+
+/**************************************************
+** Include headers specific to keyboard revision **
+**************************************************/
+#if defined(KEYBOARD_42keebs_mysterium_v15c)
+#    include "v15c.h"
+#elif defined(KEYBOARD_42keebs_mysterium_v15d)
+#    include "v15d.h"
+#endif

keyboards/42keebs/mysterium/readme.md

@@ -0,0 +1,18 @@
+# MYSTERIUM
+
+![mysterium](https://github.com/piit79/mysterium/raw/master/doc/images/mysterium.jpg)
+
+A TKL keyboard that can be assembled with only through hole components, including usb type-c
+
+Based on [coseyfannitutti's Mysterium](https://github.com/coseyfannitutti/mysterium)
+
+* Keyboard Maintainer: [piit79](https://github.com/piit79)
+* Hardware Supported: MYSTERIUM, atmega32a
+* Hardware Availability: [42. Keebs](https://42keebs.eu), [Github](https://github.com/piit79/mysterium)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 42keebs/mysterium/v15c:vial
+    make 42keebs/mysterium/v15d:vial
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/42keebs/mysterium/rules.mk

@@ -0,0 +1 @@
+DEFAULT_FOLDER=42keebs/mysterium/v15c

keyboards/42keebs/mysterium/v15c/config.h

@@ -0,0 +1,23 @@
+/*Copyright 2019 coseyfannitutti
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define ENCODERS_PAD_A { C0 }
+#define ENCODERS_PAD_B { C1 }
+#define ENCODER_DIRECTION_FLIP
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10

keyboards/42keebs/mysterium/v15c/rules.mk

@@ -0,0 +1,35 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = usbasploader
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+ENCODER_ENABLE = yes

keyboards/42keebs/mysterium/v15c/v15c.c

@@ -0,0 +1,16 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include "v15c.h"

keyboards/42keebs/mysterium/v15c/v15c.h

@@ -0,0 +1,87 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "mysterium.h"
+
+#define LAYOUT_tkl_ansi( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_ansi_7u( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                     \
+    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso_7u( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                     \
+    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}

keyboards/42keebs/mysterium/v15d/config.h

@@ -0,0 +1,21 @@
+/*Copyright 2019 coseyfannitutti
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define ENCODERS_PAD_A { B5 }
+#define ENCODERS_PAD_B { B6 }
+#define ENCODER_RESOLUTION 4

keyboards/42keebs/mysterium/v15d/rules.mk

@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = usbasploader
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+ENCODER_ENABLE = yes
+OLED_ENABLE = yes

keyboards/42keebs/mysterium/v15d/v15d.c

@@ -0,0 +1,20 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+#include "v15d.h"
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}

keyboards/42keebs/mysterium/v15d/v15d.h

@@ -0,0 +1,87 @@
+/* Copyright 2019 coseyfannitutti
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "mysterium.h"
+
+#define LAYOUT_tkl_ansi( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_ansi_7u( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                     \
+    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso_7u( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                     \
+    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D, K4E,      K4G,      \
+    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}

keyboards/4pplet/waffling60/rev_c/keymaps/vial/config.h

@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x4A, 0x24, 0xC6, 0x5E, 0x42, 0x4F, 0x90, 0x7D}
+
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
+#define VIAL_TAP_DANCE_ENTRIES 4
+

keyboards/4pplet/waffling60/rev_c/keymaps/vial/keymap.c

@@ -0,0 +1,48 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_LCTL, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};

keyboards/4pplet/waffling60/rev_c/keymaps/vial/rules.mk

@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+TAP_DANCE_ENABLE = no
+COMBO_ENABLE = no

keyboards/4pplet/waffling60/rev_c/keymaps/vial/vial.json

@@ -0,0 +1,418 @@
+{
+    "name": "waffling60 Rev C", 
+    "vendorId": "0x4444",
+    "productId": "0x0008",
+    "lighting": "qmk_rgblight",
+    "matrix": {"rows": 5, "cols": 14},
+    "layouts": {
+           "labels": [
+      "Split backspase",   
+      "ISO Enter",
+      "Split Left Shift", 
+      "Split Right Shift",
+      ["Bottom row", "7U WK", "7U WKL", "7U WK Split", "7U WKL Split", "6.25U WK", "6.25U WK Split","10U WK", "10U WKL"]
+    ],
+        "keymap": 
+[
+  [
+    {
+      "x": 3,
+      "c": "#aaaaaa"
+    },
+    "0,0",
+    {
+      "c": "#cccccc"
+    },
+    "0,1",
+    "0,2",
+    "0,3",
+    "0,4",
+    "0,5",
+    "0,6",
+    "0,7",
+    "0,8",
+    "0,9",
+    "0,10",
+    "0,11",
+    "0,12",
+    {
+      "c": "#aaaaaa",
+      "w": 2
+    },
+    "1,13\n\n\n0,0",
+    {
+      "x": 1.5,
+      "c": "#cccccc"
+    },
+    "0,13\n\n\n0,1",
+    {
+      "c": "#aaaaaa"
+    },
+    "1,13\n\n\n0,1"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "1,0",
+    {
+      "c": "#cccccc"
+    },
+    "1,1",
+    "1,2",
+    "1,3",
+    "1,4",
+    "1,5",
+    "1,6",
+    "1,7",
+    "1,8",
+    "1,9",
+    "1,10",
+    "1,11",
+    "1,12",
+    {
+      "c": "#aaaaaa",
+      "w": 1.5
+    },
+    "2,12\n\n\n1,0",
+    {
+      "x": 2.25,
+      "w": 1.25,
+      "h": 2,
+      "w2": 1.5,
+      "h2": 1,
+      "x2": -0.25
+    },
+    "2,13\n\n\n1,1"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.75
+    },
+    "2,0",
+    {
+      "c": "#cccccc"
+    },
+    "2,1",
+    "2,2",
+    "2,3",
+    "2,4",
+    "2,5",
+    "2,6",
+    "2,7",
+    "2,8",
+    "2,9",
+    "2,10",
+    "2,11",
+    {
+      "c": "#aaaaaa",
+      "w": 2.25
+    },
+    "2,13\n\n\n1,0",
+    {
+      "x": 1.25,
+      "c": "#cccccc"
+    },
+    "2,12\n\n\n1,1"
+  ],
+  [
+    {
+      "c": "#aaaaaa",
+      "w": 1.25
+    },
+    "3,0\n\n\n2,1",
+    "3,1\n\n\n2,1",
+    {
+      "x": 0.75,
+      "w": 2.25
+    },
+    "3,0\n\n\n2,0",
+    {
+      "c": "#cccccc"
+    },
+    "3,2",
+    "3,3",
+    "3,4",
+    "3,5",
+    "3,6",
+    "3,7",
+    "3,8",
+    "3,9",
+    "3,10",
+    "3,11",
+    {
+      "c": "#aaaaaa",
+      "w": 2.75
+    },
+    "3,12\n\n\n3,0",
+    {
+      "x": 0.75,
+      "w": 1.75
+    },
+    "3,12\n\n\n3,1",
+    "3,13\n\n\n3,1"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,0",
+    "4,1\n\n\n4,0",
+    {
+      "w": 1.5
+    },
+    "4,2\n\n\n4,0",
+    {
+      "c": "#cccccc",
+      "w": 7
+    },
+    "4,6\n\n\n4,0",
+    {
+      "c": "#aaaaaa",
+      "w": 1.5
+    },
+    "4,11\n\n\n4,0",
+    "4,12\n\n\n4,0",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,0"
+  ],
+  [
+    {
+      "y": 1,
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,1",
+    {
+      "d": true
+    },
+    "4,1\n\n\n4,1",
+    {
+      "w": 1.5
+    },
+    "4,2\n\n\n4,1",
+    {
+      "c": "#cccccc",
+      "w": 7
+    },
+    "4,6\n\n\n4,1",
+    {
+      "c": "#aaaaaa",
+      "w": 1.5
+    },
+    "4,11\n\n\n4,1",
+    {
+      "d": true
+    },
+    "4,12\n\n\n4,1",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,1"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,2",
+    "4,1\n\n\n4,2",
+    {
+      "w": 1.5
+    },
+    "4,2\n\n\n4,2",
+    {
+      "c": "#cccccc",
+      "w": 3
+    },
+    "4,4\n\n\n4,2",
+    "4,6\n\n\n4,2",
+    {
+      "w": 3
+    },
+    "4,8\n\n\n4,2",
+    {
+      "c": "#aaaaaa",
+      "w": 1.5
+    },
+    "4,11\n\n\n4,2",
+    "4,12\n\n\n4,2",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,2"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,3",
+    {
+      "d": true
+    },
+    "4,1\n\n\n4,3",
+    {
+      "w": 1.5
+    },
+    "4,2\n\n\n4,3",
+    {
+      "c": "#cccccc",
+      "w": 3
+    },
+    "4,4\n\n\n4,3",
+    "4,6\n\n\n4,3",
+    {
+      "w": 3
+    },
+    "4,8\n\n\n4,3",
+    {
+      "c": "#aaaaaa",
+      "w": 1.5
+    },
+    "4,11\n\n\n4,3",
+    {
+      "d": true
+    },
+    "4,12\n\n\n4,3",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,3"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.25
+    },
+    "4,0\n\n\n4,4",
+    {
+      "w": 1.25
+    },
+    "4,1\n\n\n4,4",
+    {
+      "w": 1.25
+    },
+    "4,2\n\n\n4,4",
+    {
+      "c": "#cccccc",
+      "w": 6.25
+    },
+    "4,6\n\n\n4,4",
+    {
+      "c": "#aaaaaa",
+      "w": 1.25
+    },
+    "4,10\n\n\n4,4",
+    {
+      "w": 1.25
+    },
+    "4,11\n\n\n4,4",
+    {
+      "w": 1.25
+    },
+    "4,12\n\n\n4,4",
+    {
+      "w": 1.25
+    },
+    "4,13\n\n\n4,4"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.25
+    },
+    "4,0\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,1\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,2\n\n\n4,5",
+    {
+      "c": "#cccccc",
+      "w": 2.25
+    },
+    "4,4\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,6\n\n\n4,5",
+    {
+      "w": 2.75
+    },
+    "4,8\n\n\n4,5",
+    {
+      "c": "#aaaaaa",
+      "w": 1.25
+    },
+    "4,10\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,11\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,12\n\n\n4,5",
+    {
+      "w": 1.25
+    },
+    "4,13\n\n\n4,5"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,6",
+    "4,1\n\n\n4,6",
+    {
+      "c": "#cccccc",
+      "w": 10
+    },
+    "4,6\n\n\n4,6",
+    {
+      "c": "#aaaaaa"
+    },
+    "4,12\n\n\n4,6",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,6"
+  ],
+  [
+    {
+      "x": 3,
+      "w": 1.5
+    },
+    "4,0\n\n\n4,7",
+    {
+      "d": true
+    },
+    "4,1\n\n\n4,7",
+    {
+      "c": "#cccccc",
+      "w": 10
+    },
+    "4,6\n\n\n4,7",
+    {
+      "c": "#aaaaaa",
+      "d": true
+    },
+    "4,12\n\n\n4,7",
+    {
+      "w": 1.5
+    },
+    "4,13\n\n\n4,7"
+  ]
+]
+    }
+}

keyboards/4pplet/waffling60/rev_d/keymaps/vial/config.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x59, 0xE1, 0x24, 0x06, 0xDB, 0xB0, 0xBB, 0x48}
+
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }

keyboards/4pplet/waffling60/rev_d/keymaps/vial/keymap.c

@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 2 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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
+};

keyboards/4pplet/waffling60/rev_d/keymaps/vial/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes

keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json

@@ -0,0 +1,424 @@
+{
+  "lighting": "qmk_rgblight",
+  "matrix": {"rows": 5, "cols": 14},
+  "layouts": {
+    "labels": [
+      [
+        "Bottom row",
+        "7U WK",
+        "7U WKL",
+        "7U WK Split",
+        "7U WKL Split",
+        "6.25U WK",
+        "6.25U WK Split",
+        "10U WK",
+        "10U WKL"
+      ],
+      "Split backspase",
+      "ISO Enter",
+      "Split Left Shift",
+      "Split Right Shift"
+    ],
+    "keymap": [
+      [
+        {
+          "x": 3,
+          "c": "#aaaaaa"
+        },
+        "0,0",
+        {
+          "c": "#cccccc"
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "2,13\n\n\n1,0",
+        {
+          "x": 1.5,
+          "c": "#cccccc"
+        },
+        "0,13\n\n\n1,1",
+        {
+          "c": "#aaaaaa"
+        },
+        "2,13\n\n\n1,1"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,13\n\n\n2,0",
+        {
+          "x": 2.25,
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "3,13\n\n\n2,1"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,13\n\n\n2,0",
+        {
+          "x": 1.25,
+          "c": "#cccccc"
+        },
+        "2,12\n\n\n2,1"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "3,0\n\n\n3,1",
+        "3,1\n\n\n3,1",
+        {
+          "x": 0.75,
+          "w": 2.25
+        },
+        "3,0\n\n\n3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "c": "#aaaaaa",
+          "w": 2.75
+        },
+        "3,12\n\n\n4,0",
+        {
+          "x": 0.75,
+          "w": 1.75
+        },
+        "3,12\n\n\n4,1",
+        "4,13\n\n\n4,1"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,0",
+        "4,1\n\n\n0,0",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n0,0",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n0,0",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n0,0",
+        "4,11\n\n\n0,0",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,0"
+      ],
+      [
+        {
+          "y": 1,
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,1",
+        {
+          "d": true
+        },
+        "4,1\n\n\n0,1",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n0,1",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n0,1",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n0,1",
+        {
+          "d": true
+        },
+        "4,11\n\n\n0,1",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,1"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,2",
+        "4,1\n\n\n0,2",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n0,2",
+        {
+          "c": "#cccccc",
+          "w": 3
+        },
+        "4,4\n\n\n0,2",
+        "4,6\n\n\n0,2",
+        {
+          "w": 3
+        },
+        "4,8\n\n\n0,2",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n0,2",
+        "4,11\n\n\n0,2",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,2"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,3",
+        {
+          "d": true
+        },
+        "4,1\n\n\n0,3",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n0,3",
+        {
+          "c": "#cccccc",
+          "w": 3
+        },
+        "4,4\n\n\n0,3",
+        "4,6\n\n\n0,3",
+        {
+          "w": 3
+        },
+        "4,8\n\n\n0,3",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n0,3",
+        {
+          "d": true
+        },
+        "4,11\n\n\n0,3",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,3"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.25
+        },
+        "4,0\n\n\n0,4",
+        {
+          "w": 1.25
+        },
+        "4,1\n\n\n0,4",
+        {
+          "w": 1.25
+        },
+        "4,2\n\n\n0,4",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "4,6\n\n\n0,4",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,9\n\n\n0,4",
+        {
+          "w": 1.25
+        },
+        "4,10\n\n\n0,4",
+        {
+          "w": 1.25
+        },
+        "4,11\n\n\n0,4",
+        {
+          "w": 1.25
+        },
+        "4,12\n\n\n0,4"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.25
+        },
+        "4,0\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,1\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,2\n\n\n0,5",
+        {
+          "c": "#cccccc",
+          "w": 2.25
+        },
+        "4,4\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,6\n\n\n0,5",
+        {
+          "w": 2.75
+        },
+        "4,8\n\n\n0,5",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,9\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,10\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,11\n\n\n0,5",
+        {
+          "w": 1.25
+        },
+        "4,12\n\n\n0,5"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,6",
+        "4,1\n\n\n0,6",
+        {
+          "c": "#cccccc",
+          "w": 10
+        },
+        "4,6\n\n\n0,6",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,11\n\n\n0,6",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,6"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 1.5
+        },
+        "4,0\n\n\n0,7",
+        {
+          "d": true
+        },
+        "4,1\n\n\n0,7",
+        {
+          "c": "#cccccc",
+          "w": 10
+        },
+        "4,6\n\n\n0,7",
+        {
+          "c": "#aaaaaa",
+          "d": true
+        },
+        "4,11\n\n\n0,7",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n0,7"
+      ]
+    ]
+  }
+}

keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/config.h

@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+
+#define VIAL_KEYBOARD_UID {0xF0, 0x01, 0x3E, 0x93, 0x0F, 0x17, 0x90, 0x69}
+
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+