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

[keyboard]Move kb83 keyboard. #20761

Merged
merged 11 commits into from
Jun 20, 2023
Merged

[keyboard]Move kb83 keyboard. #20761

merged 11 commits into from
Jun 20, 2023

Conversation

jonylee1986
Copy link
Contributor

Description

move hfdkb/keyboard_sw/k83 --> inland/kb83

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).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels May 6, 2023
@drashna drashna requested a review from a team June 13, 2023 08:41
fauxpark
fauxpark requested changes Jun 13, 2023
View reviewed changes
data/mappings/keyboard_aliases.hjson Outdated Show resolved Hide resolved
data/mappings/keyboard_aliases.hjson Outdated Show resolved Hide resolved
@jonylee1986 jonylee1986 changed the title [keybaord]Move kb83 keyboard. [keyboard]Move kb83 keyboard. Jun 14, 2023
@noroadsleft
Copy link
Member

Would like for this to stay unmerged until I can get a fix in for the Configurator layout data (which hopefully shouldn't take long):

image

@noroadsleft
Copy link
Member

a fix in for the Configurator layout data

#21297

@jonylee1986
Copy link
Contributor Author

Sorry, I misunderstood your meaning. I have also submitted changes here, and I am not sure if this will lead to any conflicts. If there are any, please follow your modifications. Your modifications are very suitable for this keyboard.@noroadsleft

@noroadsleft
Copy link
Member

@jonylee1986,

Sorry for the lack of clarity. I requested a hold on this PR because QMK Configurator is using this data already, but if this PR gets merged, the Configurator implementation won't get fixed until the next develop->master merge at the end of August.

Once my PR is merged, ideally I will be able to integrate its changes into this PR from my end and you won't need to do anything.

@noroadsleft
Copy link
Member

noroadsleft commented Jun 19, 2023 •
edited
Loading

@jonylee1986,

My Configurator layout fix has been merged to qmk:master, and the implementation now appears as:

Unfortunately, it appears either my attempt or yours to fix the layout data has created a merge conflict.

Removing the last six commits from your GitHub fork's move_kb83 branch by running:

git push --force-with-lease [email protected]:jonylee1986/qmk_firmware_master.git c085c54765:move_kb83

in your command line interface should fix the conflict.

Once the merge conflict is cleared up, I can merge your pull request.

@jonylee1986 jonylee1986 force-pushed the move_kb83 branch 2 times, most recently from 7964e35 to abd0632 Compare June 20, 2023 01:44
@github-actions github-actions bot removed keyboard via Adds via keymap and/or updates keyboard for via support labels Jun 20, 2023
@github-actions github-actions bot removed the keymap label Jun 20, 2023
@jonylee1986 jonylee1986 reopened this Jun 20, 2023
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Jun 20, 2023
noroadsleft
noroadsleft approved these changes Jun 20, 2023
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or you could merge the branches together - which strangely didn't merge cleanly when I tried it locally. 😕

Looks good, thanks!

@noroadsleft noroadsleft merged commit d98b60c into qmk:develop Jun 20, 2023
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jun 22, 2023
@freznel10
Squashed commit of the following:
8d99b6b 
commit 5a4fab0
Merge: c601b1f cc4ac72
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 04:36:15 2023 +0000

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

commit cc4ac72
Author: James Young <[email protected]>
Date:   Wed Jun 21 21:35:35 2023 -0700

    Igloo Configurator Touch-Up (qmk#21303)

    * [refactor] friendly-format info.json

    * [enhancement] add matrix diagram

    * [enhancement] remove key overlaps in layout data

commit c601b1f
Merge: adc954f 33f76d7
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 02:12:05 2023 +0000

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

commit 33f76d7
Author: James Young <[email protected]>
Date:   Wed Jun 21 19:11:32 2023 -0700

    Quarkeys Z40 Community Layout Support and Touch-Up (qmk#21329)

    * [refactor] rename LAYOUT to LAYOUT_planck_mit

    * [style] friendly-format info.json

    * [style] refactor keymaps

    - grid-align keycodes
    - use four-space indent
    - remove trailing whitespace

    * [chore] tidy-up keyboard data in info.json

    - spell-check `manufacturer` value
    - use valid `url`
    - reference GitHub username for `maintainer`

    * [chore] tidy-up readme

    - link to maintainer's GitHub account
    - add Hardware Availability link
    - break-out Hardware Specs into its own section

    * [enhancement] enable Community Layout support

    * [chore] replace product image in readme

    Source repository for previous URL seems to have been deleted.

commit adc954f
Merge: 87b371c b8a12db
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 00:43:08 2023 +0000

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

commit b8a12db
Author: James Young <[email protected]>
Date:   Wed Jun 21 17:42:30 2023 -0700

    Pteropus: correct layout data (qmk#21326)

    * [style] friendly-format info.json

    * [chore] correct layout data

    Fix keys overlapping when rendered in QMK Configurator or CLI.

commit 87b371c
Author: James Young <[email protected]>
Date:   Wed Jun 21 14:20:02 2023 -0700

    ProtoTypist PT-80 Refactor (qmk#21325)

    * [style] friendly-format info.json

    * [docs] add layout/matrix diagram

    * [style] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] LAYOUT_all macro

    Move the JSON object for the Enter key to the end of the home row.

    * [style] refactor default keymap

    - update keycode grid alignment
    - remove trailing whitespace

    * [refactor] LAYOUT_tkl_iso macro

    Move the JSON object for the Enter key to the end of the home row.

    This commit fixes a key sequence error with the `tkl_iso` Community
    Layout support.

    * [style] refactor default_ansi keymap

    - update keycode grid alignment
    - remove trailing whitespace

    * [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

    Fix incorrect matrix position assignments on the function row keys for
    the `LAYOUT_tkl_iso` macro.

    * [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

    Fix incorrect matrix position assignments on the function row keys for
    the `LAYOUT_tkl_ansi` macro.

commit 810cd9b
Merge: e3faa76 6f39205
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 19:30:39 2023 +0000

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

commit 6f39205
Author: James Young <[email protected]>
Date:   Wed Jun 21 12:30:04 2023 -0700

    Laneware LW75: correct layout data (qmk#21314)

    [refactor]

    Fixes misleading Configurator implementations of the available layouts.

commit e3faa76
Merge: fa1b533 20c0043
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 18:42:56 2023 +0000

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

commit 20c0043
Author: lindgrenj6 <[email protected]>
Date:   Wed Jun 21 13:42:23 2023 -0500

    [Keymap] Add lindgrenj6 planck layout (qmk#21155)

commit fa1b533
Merge: b6c76cd 4cc427c
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 18:30:50 2023 +0000

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

commit 4cc427c
Author: James Young <[email protected]>
Date:   Wed Jun 21 11:30:15 2023 -0700

    Lucid Velvet Solder Layout Additions and Touch-Up (qmk#21313)

    * [refactor] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] refactor default keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [bugfix] fix key sequence error in default keymap

    * [enhancement] fix key overlaps in Configurator

    * [enhancement] add matrix diagram

    * [refactor] rename LAYOUT to LAYOUT_all

    * [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi

    * [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_iso

commit b6c76cd
Merge: 673b536 b814ff5
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 17:39:03 2023 +0000

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

commit b814ff5
Author: James Young <[email protected]>
Date:   Wed Jun 21 10:38:18 2023 -0700

    Lucid Velvet Hotswap Layout Additions and Touch-Up (qmk#21312)

    * [refactor] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] refactor default keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [bugfix] fix key sequence error in default keymap

    * [enhancement] fix key overlap in Configurator

    * [enhancement] add matrix diagram

    * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi

    * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

    * [enhancenment] enable Community Layout support

commit 673b536
Merge: 3274e0a 71b77df
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 16:00:31 2023 +0000

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

commit 71b77df
Author: James Young <[email protected]>
Date:   Wed Jun 21 08:59:54 2023 -0700

    Keebio Cepstrum Configurator Touch-Up (qmk#21310)

    * [enhancement] remove redundant layout data

    Remove the redundant layout data from the keyboard-level `info.json`.

    * [enhancement] correct JSON syntax in rev1/info.json

    * [enhancement] friendly-format rev1/info.json

    * [enhancement] correct layout data

commit 3274e0a
Merge: 08ba8a0 ecca9c5
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 03:05:47 2023 +0000

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

commit ecca9c5
Author: lalalademaxiya1 <[email protected]>
Date:   Wed Jun 21 11:05:07 2023 +0800

    Add Keychron C2 Pro (qmk#20701)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 08ba8a0
Merge: 6373543 595d393
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 03:02:34 2023 +0000

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

commit 595d393
Author: jonylee@hfd <[email protected]>
Date:   Wed Jun 21 11:01:43 2023 +0800

    [Keyboard] Add Monsgeek M5 (qmk#21182)

    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 6373543
Merge: dad41bd 2f1cac6
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 02:58:50 2023 +0000

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

commit dad41bd
Author: James Young <[email protected]>
Date:   Tue Jun 20 19:58:44 2023 -0700

    ProtoTypist PT-60 Refactor (qmk#21322)

commit 2f1cac6
Author: Albert Y <[email protected]>
Date:   Wed Jun 21 10:58:13 2023 +0800

    [Docs] Code markdown amendment (qmk#21323)

commit c69f82f
Merge: 6ec91a7 7753249
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 02:30:16 2023 +0000

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

commit 7753249
Author: James Young <[email protected]>
Date:   Tue Jun 20 19:29:44 2023 -0700

    NovelKeys NK+: correct layout data (qmk#21317)

    * NovelKeys NK+: correct layout data

    Add key sizes to the layout data.

    * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan

commit 6ec91a7
Merge: ffdc70b 42cd55e
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 00:33:07 2023 +0000

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

commit 42cd55e
Author: Jack Humbert <[email protected]>
Date:   Tue Jun 20 20:32:32 2023 -0400

    Planck Matrix Fixes (qmk#21196)

    * fix non-default keymap compiling, initial matrix state, watchdog options

    * fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

    * chore: update function name on all cases.

    * remove old midi tone option

    Co-authored-by: Ryan <[email protected]>

    * fixes abhixec's planck keymap

    * add audio enable condition to abhixec's planck keymap

    * add audio enable condition to all muse includes

    * Revert "add audio enable condition to all muse includes"

    This reverts commit 9779e90.

    * Revert "add audio enable condition to abhixec's planck keymap"

    This reverts commit 24c742a.

    * Revert "fixes abhixec's planck keymap"

    This reverts commit 4bb085d.

    ---------

    Co-authored-by: Peter.Falken <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit ffdc70b
Author: Nick Brassel <[email protected]>
Date:   Wed Jun 21 08:41:49 2023 +1000

    Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (qmk#21272)

commit 45dc1cc
Author: James Young <[email protected]>
Date:   Tue Jun 20 15:40:31 2023 -0700

    EC Pro X JIS Layout Touch-Up (qmk#21260)

    * [refactor] update `info.json` for readability

    - sort the JSON objects representing the keyboard's keys in the order:
      - label, matrix, x, y, w, h
    - convert numeric JSON values to integers where appropriate

    * [refactor] remove key labels from `info.json`

    * [refactor] keymap refactor

    - grid-align keycodes

    * [bugfix] move Enter key to home row

    Moves the JSON object representing the Enter key to the home row.

    Fixes an issue that resulted in correct key assignment only if the
    keymap being compiled/flashed was based upon the `via` keymap.

commit ac14fce
Author: James Young <[email protected]>
Date:   Tue Jun 20 10:18:16 2023 -0700

    Kalakos Bahrnob65 Configurator Layout Touch-Up (qmk#21309)

    * [enhancement] add matrix diagram

    * [refactor] friendly-format info.json

    * [enhancement] remove key overlaps

commit a9f49a0
Merge: 01cfc72 85b8044
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 17:17:10 2023 +0000

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

commit 85b8044
Author: James Young <[email protected]>
Date:   Tue Jun 20 10:16:35 2023 -0700

    KJ-Modify RS40 Configurator Touch-Up (qmk#21311)

    * [refactor] friendly-format info.json

    * [enhancement] remove key overlap

    Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

    * [enhancement] replace store links with product links

    Replace URLs that point to the vendor's shop with URLs to the vendor's
    product listing.

commit 01cfc72
Merge: 965cfec 45c52c7
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:42:27 2023 +0000

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

commit 45c52c7
Author: lalalademaxiya1 <[email protected]>
Date:   Tue Jun 20 23:41:45 2023 +0800

    [Keyboard] Add Keychron C1 Pro (qmk#20700)

    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 965cfec
Merge: a2e2d92 958cae3
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:39:02 2023 +0000

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

commit 958cae3
Author: Roberts Kursitis <[email protected]>
Date:   Tue Jun 20 18:38:26 2023 +0300

    [Keyboard] Add Alisaie (qmk#21266)

commit a2e2d92
Merge: d98b60c 0abe312
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:36:05 2023 +0000

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

commit 0abe312
Author: Derek <[email protected]>
Date:   Tue Jun 20 11:35:23 2023 -0400

    [Keyboard] Add bigsmoothknob (qmk#21265)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: jack <[email protected]>

commit d98b60c
Author: jonylee@hfd <[email protected]>
Date:   Tue Jun 20 10:31:46 2023 +0800

    Move kb83 keyboard (qmk#20761)

    * move hfdkb/keyboard_sw/k83 --> inland/kb83

    * move hfdkb/keyboard_sw/k83 --> inland/kb83

    * Update data/mappings/keyboard_aliases.hjson

    * Update keyboard_aliases.hjson

    * fixed  the Configurator layout data

    * fixed the Configurator layout data

    * Revert "Update keyboard_aliases.hjson"

    This reverts commit c085c54.

    * Revert "fixed  the Configurator layout data"

    * Update keyboard_aliases.hjson

    * Update info.json

commit 808228c
Merge: be6f92c 7bd1d18
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 01:56:07 2023 +0000

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

commit 7bd1d18
Author: Drashna Jaelre <[email protected]>
Date:   Mon Jun 19 18:55:27 2023 -0700

    [Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (qmk#21290)

    Co-authored-by: Ryan <[email protected]>

commit be6f92c
Merge: b749a5f 31e39a9
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 01:46:21 2023 +0000

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

commit 31e39a9
Author: James Young <[email protected]>
Date:   Mon Jun 19 18:45:47 2023 -0700

    dnworks SBL Community Layout Support and Touch-Up (qmk#21267)

commit b749a5f
Author: jack <[email protected]>
Date:   Mon Jun 19 13:59:35 2023 -0600

    Fixup `nightly_boards/n40_o` (qmk#21307)

commit c4a67d3
Author: jack <[email protected]>
Date:   Mon Jun 19 09:46:27 2023 -0600

    Remove encoder in-matrix workaround code (qmk#20389)

commit 74fbd5a
Author: jack <[email protected]>
Date:   Mon Jun 19 06:10:25 2023 -0600

    Fixup `dekunukem/duckypad` (qmk#21298)
@jonylee1986 jonylee1986 mentioned this pull request Aug 16, 2023
Merged
7 tasks
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Aug 27, 2023
@freznel10
Squashed commit of the following:
df23f8b 
commit cb3872d319cb9869e7f1390d566466f0bb44be0f
Merge: 746b349466 66b744b
Author: freznel10 <[email protected]>
Date:   Sun Aug 27 20:12:09 2023 +0800

    Merge branch 'qmk:develop' into develop

commit 66b744b
Author: Ryan <[email protected]>
Date:   Sun Aug 27 16:51:19 2023 +1000

    Clean up Unicode API usage in user keymaps (qmk#21849)

commit 70e34e4
Author: Ryan <[email protected]>
Date:   Sun Aug 27 13:30:19 2023 +1000

    Unicode, Unicodemap and UCIS refactor (qmk#21659)

commit 95681b8
Author: Joel Challis <[email protected]>
Date:   Sun Aug 27 04:00:14 2023 +0100

    Add *_MATRIX_LED_COUNT generation (qmk#21110)

commit 25331be
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 26 19:52:12 2023 -0700

    Revert  changes to ChibiOS Suspend Code (qmk#21830)

    * Partially revert qmk#19780

    * Finish

    * Get teensy 3.5/3.6 board files too

    * fix lint issue

    * Revert "[Bug] Restore usb suspend wakeup delay (qmk#21676)"

    This reverts commit e8e989f.

    * Apply suggestions from code review

    Co-authored-by: Joel Challis <[email protected]>

    ---------

    Co-authored-by: Joel Challis <[email protected]>

commit 7364515
Author: Ryan <[email protected]>
Date:   Sun Aug 27 06:03:29 2023 +1000

    Rework info.json reference (qmk#21324)

    * Rework info.json reference

    * Apply suggestions from code review

    Co-authored-by: Sergey Vlasov <[email protected]>

    * Update backlight.pins description

    * Add rgblight.driver and lowercase other driver names

    * Remove `split.main` and `split.matrix_grid` for now as they are not working yet

    ---------

    Co-authored-by: Sergey Vlasov <[email protected]>

commit 50151be
Merge: 5cd47f5 f07490b
Author: QMK Bot <[email protected]>
Date:   Sat Aug 26 18:44:20 2023 +0000

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

commit f07490b
Author: Andy Smith <[email protected]>
Date:   Sat Aug 26 19:43:40 2023 +0100

    Corrected duration example, should be number not string (qmk#21839)

commit 5cd47f5
Author: HiryKun <[email protected]>
Date:   Sun Aug 27 02:31:59 2023 +0800

    Add "apm32-dfu" in keyboard.jsonschema (qmk#21842)

commit a9e2f6a
Author: Joel Challis <[email protected]>
Date:   Fri Aug 25 00:47:12 2023 +0100

    Remove `led_matrix.hue_steps` and `led_matrix.sat_steps` from schema (qmk#21827)

commit 0c51ed7
Merge: 023d644 7a73723
Author: QMK Bot <[email protected]>
Date:   Thu Aug 24 01:35:56 2023 +0000

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

commit 7a73723
Author: patrickxiong <[email protected]>
Date:   Thu Aug 24 11:35:13 2023 +1000

    converter/ibm_terminal: Fix F0_BREAK state transition (qmk#21824)

commit 023d644
Author: Ryan <[email protected]>
Date:   Thu Aug 24 07:11:39 2023 +1000

    Move RGBLight animations to data driven (qmk#21635)

    * Move RGBLight animations to data driven, 0-9

    * Move RGBLight animations to data driven, A

    * Move RGBLight animations to data driven, B

    * Move RGBLight animations to data driven, C

    * Move RGBLight animations to data driven, D

    * Move RGBLight animations to data driven, E

    * Move RGBLight animations to data driven, F

    * Move RGBLight animations to data driven, G

    * Move RGBLight animations to data driven, H

    * Move RGBLight animations to data driven, handwired

    * Move RGBLight animations to data driven, I

    * Move RGBLight animations to data driven, J

    * Move RGBLight animations to data driven, K

    * Move RGBLight animations to data driven, L

    * Move RGBLight animations to data driven, M

    * Move RGBLight animations to data driven, N

    * Move RGBLight animations to data driven, O

    * Move RGBLight animations to data driven, P

    * Move RGBLight animations to data driven, Q

    * Move RGBLight animations to data driven, R

    * Move RGBLight animations to data driven, S

    * Move RGBLight animations to data driven, T

    * Move RGBLight animations to data driven, U

    * Move RGBLight animations to data driven, V

    * Move RGBLight animations to data driven, W

    * Move RGBLight animations to data driven, X

    * Move RGBLight animations to data driven, Y

    * Move RGBLight animations to data driven, Z

    * Fix incorrect placement

    * Fix build failures and mismatches

commit 79491e3
Merge: a672fdd f699fde
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 19:55:42 2023 +0000

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

commit f699fde
Author: Thomas Weißschuh <[email protected]>
Date:   Wed Aug 23 21:55:03 2023 +0200

    Generalize AVR -Werror=array-bounds workaround (qmk#21798)

    GCC 13 needs the same workaround as GCC 12.
    To avoid having to maintain an ever-growing list of broken versions
    apply the workaround wherever it can be used.

    If at some point a fixed version of GCC is released the workaround can
    be disabled for those fixed versions.

    See qmk#17064

commit a672fdd
Merge: 1cf040a f7cf066
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 19:55:00 2023 +0000

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

commit f7cf066
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 23 20:54:25 2023 +0100

    Bump tj-actions/changed-files from 37 to 38 (qmk#21822)

    Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 37 to 38.
    - [Release notes](https://github.com/tj-actions/changed-files/releases)
    - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
    - [Commits](tj-actions/changed-files@v37...v38)

    ---
    updated-dependencies:
    - dependency-name: tj-actions/changed-files
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

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

commit 1cf040a
Merge: 2b7f1b0 90d1b32
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 13:39:25 2023 +0000

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

commit 90d1b32
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 14:38:48 2023 +0100

    Fix infinite recursion in lxxt encoder logic (qmk#21819)

commit 2b7f1b0
Merge: 1babb2c b1fbfaa
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 09:13:38 2023 +0000

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

commit b1fbfaa
Author: Sergey Vlasov <[email protected]>
Date:   Wed Aug 23 12:13:03 2023 +0300

    keychron/c2_pro/ansi/white: Fix column 19 in the custom matrix (qmk#21805)

    Although `keychron/c2_pro/ansi/rgb` and `keychron/c2_pro/ansi/white` use
    the same custom matrix code, the matrix layouts are slightly different;
    in particular, only the `keychron/c2_pro/ansi/white` board actually uses
    column 19.  However, the handling of column 19 in the custom matrix code
    was broken, therefore that column did not work.

    Looks like the custom matrix code assumes that `SHIFT_COL_END` refers to
    the last column connected to the shift register, and not to the column
    past that; so the value of `SHIFT_COL_END` needs to be changed from 19
    to 18 (columns 11...18 are connected to the shift register, and column
    19 is connected to the C14 pin).

    Also the code which was determining `SIZE_T` and `UNSELECT_ALL_COL` had
    an off-by-one bug when counting the required number of bits (again due
    to the confusion on the `SHIFT_COL_END` meaning); this had been fixed
    too (the actual behavior of that part of the code did not change,
    because both the old and the new version select the 8 bit variant).

commit 1babb2c
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 06:13:01 2023 +0100

    Fix keyboards with old RGB driver names (qmk#21817)

commit 8e0173b
Merge: 9bb8230 c2b8375
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 04:53:27 2023 +0000

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

commit c2b8375
Author: フィルターペーパー <[email protected]>
Date:   Wed Aug 23 12:52:52 2023 +0800

    [Doc] Improve magic keycode section (qmk#21787)

commit 9bb8230
Author: Ryan <[email protected]>
Date:   Wed Aug 23 11:49:02 2023 +1000

    Fix keyboards with old RGB driver names (qmk#21815)

commit 37bc949
Author: Ryan <[email protected]>
Date:   Wed Aug 23 10:00:03 2023 +1000

    RGB Matrix: driver naming cleanups (qmk#21594)

commit dfb6d38
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 00:03:01 2023 +0100

    Simplfy RGB/LED matrix effect logic (qmk#21703)

commit 0d53538
Author: Less/Rikki <[email protected]>
Date:   Tue Aug 22 13:39:33 2023 -0400

    fix: restore indicators to jellybean_raindrops (qmk#21792)

    After qmk#21169, rgb_matrix_indicators() was limited to running on the
    final render iteration. Since the jellybean_raindrops animation
    immediately returns false after updating a single LED, the iteration
    count no longer ends up high enough to render non-advanced indicators.

    This change also brings jellybean_raindrops more in line with raindrops.

commit 1236c29
Author: Controller Works <[email protected]>
Date:   Tue Aug 22 12:12:51 2023 -0400

    [Keyboard] Add city42 (qmk#21727)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>

commit 746b349466604e77b4c12739ac356b79c7676016
Merge: 7e7c865032 eed34f7
Author: freznel10 <[email protected]>
Date:   Tue Aug 22 11:42:59 2023 +0800

    Merge branch 'qmk:develop' into develop

commit eed34f7
Author: Joel Challis <[email protected]>
Date:   Tue Aug 22 00:10:08 2023 +0100

    Fix drop/shift/v2 compilation (qmk#21800)

commit 1149212
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 23:20:24 2023 +0100

    Align SENSE75 with recent Drop additions (qmk#21757)

commit 892ba2e
Merge: 96d90a5 3f19272
Author: zvecr <[email protected]>
Date:   Mon Aug 21 22:59:43 2023 +0100

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

commit 3f19272
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:47:46 2023 +0100

    Initial support for SHIFT v2 (qmk#21756)

commit f422b3c
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:47:29 2023 +0100

    Initial support for CTRL v2 (qmk#21755)

commit f9aba86
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:46:12 2023 +0100

    Initial support for ALT v2 (qmk#21754)

commit 11970b1
Author: DUILCHOI <[email protected]>
Date:   Mon Aug 21 12:24:58 2023 +0900

    [Keyboard] Add linworks favepada (qmk#20794)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>
    Co-authored-by: jack <[email protected]>

commit dd4f4f8
Author: owlab2 <[email protected]>
Date:   Mon Aug 21 00:16:41 2023 +0800

    [Keyboard] Add Jelly Evolv (qmk#21407)

    Co-authored-by: jack <[email protected]>

commit 6d9eab8
Author: Pangorin <[email protected]>
Date:   Sun Aug 20 23:08:13 2023 +0700

    Adding support for TAN67 PCB (qmk#21003)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>

commit d91857d
Author: studiokestra <[email protected]>
Date:   Sat Aug 19 15:24:06 2023 -0600

    Add Galatea rev3 keyboard (qmk#21758)

commit 96d90a5
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 17 17:39:16 2023 -0700

    [Bug] Fix compilation error for APA on ChibiOS (qmk#21773)

commit 7e7c865032110e3fbe6e35007faed4dcf548d981
Merge: e4b43861d2 6cece8adfe
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:33:13 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit e4b43861d274e5940eb9275f1cb4635121c393a0
Merge: ff62eba7de 89a30ef
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:32:23 2023 +0800

    Merge branch 'develop' of https://github.com/qmk/qmk_firmware into develop

commit 6cece8adfe4263f60b5a368637a98aa16675d019
Merge: 805324c 89a30ef
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:29:02 2023 +0800

    Merge pull request #1 from qmk/develop

    Develop

commit ff62eba7de4e825ba9d07b7378059b6f97df46c7
Merge: ba4b9cb64d 805324c
Author: freznel10 <[email protected]>
Date:   Tue Aug 8 22:50:28 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit ba4b9cb64d5ce4278b34a2607da504f85773a206
Merge: 0f3063722b f407d90
Author: freznel10 <[email protected]>
Date:   Mon Jul 31 12:16:26 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 0f3063722bf76f3d4e6b501c0e244f4bb679ecdf
Merge: a34d21fbef 14c2e55
Author: freznel10 <[email protected]>
Date:   Tue Jul 25 14:33:04 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit a34d21fbef5ad7d6760855f72475eb5727c21add
Merge: b3162a03bf bfe27a0
Author: freznel10 <[email protected]>
Date:   Thu Jul 13 01:13:23 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit b3162a03bf8c8d218e98df68a8fe595d42c52ae0
Merge: 97945b22c6 66a1693
Author: freznel10 <[email protected]>
Date:   Thu Jun 29 14:02:25 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 97945b22c6f3afc7470b768cb22e670769aa57c2
Merge: 1a65c2721c ba055a9
Author: freznel10 <[email protected]>
Date:   Tue Jun 27 14:04:49 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 1a65c2721c9912a20a339796ce102bffbcc34180
Merge: b51f2afe4c 5a4fab0
Author: freznel10 <[email protected]>
Date:   Thu Jun 22 16:21:39 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit b51f2afe4cf66ac6d75e7047b4e63124ccef3def
Author: freznel10 <[email protected]>
Date:   Thu Jun 22 16:19:52 2023 +0800

    Squashed commit of the following:

    commit 5a4fab0
    Merge: c601b1f cc4ac72
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 04:36:15 2023 +0000

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

    commit cc4ac72
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 21:35:35 2023 -0700

        Igloo Configurator Touch-Up (qmk#21303)

        * [refactor] friendly-format info.json

        * [enhancement] add matrix diagram

        * [enhancement] remove key overlaps in layout data

    commit c601b1f
    Merge: adc954f 33f76d7
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 02:12:05 2023 +0000

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

    commit 33f76d7
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 19:11:32 2023 -0700

        Quarkeys Z40 Community Layout Support and Touch-Up (qmk#21329)

        * [refactor] rename LAYOUT to LAYOUT_planck_mit

        * [style] friendly-format info.json

        * [style] refactor keymaps

        - grid-align keycodes
        - use four-space indent
        - remove trailing whitespace

        * [chore] tidy-up keyboard data in info.json

        - spell-check `manufacturer` value
        - use valid `url`
        - reference GitHub username for `maintainer`

        * [chore] tidy-up readme

        - link to maintainer's GitHub account
        - add Hardware Availability link
        - break-out Hardware Specs into its own section

        * [enhancement] enable Community Layout support

        * [chore] replace product image in readme

        Source repository for previous URL seems to have been deleted.

    commit adc954f
    Merge: 87b371c b8a12db
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 00:43:08 2023 +0000

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

    commit b8a12db
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 17:42:30 2023 -0700

        Pteropus: correct layout data (qmk#21326)

        * [style] friendly-format info.json

        * [chore] correct layout data

        Fix keys overlapping when rendered in QMK Configurator or CLI.

    commit 87b371c
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 14:20:02 2023 -0700

        ProtoTypist PT-80 Refactor (qmk#21325)

        * [style] friendly-format info.json

        * [docs] add layout/matrix diagram

        * [style] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] LAYOUT_all macro

        Move the JSON object for the Enter key to the end of the home row.

        * [style] refactor default keymap

        - update keycode grid alignment
        - remove trailing whitespace

        * [refactor] LAYOUT_tkl_iso macro

        Move the JSON object for the Enter key to the end of the home row.

        This commit fixes a key sequence error with the `tkl_iso` Community
        Layout support.

        * [style] refactor default_ansi keymap

        - update keycode grid alignment
        - remove trailing whitespace

        * [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

        Fix incorrect matrix position assignments on the function row keys for
        the `LAYOUT_tkl_iso` macro.

        * [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

        Fix incorrect matrix position assignments on the function row keys for
        the `LAYOUT_tkl_ansi` macro.

    commit 810cd9b
    Merge: e3faa76 6f39205
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 19:30:39 2023 +0000

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

    commit 6f39205
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 12:30:04 2023 -0700

        Laneware LW75: correct layout data (qmk#21314)

        [refactor]

        Fixes misleading Configurator implementations of the available layouts.

    commit e3faa76
    Merge: fa1b533 20c0043
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 18:42:56 2023 +0000

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

    commit 20c0043
    Author: lindgrenj6 <[email protected]>
    Date:   Wed Jun 21 13:42:23 2023 -0500

        [Keymap] Add lindgrenj6 planck layout (qmk#21155)

    commit fa1b533
    Merge: b6c76cd 4cc427c
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 18:30:50 2023 +0000

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

    commit 4cc427c
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 11:30:15 2023 -0700

        Lucid Velvet Solder Layout Additions and Touch-Up (qmk#21313)

        * [refactor] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] refactor default keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [bugfix] fix key sequence error in default keymap

        * [enhancement] fix key overlaps in Configurator

        * [enhancement] add matrix diagram

        * [refactor] rename LAYOUT to LAYOUT_all

        * [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi

        * [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_iso

    commit b6c76cd
    Merge: 673b536 b814ff5
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 17:39:03 2023 +0000

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

    commit b814ff5
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 10:38:18 2023 -0700

        Lucid Velvet Hotswap Layout Additions and Touch-Up (qmk#21312)

        * [refactor] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] refactor default keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [bugfix] fix key sequence error in default keymap

        * [enhancement] fix key overlap in Configurator

        * [enhancement] add matrix diagram

        * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi

        * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

        * [enhancenment] enable Community Layout support

    commit 673b536
    Merge: 3274e0a 71b77df
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 16:00:31 2023 +0000

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

    commit 71b77df
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 08:59:54 2023 -0700

        Keebio Cepstrum Configurator Touch-Up (qmk#21310)

        * [enhancement] remove redundant layout data

        Remove the redundant layout data from the keyboard-level `info.json`.

        * [enhancement] correct JSON syntax in rev1/info.json

        * [enhancement] friendly-format rev1/info.json

        * [enhancement] correct layout data

    commit 3274e0a
    Merge: 08ba8a0 ecca9c5
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 03:05:47 2023 +0000

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

    commit ecca9c5
    Author: lalalademaxiya1 <[email protected]>
    Date:   Wed Jun 21 11:05:07 2023 +0800

        Add Keychron C2 Pro (qmk#20701)

        Co-authored-by: Drashna Jaelre <[email protected]>
        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 08ba8a0
    Merge: 6373543 595d393
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 03:02:34 2023 +0000

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

    commit 595d393
    Author: jonylee@hfd <[email protected]>
    Date:   Wed Jun 21 11:01:43 2023 +0800

        [Keyboard] Add Monsgeek M5 (qmk#21182)

        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 6373543
    Merge: dad41bd 2f1cac6
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 02:58:50 2023 +0000

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

    commit dad41bd
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 19:58:44 2023 -0700

        ProtoTypist PT-60 Refactor (qmk#21322)

    commit 2f1cac6
    Author: Albert Y <[email protected]>
    Date:   Wed Jun 21 10:58:13 2023 +0800

        [Docs] Code markdown amendment (qmk#21323)

    commit c69f82f
    Merge: 6ec91a7 7753249
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 02:30:16 2023 +0000

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

    commit 7753249
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 19:29:44 2023 -0700

        NovelKeys NK+: correct layout data (qmk#21317)

        * NovelKeys NK+: correct layout data

        Add key sizes to the layout data.

        * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan

    commit 6ec91a7
    Merge: ffdc70b 42cd55e
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 00:33:07 2023 +0000

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

    commit 42cd55e
    Author: Jack Humbert <[email protected]>
    Date:   Tue Jun 20 20:32:32 2023 -0400

        Planck Matrix Fixes (qmk#21196)

        * fix non-default keymap compiling, initial matrix state, watchdog options

        * fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

        * chore: update function name on all cases.

        * remove old midi tone option

        Co-authored-by: Ryan <[email protected]>

        * fixes abhixec's planck keymap

        * add audio enable condition to abhixec's planck keymap

        * add audio enable condition to all muse includes

        * Revert "add audio enable condition to all muse includes"

        This reverts commit 9779e90.

        * Revert "add audio enable condition to abhixec's planck keymap"

        This reverts commit 24c742a.

        * Revert "fixes abhixec's planck keymap"

        This reverts commit 4bb085d.

        ---------

        Co-authored-by: Peter.Falken <[email protected]>
        Co-authored-by: Ryan <[email protected]>

    commit ffdc70b
    Author: Nick Brassel <[email protected]>
    Date:   Wed Jun 21 08:41:49 2023 +1000

        Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (qmk#21272)

    commit 45dc1cc
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 15:40:31 2023 -0700

        EC Pro X JIS Layout Touch-Up (qmk#21260)

        * [refactor] update `info.json` for readability

        - sort the JSON objects representing the keyboard's keys in the order:
          - label, matrix, x, y, w, h
        - convert numeric JSON values to integers where appropriate

        * [refactor] remove key labels from `info.json`

        * [refactor] keymap refactor

        - grid-align keycodes

        * [bugfix] move Enter key to home row

        Moves the JSON object representing the Enter key to the home row.

        Fixes an issue that resulted in correct key assignment only if the
        keymap being compiled/flashed was based upon the `via` keymap.

    commit ac14fce
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 10:18:16 2023 -0700

        Kalakos Bahrnob65 Configurator Layout Touch-Up (qmk#21309)

        * [enhancement] add matrix diagram

        * [refactor] friendly-format info.json

        * [enhancement] remove key overlaps

    commit a9f49a0
    Merge: 01cfc72 85b8044
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 17:17:10 2023 +0000

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

    commit 85b8044
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 10:16:35 2023 -0700

        KJ-Modify RS40 Configurator Touch-Up (qmk#21311)

        * [refactor] friendly-format info.json

        * [enhancement] remove key overlap

        Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

        * [enhancement] replace store links with product links

        Replace URLs that point to the vendor's shop with URLs to the vendor's
        product listing.

    commit 01cfc72
    Merge: 965cfec 45c52c7
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:42:27 2023 +0000

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

    commit 45c52c7
    Author: lalalademaxiya1 <[email protected]>
    Date:   Tue Jun 20 23:41:45 2023 +0800

        [Keyboard] Add Keychron C1 Pro (qmk#20700)

        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: Drashna Jaelre <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 965cfec
    Merge: a2e2d92 958cae3
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:39:02 2023 +0000

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

    commit 958cae3
    Author: Roberts Kursitis <[email protected]>
    Date:   Tue Jun 20 18:38:26 2023 +0300

        [Keyboard] Add Alisaie (qmk#21266)

    commit a2e2d92
    Merge: d98b60c 0abe312
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:36:05 2023 +0000

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

    commit 0abe312
    Author: Derek <[email protected]>
    Date:   Tue Jun 20 11:35:23 2023 -0400

        [Keyboard] Add bigsmoothknob (qmk#21265)

        Co-authored-by: Joel Challis <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit d98b60c
    Author: jonylee@hfd <[email protected]>
    Date:   Tue Jun 20 10:31:46 2023 +0800

        Move kb83 keyboard (qmk#20761)

        * move hfdkb/keyboard_sw/k83 --> inland/kb83

        * move hfdkb/keyboard_sw/k83 --> inland/kb83

        * Update data/mappings/keyboard_aliases.hjson

        * Update keyboard_aliases.hjson

        * fixed  the Configurator layout data

        * fixed the Configurator layout data

        * Revert "Update keyboard_aliases.hjson"

        This reverts commit c085c54.

        * Revert "fixed  the Configurator layout data"

        * Update keyboard_aliases.hjson

        * Update info.json

    commit 808228c
    Merge: be6f92c 7bd1d18
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 01:56:07 2023 +0000

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

    commit 7bd1d18
    Author: Drashna Jaelre <[email protected]>
    Date:   Mon Jun 19 18:55:27 2023 -0700

        [Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (qmk#21290)

        Co-authored-by: Ryan <[email protected]>

    commit be6f92c
    Merge: b749a5f 31e39a9
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 01:46:21 2023 +0000

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

    commit 31e39a9
    Author: James Young <[email protected]>
    Date:   Mon Jun 19 18:45:47 2023 -0700

        dnworks SBL Community Layout Support and Touch-Up (qmk#21267)

    commit b749a5f
    Author: jack <[email protected]>
    Date:   Mon Jun 19 13:59:35 2023 -0600

        Fixup `nightly_boards/n40_o` (qmk#21307)

    commit c4a67d3
    Author: jack <[email protected]>
    Date:   Mon Jun 19 09:46:27 2023 -0600

        Remove encoder in-matrix workaround code (qmk#20389)
jesperhellberg pushed a commit to jesperhellberg/qmk_firmware that referenced this pull request Sep 9, 2023
@jonylee1986 @jesperhellberg
Move kb83 keyboard (qmk#20761)
2932fc5 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
thismarvin pushed a commit to thismarvin/qmk_firmware that referenced this pull request Sep 27, 2023
@jonylee1986 @thismarvin
Move kb83 keyboard (qmk#20761)
bc6ef1c 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
akeep pushed a commit to akeep/qmk_firmware that referenced this pull request Oct 2, 2023
@jonylee1986 @akeep
Move kb83 keyboard (qmk#20761)
f582e69 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
csolje pushed a commit to csolje/qmk_firmware that referenced this pull request Oct 21, 2023
@jonylee1986 @csolje
Move kb83 keyboard (qmk#20761)
a7f8ee7 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
jashort pushed a commit to jashort/qmk_firmware that referenced this pull request Nov 20, 2023
@jonylee1986 @jashort
Move kb83 keyboard (qmk#20761)
d8131ea 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
@jonylee1986 @autoferrit
Move kb83 keyboard (qmk#20761)
29cabe0 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lesshonor lesshonor lesshonor approved these changes

@dunk2k dunk2k dunk2k approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jonylee1986 @noroadsleft @drashna @fauxpark @dunk2k @lesshonor