Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] keychron/q1/ansi_encoder fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped #20420

Merged
merged 1 commit into from
Apr 12, 2023
Merged

[Bugfix] keychron/q1/ansi_encoder fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped #20420

merged 1 commit into from
Apr 12, 2023

Conversation

mkillewald
Copy link
Contributor

Description

While working on a keymap for a Keychron Q1 Special Edition with RGB, ANSI layout, Ec11 Encoder and atmega32u4, I noticed that KC_DEL and KC_MUTE (encoder press) keys were reversed even though they were correctly specified in the keymap.c file. I traced the issue down to two lines in the info.json file that were causing the keys to be swapped. I have tested this fix successfully on my Q1 Special Edition.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document 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.
  • 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).

@zvecr zvecr merged commit 75edefe into qmk:master Apr 12, 2023
@mkillewald mkillewald deleted the q1_ansi_atmega32u4_encoder branch April 12, 2023 14:12
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Apr 13, 2023
@mkillewald @coquizen
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapp…
4d32bc5 
…ed (qmk#20420)
SjB added a commit to SjB/qmk_firmware that referenced this pull request Apr 14, 2023
@SjB
Merge branch 'master' into sjb/all-keyboard
82ae1c4 
* 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)
  ...
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Apr 15, 2023
@freznel10
Squashed commit of the following:
3e07eef 
commit cf5626e
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 21:43:27 2023 -0700

    [Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (qmk#20433)

commit 572f863
Merge: d11c379 6d965d4
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Apr 13 04:04:42 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 6d965d4
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Apr 13 12:04:02 2023 +0800

    Add hardware information momokai keyboards (qmk#20434)

commit d11c379
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 17:59:07 2023 -0700

    [Keyboard] Update ymdk/id75 config (qmk#20432)

commit a41f6a3
Merge: 4a58db9 ce41722
Author: Drashna Jael're <drashna@live.com>
Date:   Wed Apr 12 14:36:45 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit ce41722
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Apr 12 14:29:29 2023 -0700

    4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414)

    * info.json: apply friendly formatting

    * add matrix_diagram.md

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_hhkb

commit 4a58db9
Merge: 614a682 0382a25
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 19:29:26 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 0382a25
Author: Paulo Pereira <paulomp90@gmail.com>
Date:   Wed Apr 12 20:28:26 2023 +0100

    [Keymap] Add paulomp90 lily58 keymap (qmk#20327)

    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 614a682
Merge: 134586d 83dcbef
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:32:34 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 83dcbef
Author: Tommy Oldfield <oldfieldtc@gmail.com>
Date:   Wed Apr 12 18:31:47 2023 +0100

    [Keymap] Add personal keymap for Lily58 (qmk#18735)

commit 134586d
Merge: c57902d 18335dd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:28:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 18335dd
Author: Josh Hinnebusch <joshhinnebusch@gmail.com>
Date:   Wed Apr 12 13:27:37 2023 -0400

    [Keyboard] Fix h87 g2 VID conflict (qmk#20388)

commit c57902d
Author: Moritz Plattner <moritz.plattner@gmx.net>
Date:   Wed Apr 12 17:36:28 2023 +0200

    [Keyboard] Add support for ISO version of Durgod Hades (qmk#20110)

    Co-authored-by: Ryan <fauxpark@gmail.com>

commit 41add95
Merge: a9ec2b3 051485c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:35:55 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 051485c
Author: Ryan <PHSC138@users.noreply.github.com>
Date:   Wed Apr 12 11:35:12 2023 -0400

    [Keymap] PHSC138 Keymap for Atom47 (qmk#18768)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit a9ec2b3
Merge: 9994e8c 5012dfd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:34:30 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 5012dfd
Author: Jeff Epler <jepler@gmail.com>
Date:   Wed Apr 12 09:33:42 2023 -0600

    [Keyboard] add kb2040 flavor of gherkin (qmk#18360)

commit 9994e8c
Merge: 1502193 641698d
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:08:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 641698d
Author: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date:   Wed Apr 12 11:07:47 2023 -0400

    [Keyboard] ymdk/id75 (qmk#19967)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 1502193
Author: Manuel Ullmann <labre@posteo.de>
Date:   Wed Apr 12 14:24:07 2023 +0000

    quantum/action_util.c: Use uint8_t for oneshot_layer_data (qmk#20423)

commit e77699a
Author: Giuseppe Rota <403432+grota@users.noreply.github.com>
Date:   Wed Apr 12 16:22:07 2023 +0200

    Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (qmk#20411)

commit e699724
Merge: 5bd68e3 75edefe
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 10:11:37 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 75edefe
Author: Mike Killewald <mkillewald@yahoo.com>
Date:   Wed Apr 12 06:10:50 2023 -0400

    fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420)

commit 5bd68e3
Author: Ryan <fauxpark@gmail.com>
Date:   Wed Apr 12 13:42:51 2023 +1000

    Move single `LAYOUT`s to data driven (qmk#20365)

commit 941e159
Merge: fbf6727 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:42:35 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:26:41 2023 -0700

    4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400)

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

commit fbf6727
Merge: b8d7f28 26b35a5
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 18:33:13 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 26b35a5
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 11:31:56 2023 -0700

    4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399)

    * add matrix_diagram.md

    Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * create keyboard-level info.json

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit b8d7f28
Merge: ae1e6b7 38700f7
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 01:44:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 38700f7
Author: Joel Challis <git@zvecr.com>
Date:   Tue Apr 11 02:43:45 2023 +0100

    Reject info.json at keymap level (qmk#20408)

commit ae1e6b7
Merge: 6f77559 ed72c42
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 22:50:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ed72c42
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 10 23:49:53 2023 +0100

    Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407)

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0.
    - [Release notes](https://github.com/anothrNick/github-tag-action/releases)
    - [Commits](anothrNick/github-tag-action@1.61.0...1.62.0)

    ---
    updated-dependencies:
    - dependency-name: anothrNick/github-tag-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6f77559
Merge: d3b8179 bc6db28
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 19:33:02 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit bc6db28
Author: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Date:   Tue Apr 11 03:32:16 2023 +0800

    [Keyboard] Update angle65 VID/PID (qmk#20401)

commit d3b8179
Author: Ricardo Hermida Ruiz <rhruiz@gmail.com>
Date:   Mon Apr 10 09:45:25 2023 -0300

    Prevent Tri-Layer keys from stopping caps words (qmk#20398)
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Apr 15, 2023
@freznel10
nesgit
c5fb30a 
Squashed commit of the following:

commit cf5626e
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 21:43:27 2023 -0700

    [Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (qmk#20433)

commit 572f863
Merge: d11c379 6d965d4
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Apr 13 04:04:42 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 6d965d4
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Apr 13 12:04:02 2023 +0800

    Add hardware information momokai keyboards (qmk#20434)

commit d11c379
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 17:59:07 2023 -0700

    [Keyboard] Update ymdk/id75 config (qmk#20432)

commit a41f6a3
Merge: 4a58db9 ce41722
Author: Drashna Jael're <drashna@live.com>
Date:   Wed Apr 12 14:36:45 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit ce41722
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Apr 12 14:29:29 2023 -0700

    4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414)

    * info.json: apply friendly formatting

    * add matrix_diagram.md

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_hhkb

commit 4a58db9
Merge: 614a682 0382a25
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 19:29:26 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 0382a25
Author: Paulo Pereira <paulomp90@gmail.com>
Date:   Wed Apr 12 20:28:26 2023 +0100

    [Keymap] Add paulomp90 lily58 keymap (qmk#20327)

    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 614a682
Merge: 134586d 83dcbef
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:32:34 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 83dcbef
Author: Tommy Oldfield <oldfieldtc@gmail.com>
Date:   Wed Apr 12 18:31:47 2023 +0100

    [Keymap] Add personal keymap for Lily58 (qmk#18735)

commit 134586d
Merge: c57902d 18335dd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:28:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 18335dd
Author: Josh Hinnebusch <joshhinnebusch@gmail.com>
Date:   Wed Apr 12 13:27:37 2023 -0400

    [Keyboard] Fix h87 g2 VID conflict (qmk#20388)

commit c57902d
Author: Moritz Plattner <moritz.plattner@gmx.net>
Date:   Wed Apr 12 17:36:28 2023 +0200

    [Keyboard] Add support for ISO version of Durgod Hades (qmk#20110)

    Co-authored-by: Ryan <fauxpark@gmail.com>

commit 41add95
Merge: a9ec2b3 051485c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:35:55 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 051485c
Author: Ryan <PHSC138@users.noreply.github.com>
Date:   Wed Apr 12 11:35:12 2023 -0400

    [Keymap] PHSC138 Keymap for Atom47 (qmk#18768)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit a9ec2b3
Merge: 9994e8c 5012dfd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:34:30 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 5012dfd
Author: Jeff Epler <jepler@gmail.com>
Date:   Wed Apr 12 09:33:42 2023 -0600

    [Keyboard] add kb2040 flavor of gherkin (qmk#18360)

commit 9994e8c
Merge: 1502193 641698d
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:08:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 641698d
Author: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date:   Wed Apr 12 11:07:47 2023 -0400

    [Keyboard] ymdk/id75 (qmk#19967)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 1502193
Author: Manuel Ullmann <labre@posteo.de>
Date:   Wed Apr 12 14:24:07 2023 +0000

    quantum/action_util.c: Use uint8_t for oneshot_layer_data (qmk#20423)

commit e77699a
Author: Giuseppe Rota <403432+grota@users.noreply.github.com>
Date:   Wed Apr 12 16:22:07 2023 +0200

    Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (qmk#20411)

commit e699724
Merge: 5bd68e3 75edefe
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 10:11:37 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 75edefe
Author: Mike Killewald <mkillewald@yahoo.com>
Date:   Wed Apr 12 06:10:50 2023 -0400

    fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420)

commit 5bd68e3
Author: Ryan <fauxpark@gmail.com>
Date:   Wed Apr 12 13:42:51 2023 +1000

    Move single `LAYOUT`s to data driven (qmk#20365)

commit 941e159
Merge: fbf6727 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:42:35 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:26:41 2023 -0700

    4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400)

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

commit fbf6727
Merge: b8d7f28 26b35a5
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 18:33:13 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 26b35a5
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 11:31:56 2023 -0700

    4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399)

    * add matrix_diagram.md

    Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * create keyboard-level info.json

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit b8d7f28
Merge: ae1e6b7 38700f7
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 01:44:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 38700f7
Author: Joel Challis <git@zvecr.com>
Date:   Tue Apr 11 02:43:45 2023 +0100

    Reject info.json at keymap level (qmk#20408)

commit ae1e6b7
Merge: 6f77559 ed72c42
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 22:50:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ed72c42
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 10 23:49:53 2023 +0100

    Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407)

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0.
    - [Release notes](https://github.com/anothrNick/github-tag-action/releases)
    - [Commits](anothrNick/github-tag-action@1.61.0...1.62.0)

    ---
    updated-dependencies:
    - dependency-name: anothrNick/github-tag-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6f77559
Merge: d3b8179 bc6db28
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 19:33:02 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit bc6db28
Author: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Date:   Tue Apr 11 03:32:16 2023 +0800

    [Keyboard] Update angle65 VID/PID (qmk#20401)

commit d3b8179
Author: Ricardo Hermida Ruiz <rhruiz@gmail.com>
Date:   Mon Apr 10 09:45:25 2023 -0300

    Prevent Tri-Layer keys from stopping caps words (qmk#20398)
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Apr 15, 2023
@freznel10
new
c781804 
Squashed commit of the following:

commit a67ace0
Merge: c5fb30a c9f6191
Author: freznel10 <freznel@gmail.com>
Date:   Sat Apr 15 23:36:29 2023 +0800

    Merge remote-tracking branch 'upstream/develop' into refactor_mouse

commit c9f6191
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun Apr 16 01:18:44 2023 +1000

    Encodermap direction define. (qmk#20454)

commit 0ddb7d7
Author: Ryan <fauxpark@gmail.com>
Date:   Sat Apr 15 21:09:08 2023 +1000

    Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (qmk#20438)

commit 172a406
Author: Ryan <fauxpark@gmail.com>
Date:   Sat Apr 15 21:08:15 2023 +1000

    Move single `LAYOUT_all`s to data driven (qmk#20430)

commit a84528f
Author: Ryan <fauxpark@gmail.com>
Date:   Sat Apr 15 21:07:32 2023 +1000

    Move remaining `LAYOUT`s to data driven (qmk#20422)

commit 54634e9
Author: Ryan <fauxpark@gmail.com>
Date:   Fri Apr 14 19:42:50 2023 +1000

    Fix some missing QMK_KEYBOARD_H includes in user keymaps (qmk#20417)

commit cf5626e
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 21:43:27 2023 -0700

    [Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (qmk#20433)

commit 572f863
Merge: d11c379 6d965d4
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Apr 13 04:04:42 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 6d965d4
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Apr 13 12:04:02 2023 +0800

    Add hardware information momokai keyboards (qmk#20434)

commit d11c379
Author: Drashna Jaelre <drashna@drashna.net>
Date:   Wed Apr 12 17:59:07 2023 -0700

    [Keyboard] Update ymdk/id75 config (qmk#20432)

commit a41f6a3
Merge: 4a58db9 ce41722
Author: Drashna Jael're <drashna@live.com>
Date:   Wed Apr 12 14:36:45 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit ce41722
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Apr 12 14:29:29 2023 -0700

    4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414)

    * info.json: apply friendly formatting

    * add matrix_diagram.md

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_hhkb

commit 4a58db9
Merge: 614a682 0382a25
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 19:29:26 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 0382a25
Author: Paulo Pereira <paulomp90@gmail.com>
Date:   Wed Apr 12 20:28:26 2023 +0100

    [Keymap] Add paulomp90 lily58 keymap (qmk#20327)

    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 614a682
Merge: 134586d 83dcbef
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:32:34 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 83dcbef
Author: Tommy Oldfield <oldfieldtc@gmail.com>
Date:   Wed Apr 12 18:31:47 2023 +0100

    [Keymap] Add personal keymap for Lily58 (qmk#18735)

commit 134586d
Merge: c57902d 18335dd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:28:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 18335dd
Author: Josh Hinnebusch <joshhinnebusch@gmail.com>
Date:   Wed Apr 12 13:27:37 2023 -0400

    [Keyboard] Fix h87 g2 VID conflict (qmk#20388)

commit c57902d
Author: Moritz Plattner <moritz.plattner@gmx.net>
Date:   Wed Apr 12 17:36:28 2023 +0200

    [Keyboard] Add support for ISO version of Durgod Hades (qmk#20110)

    Co-authored-by: Ryan <fauxpark@gmail.com>

commit 41add95
Merge: a9ec2b3 051485c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:35:55 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 051485c
Author: Ryan <PHSC138@users.noreply.github.com>
Date:   Wed Apr 12 11:35:12 2023 -0400

    [Keymap] PHSC138 Keymap for Atom47 (qmk#18768)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit a9ec2b3
Merge: 9994e8c 5012dfd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:34:30 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 5012dfd
Author: Jeff Epler <jepler@gmail.com>
Date:   Wed Apr 12 09:33:42 2023 -0600

    [Keyboard] add kb2040 flavor of gherkin (qmk#18360)

commit 9994e8c
Merge: 1502193 641698d
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:08:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 641698d
Author: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date:   Wed Apr 12 11:07:47 2023 -0400

    [Keyboard] ymdk/id75 (qmk#19967)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 1502193
Author: Manuel Ullmann <labre@posteo.de>
Date:   Wed Apr 12 14:24:07 2023 +0000

    quantum/action_util.c: Use uint8_t for oneshot_layer_data (qmk#20423)

commit e77699a
Author: Giuseppe Rota <403432+grota@users.noreply.github.com>
Date:   Wed Apr 12 16:22:07 2023 +0200

    Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (qmk#20411)

commit e699724
Merge: 5bd68e3 75edefe
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 10:11:37 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 75edefe
Author: Mike Killewald <mkillewald@yahoo.com>
Date:   Wed Apr 12 06:10:50 2023 -0400

    fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420)

commit 5bd68e3
Author: Ryan <fauxpark@gmail.com>
Date:   Wed Apr 12 13:42:51 2023 +1000

    Move single `LAYOUT`s to data driven (qmk#20365)

commit 941e159
Merge: fbf6727 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:42:35 2023 -0700

    Merge remote-tracking branch 'origin/master' into develop

commit 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:26:41 2023 -0700

    4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400)

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * add LAYOUT_60_ansi_split_bs_rshift

commit fbf6727
Merge: b8d7f28 26b35a5
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 18:33:13 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 26b35a5
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 11:31:56 2023 -0700

    4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399)

    * add matrix_diagram.md

    Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.

    * info.json: apply friendly formatting

    * move matrix data to info.json

    * create keyboard-level info.json

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit b8d7f28
Merge: ae1e6b7 38700f7
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 01:44:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 38700f7
Author: Joel Challis <git@zvecr.com>
Date:   Tue Apr 11 02:43:45 2023 +0100

    Reject info.json at keymap level (qmk#20408)

commit ae1e6b7
Merge: 6f77559 ed72c42
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 22:50:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ed72c42
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 10 23:49:53 2023 +0100

    Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407)

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0.
    - [Release notes](https://github.com/anothrNick/github-tag-action/releases)
    - [Commits](anothrNick/github-tag-action@1.61.0...1.62.0)

    ---
    updated-dependencies:
    - dependency-name: anothrNick/github-tag-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6f77559
Merge: d3b8179 bc6db28
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 19:33:02 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit bc6db28
Author: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Date:   Tue Apr 11 03:32:16 2023 +0800

    [Keyboard] Update angle65 VID/PID (qmk#20401)

commit d3b8179
Author: Ricardo Hermida Ruiz <rhruiz@gmail.com>
Date:   Mon Apr 10 09:45:25 2023 -0300

    Prevent Tri-Layer keys from stopping caps words (qmk#20398)
sudish added a commit to sudish/qmk_firmware that referenced this pull request Apr 16, 2023
@sudish
Merge remote-tracking branch 'upstream/master'
4130864 
* upstream/master: (73 commits)
  [Keyboard] Add Kalakos Bahrnob65 (qmk#20424)
  Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460)
  [Keyboard] Add zoom75 wired (qmk#20396)
  [Keyboard] Add dymium65 (qmk#20257)
  Lotus58 glow (qmk#20386)
  ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
  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)
  ...
rodrigob pushed a commit to rodrigob/qmk_firmware that referenced this pull request Apr 18, 2023
@mkillewald @rodrigob
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapp…
6c17f89 
…ed (qmk#20420)
queyenth pushed a commit to queyenth/qmk_firmware that referenced this pull request Apr 21, 2023
@mkillewald @queyenth
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapp…
ea9ca11 
…ed (qmk#20420)
stratosgear pushed a commit to stratosgear/qmk_firmware that referenced this pull request Apr 26, 2023
@mkillewald @stratosgear
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapp…
d9a60b6 
…ed (qmk#20420)
struckmb pushed a commit to struckmb/qmk_firmware that referenced this pull request May 1, 2023
@mkillewald @struckmb
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapp…
121c32f 
…ed (qmk#20420)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@waffle87 waffle87 waffle87 approved these changes

@zvecr zvecr zvecr approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mkillewald @zvecr @waffle87