Merge branch 'master' into sjb/all-keyboard

* master: (31 commits) Add hardware information momokai keyboards (qmk#20434) 4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414) [Keymap] Add paulomp90 lily58 keymap (qmk#20327) [Keymap] Add personal keymap for Lily58 (qmk#18735) [Keyboard] Fix h87 g2 VID conflict (qmk#20388) [Keymap] PHSC138 Keymap for Atom47 (qmk#18768) [Keyboard] add kb2040 flavor of gherkin (qmk#18360) [Keyboard] ymdk/id75 (qmk#19967) fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420) 4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400) 4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399) Reject info.json at keymap level (qmk#20408) Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407) [Keyboard] Update angle65 VID/PID (qmk#20401) Run CI builds for each push, limit queued workflow depth to 1. (qmk#20362) Add numpad 0-9 to second layer, update keycodes for QMK 0.17.5, fix layout (qmk#20375) Add autocomplete to generate-compilation-database (qmk#20387) [Keyboard] Add audio support to Adafruit MacroPad RP2040 (qmk#20353) Convertors documentation: Removed duplicate table entry (qmk#20360) Avoid generating empty ENCODER_RESOLUTION (qmk#20179) ...
SjB · Apr 14, 2023 · 82ae1c4 · 82ae1c4
2 parents 934d44d + 6d965d4
commit 82ae1c4
Show file tree

Hide file tree

Showing 164 changed files with 6,883 additions and 566 deletions.
diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
@@ -31,7 +31,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.61.0
+      uses: anothrNick/github-tag-action@1.62.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
@@ -4,22 +4,27 @@ permissions:
   contents: read
 
 on:
+  push:
+    branches: [master, develop]
   workflow_dispatch:
-  schedule:
-    - cron: '0 0,12 * * *'
+    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
 
-    if: github.repository == 'qmk/qmk_firmware'
-
     strategy:
       fail-fast: false
       matrix:
-        branch: [master, develop]
         keymap: [default, via]
 
     container: qmkfm/qmk_cli
@@ -31,7 +36,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-        ref: ${{ matrix.branch }}
+        ref: ${{ github.event.inputs.branch || github.ref }}
 
     - name: Install dependencies
       run: pip3 install -r requirements.txt
@@ -51,10 +56,19 @@ jobs:
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }}
+        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 }}
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
@@ -47,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
@@ -34,7 +34,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,9 @@ quantum/version.h
 *.qmk
 *.uf2
 
+# DD config at wrong location
+/keyboards/**/keymaps/*/info.json
+
 # Old-style QMK Makefiles
 /keyboards/**/Makefile
 

diff --git a/docs/feature_converters.md b/docs/feature_converters.md
@@ -17,7 +17,6 @@ Currently the following converters are available:
 | `promicro` | `bit_c_pro`       |
 | `promicro` | `stemcell`        |
 | `promicro` | `bonsai_c4`       |
-| `promicro` | `elite_pi`        |
 | `promicro` | `rp2040_ce`       |
 | `promicro` | `elite_pi`        |
 | `promicro` | `helios`          |

diff --git a/keyboards/40percentclub/gherkin/kb2040/readme.md b/keyboards/40percentclub/gherkin/kb2040/readme.md
@@ -0,0 +1,22 @@
+# Gherkin
+
+![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
+![KB2040](https://cdn-shop.adafruit.com/640x480/5302-12.jpg)
+
+===
+
+A 30 key keyboard with Adafruit's KB2040 as microcontroller.
+
+* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/gherkin)
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Gherkin PCB  & Adafruit KB2040
+Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.club/2016/11/gherkin.html) and [Adafruit KB2040](https://www.adafruit.com/product/5302)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 40percentclub/gherkin/kb2040:default
+
+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).
+
+Use the KB2040 microcontroller as a drop-in replacement for the Pro Micro in this cute 30% keyboard.
diff --git a/keyboards/40percentclub/gherkin/kb2040/rules.mk b/keyboards/40percentclub/gherkin/kb2040/rules.mk
@@ -0,0 +1 @@
+CONVERT_TO = kb2040
diff --git a/keyboards/40percentclub/gherkin/readme.md b/keyboards/40percentclub/gherkin/readme.md
@@ -1,6 +1,6 @@
 # Gherkin
 
-![Gherkin](https://4.bp.blogspot.com/-sQ18-lNZXOc/WCzlTde-4PI/AAAAAAAB_JQ/qQrehAMG6DMKf3i4oj4mkmLGOfTUvb3KgCLcB/s640/IMG_20161116_122926.jpg)
+![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
 ===
 
 A 30 key keyboard.

diff --git a/keyboards/4pplet/aekiso60/info.json b/keyboards/4pplet/aekiso60/info.json
@@ -0,0 +1,155 @@
+{
+    "manufacturer": "4pplet",
+    "url": "",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444"
+    },
+    "community_layouts": [
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 1.5},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+                {"label": "\u25bd", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+                {"label": "Space", "matrix": [4, 5], "x": 7, "y": 4},
+                {"label": "\u25bd", "matrix": [4, 6], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.5},
+                {"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/aekiso60/matrix_diagram.md b/keyboards/4pplet/aekiso60/matrix_diagram.md
@@ -0,0 +1,33 @@
+# Matrix Diagram for 4pplet AEKISO60 (Revs. A and B)
+
+```
+┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
+│00  │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d    │
+├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+│10    │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │    │
+├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
+│20     │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │   │
+├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   ┌─────────┐
+│30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c   │3d │   │3c       │ 2.75u RShift
+├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤   └─────────┘
+│40   │41  │43   │44        │45 │46        │48   │4a  │4b   │
+└─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
+┌─────┬────┬─────┬─────────────────────────┬─────┬────┬─────┐ ─┐
+│40   │41  │43   │45                       │48   │4a  │4b   │  ├─ Tsangan
+└─────┴────┴─────┴─────────────────────────┴─────┴────┴─────┘  │
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐  │
+│40   │41 │43   │45                         │48   │4a │4b   │  │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ ─┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │   │43   │45                         │48   │   │4b   │ WKL
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+┌─────┬────┬─────┬─────────┬─────┬─────────┬─────┬────┬─────┐ ─┐
+│40   │41  │43   │44       │45   │46       │48   │4a  │4b   │  ├─ same matrix as LAYOUT_all
+└─────┴────┴─────┴─────────┴─────┴─────────┴─────┴────┴─────┘  │
+┌─────┬────┬─────┬────────┬─────┬──────────┬─────┬────┬─────┐  │
+│40   │41  │43   │44      │45   │46        │48   │4a  │4b   │  │
+└─────┴────┴─────┴────────┴─────┴──────────┴─────┴────┴─────┘  │
+┌─────┬────┬─────┬─────────┬────┬──────────┬─────┬────┬─────┐  │
+│40   │41  │43   │44       │45  │46        │48   │4a  │4b   │  │
+└─────┴────┴─────┴─────────┴────┴──────────┴─────┴────┴─────┘ ─┘
+```