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] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

Merged
merged 13 commits into from
Jun 5, 2023
Merged

[Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

merged 13 commits into from
Jun 5, 2023

Conversation

will-hedges
Copy link
Contributor

@will-hedges will-hedges commented Jun 2, 2023 •
edited
Loading

Description

The G60BLE folder rules.mk does not currently use the custom Bluetooth driver for the keyboard. If the G60BLE is flashed with a .hex compiled from source, it can be paired over Bluetooth but will not function.

This PR updates the G60BLE folder with the following:

  • updated g60ble/rules.mk to enable Bluetooth and custom driver
  • reorganized g60ble/config.h to better match g60/config.h
  • added my personal keymap to demonstrate successful compile and sending tap dances over Bluetooth
  • copied over matrix_diagram.md from g60, added 2.75u RShift

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

  • N/A

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 Jun 2, 2023
lesshonor
lesshonor suggested changes Jun 3, 2023
View reviewed changes
keyboards/bioi/g60ble/rules.mk Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the via Adds via keymap and/or updates keyboard for via support label Jun 3, 2023
will-hedges and others added 9 commits June 3, 2023 10:25
@will-hedges
added bluetooth code to rules.mk for BT + QMK
d3cecce 
* copied matrix diagram from g60
* reorganized config.h to better mirror g60
@will-hedges
added my keymap
aeb58be 
* compiles successfully, tap dances working over bluetooth
@will-hedges
reverted licensing, removed VIA_ENABLE from kb rules.mk
9cf5990
@will-hedges
moved tap dance C file to keymap, disabled NKRO at kb level
59d9f5e 
* BT does not support NKRO
@will-hedges @waffle87
Move layers from #define to enum layers
19889da 
Co-authored-by: jack <0x6a73@protonmail.com>
@will-hedges @waffle87
Update maxtrix diagram description from g60 to g60ble
30b4bb4 
Co-authored-by: jack <0x6a73@protonmail.com>
@will-hedges
added license to my keymap.c
e8be5fe
@will-hedges
changed layer order, added mod taps
1ff6254 
* default layer should be for work
* added benefit of _FN1 blank keys trickling down to _QWER
* changed defined FN1_CAPS LT in keymap rather than above
@will-hedges
added Ctrl + Alt + Del to _WORK
df6c741
@will-hedges will-hedges changed the title Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps [Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps Jun 3, 2023
@will-hedges will-hedges requested a review from lesshonor June 4, 2023 14:52
@waffle87 waffle87 merged commit 8f108d1 into qmk:master Jun 5, 2023
@will-hedges will-hedges mentioned this pull request Jun 7, 2023
Open
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jun 9, 2023
@freznel10
Squashed commit of the following:
1aabcfd 
commit 4c60ebd
Merge: 806b61c 2322819
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 9 01:46:47 2023 +0000

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

commit 2322819
Author: Jack Humbert <jack.humb@gmail.com>
Date:   Thu Jun 8 21:46:09 2023 -0400

    Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (qmk#21175)

    * adds planck/rev7

    * Remove config.h include

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

    * convert planck matrices to lite implementation

    ---------

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

commit 806b61c
Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date:   Fri Jun 9 10:00:22 2023 +1000

    [Core] RGB matrix ws2812 update (qmk#21135)

    * ws2812_update boolean to stop update every single cycle

    * lint1

    Co-authored-by: Joel Challis <git@zvecr.com>

    * lint2

    Co-authored-by: Joel Challis <git@zvecr.com>

    * Update quantum/rgb_matrix/rgb_matrix_drivers.c

    ---------

    Co-authored-by: Joel Challis <git@zvecr.com>

commit 760a976
Merge: f861695 a9f677b
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 20:08:49 2023 +0000

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

commit a9f677b
Author: Ryan <fauxpark@gmail.com>
Date:   Fri Jun 9 06:08:02 2023 +1000

    Slightly refine `g_led_config` parsing (qmk#21170)

commit f861695
Merge: d1d0925 4c6c387
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 09:11:17 2023 +0000

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

commit 4c6c387
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Jun 8 17:10:30 2023 +0800

    Add an emphasis on QMK MSYS terminal (qmk#21168)

    * Add an emphasis on QMK MSYS terminal

    Not using MSYS terminal is a frequent user error. This change
    adds an additional statement to guide users to run the first
    command in MSYS itself. Edited the same statement for consistency
    in the other OSes.

    * Update instructions for the other operating systems

commit d1d0925
Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date:   Thu Jun 8 11:58:53 2023 +1000

    [Core] Optimisation - Add RGB LED colour set check in drivers (qmk#21134)

commit 9a6056d
Merge: cc64247 d042b92
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 01:47:47 2023 +0000

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

commit d042b92
Author: NortonTech <haydentnorton@gmail.com>
Date:   Wed Jun 7 19:47:06 2023 -0600

    Add NortonTech handwired keypad (NortonTechPad) (qmk#21148)

commit cc64247
Merge: 90ea9e4 f136171
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 01:03:58 2023 +0000

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

commit f136171
Author: biuboom-jun <65760331+biuboom-jun@users.noreply.github.com>
Date:   Thu Jun 8 09:03:17 2023 +0800

    add kibou/wendy (qmk#21150)

commit 90ea9e4
Author: dexter93 <d3xter93@gmail.com>
Date:   Thu Jun 8 04:01:45 2023 +0300

    Reset `matrix_need_update` properly in eager debouncing algorithms (qmk#21154)

    The `matrix_need_update` variable needs to be reset to `false` in
    `transfer_matrix_values()`, otherwise that function continues to be
    invoked for every scanning loop (forever with `sym_eager_pk` and
    `sym_eager_pk`, or until some key gets released with
    `asym_eager_defer_pk`), and the scanning rate gets much lower because of
    all that useless work.

    Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

commit a059d12
Merge: 3fa92a4 dffbe1e
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:57:41 2023 +0000

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

commit dffbe1e
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 7 16:57:05 2023 -0700

    monoflex60: fix LAYOUT_60_iso_tsangan implementation (qmk#21158)

commit 3fa92a4
Merge: 5427494 57c5f3e
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:56:53 2023 +0000

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

commit 57c5f3e
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 7 16:55:49 2023 -0700

    poker87d: correct layout data (qmk#21159)

commit 5427494
Merge: fd1e638 ae0342c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:00:02 2023 +0000

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

commit ae0342c
Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Date:   Thu Jun 8 00:59:13 2023 +0200

    [Bugfix] LVGL bindings wrong offset math (qmk#21147)

commit fd1e638
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Jun 8 04:12:49 2023 +0800

    Use unsigned integer for mousekey kinetic speed (qmk#21151)

commit a02230f
Merge: ff1d7d2 bb57aa2
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 21:55:10 2023 +0000

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

commit bb57aa2
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Jun 6 14:54:31 2023 -0700

    peej/tripel: correct layout data (qmk#21145)

    Corrects the layout data for all three versions of the Peej Tripel.

commit ff1d7d2
Merge: 64eb985 45d0608
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 21:46:52 2023 +0000

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

commit 45d0608
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Jun 6 14:46:15 2023 -0700

    xelus/rs108: correct layout data (qmk#21146)

commit 64eb985
Merge: 6c9c948 dd9712c
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 07:04:38 2023 +0000

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

commit dd9712c
Author: Travis Mick <lq@le1.ca>
Date:   Tue Jun 6 01:03:57 2023 -0600

    [Keyboard] Add egg58 (qmk#21021)

commit 6c9c948
Merge: f61abde 97014f0
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:46:59 2023 +0000

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

commit 97014f0
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:46:21 2023 -0400

    [Keyboard] Add Scotto36 handwired keyboard (qmk#21104)

    Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

commit f61abde
Merge: 5b3e41c eaef139
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:43:14 2023 +0000

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

commit eaef139
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:42:27 2023 -0400

    [Keyboard] Add Scotto40 handwired keyboard (qmk#21103)

commit 5b3e41c
Merge: b0c483b e1c4b7c
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:35:05 2023 +0000

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

commit e1c4b7c
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:34:28 2023 -0400

    [Keyboard] Add ScottoStarter handwired keyboard (qmk#21101)

commit b0c483b
Merge: 4c928b0 43ce7b0
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:18:16 2023 +0000

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

commit 43ce7b0
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Tue Jun 6 13:17:39 2023 +0800

    [Docs] Highlight keymap name entry (qmk#21138)

commit 4c928b0
Merge: c9cf971 9167e66
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:14:31 2023 +0000

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

commit 9167e66
Author: FanXingStudio <133078117+FanXingStudio@users.noreply.github.com>
Date:   Tue Jun 6 13:13:47 2023 +0800

    [Keyboard] add kibou/harbour (qmk#21131)

commit c9cf971
Author: Ryan <fauxpark@gmail.com>
Date:   Tue Jun 6 11:08:04 2023 +1000

    Move `RGBLED_SPLIT` to data driven (qmk#21113)

    Co-authored-by: Joel Challis <git@zvecr.com>

commit f91ca76
Merge: 3617cbd 04812e9
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 5 20:43:42 2023 +0000

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

commit 04812e9
Author: Jeayo Keh <gezhaoyou@126.com>
Date:   Tue Jun 6 04:43:02 2023 +0800

    [Keyboard] Add soda/mango (qmk#21100)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Joel Challis <git@zvecr.com>

commit 3617cbd
Merge: 83a726c 8f108d1
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 5 20:35:00 2023 +0000

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

commit 8f108d1
Author: Will Hedges <36576135+will-hedges@users.noreply.github.com>
Date:   Mon Jun 5 15:34:22 2023 -0500

    [Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120)

    Co-authored-by: jack <0x6a73@protonmail.com>
alinelena pushed a commit to alinelena/qmk_firmware that referenced this pull request Jun 12, 2023
@will-hedges @waffle87 @alinelena
[Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120)
746ca28 
Co-authored-by: jack <0x6a73@protonmail.com>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jun 16, 2023
@freznel10
Squashed commit of the following:
8fdf5f8 
commit 579db61
Merge: dc435a0 94311e4
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 20:57:46 2023 +0000

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

commit 94311e4
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 15 13:57:13 2023 -0700

    Alas: ISO Layouts Fix and Matrix Diagram (qmk#21255)

commit dc435a0
Merge: e8ca83a 5263dfb
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 20:56:50 2023 +0000

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

commit 5263dfb
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 15 13:56:07 2023 -0700

    ButterKeebs PocketPad: correct layout data (qmk#21256)

commit e8ca83a
Author: Ryan <fauxpark@gmail.com>
Date:   Thu Jun 15 22:27:26 2023 +1000

    Move `RGBLIGHT_SPLIT` to data driven (qmk#21190)

    * Move `RGBLIGHT_SPLIT` to data driven

    * Remove where `split_count` is already set

commit c011eb1
Merge: 53d7604 9b36ec5
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 12:19:44 2023 +0000

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

commit 9b36ec5
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 15 05:18:56 2023 -0700

    DOIO KB30 Refactor (qmk#21250)

    * refactor keymaps

    - remove extra blank lines
    - convert tabs to spaces
    - use four-space indent
    - grid-align keycodes
    - use QMK-native keycode aliases

    * info.json: correct layout data

    * add readme.md

    * info.json: correct maintainer field

    Updates the value to reference the maintainer's GitHub username.

commit 53d7604
Merge: dd69649 66f06a1
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:29:09 2023 +0000

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

commit 66f06a1
Author: Sleepdealr <35879391+Sleepdealr@users.noreply.github.com>
Date:   Thu Jun 15 00:28:06 2023 -0400

    [Keyboard] Add Artemis Paragon (qmk#20910)

    Co-authored-by: jack <0x6a73@protonmail.com>

commit dd69649
Merge: 5c03941 8f980ea
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:26:11 2023 +0000

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

commit 8f980ea
Author: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Date:   Thu Jun 15 12:25:23 2023 +0800

    [Keyboard] add top40 keyboard. (qmk#21199)

    Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

commit 5c03941
Merge: 03c4530 bbba1d0
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:24:28 2023 +0000

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

commit bbba1d0
Author: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Date:   Thu Jun 15 12:23:46 2023 +0800

    [Keyboard] add acr87 keyboard. (qmk#21200)

commit 03c4530
Merge: 8ee0cb5 3703d5a
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:22:24 2023 +0000

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

commit 3703d5a
Author: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date:   Wed Jun 14 23:20:49 2023 -0500

    [Keyboard] Adding OSAv2 Numpad Topre support (qmk#21224)

commit 8ee0cb5
Merge: 2add1fb a2c17d5
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:08:59 2023 +0000

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

commit a2c17d5
Author: Andrew Kannan <andrew.kannan@gmail.com>
Date:   Thu Jun 15 00:08:16 2023 -0400

    [Keyboard] Add CannonKeys Leviatan PCB (qmk#21231)

commit 2add1fb
Author: Duncan Sutherland <dunk2k_2000@hotmail.com>
Date:   Thu Jun 15 05:06:18 2023 +0100

    [Keyboard] `dactyl_manuform/6x7` pin correction (qmk#21240)

commit f594b99
Merge: ee6320c 9220344
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 04:00:51 2023 +0000

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

commit 9220344
Author: Gastón Jorquera <email@gaston.life>
Date:   Thu Jun 15 00:00:13 2023 -0400

    [Keymap] Left Control is now ESC when tapped (qmk#21241)

commit ee6320c
Merge: 6c7c588 8785810
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 03:59:31 2023 +0000

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

commit 8785810
Author: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Date:   Thu Jun 15 00:58:55 2023 -0300

    Modernize M75H and M75S firmwares (qmk#21244)

commit 6c7c588
Author: Nick Brassel <nick@tzarc.org>
Date:   Thu Jun 15 13:48:19 2023 +1000

    Rely on introspection to handle OOB access. (qmk#21247)

commit 88d9b7e
Merge: 9103b63 baa9252
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 03:30:22 2023 +0000

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

commit baa9252
Author: dztech <moyi4681@users.noreply.github.com>
Date:   Thu Jun 15 11:29:39 2023 +0800

    [Keyboard] add pluto keyboard (qmk#21225)

commit 9103b63
Merge: 6fdf4ba 776e980
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 15 01:46:17 2023 +0000

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

commit 776e980
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 14 18:45:37 2023 -0700

    4pplet Waffling60 Rev D ISO Layout Fix and Additions (qmk#21236)

    * correct layout data

    * add matrix diagram

    * rename LAYOUT to LAYOUT_all

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan_split_rshift

    * add LAYOUT_60_iso_wkl_split_bs_rshift

    * add LAYOUT_60_iso_wkl_split_rshift

commit 6fdf4ba
Merge: 7bafae6 f5ee7b7
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 14 16:27:44 2023 +0000

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

commit f5ee7b7
Author: Danny <nooges@users.noreply.github.com>
Date:   Wed Jun 14 12:26:46 2023 -0400

    Add Sinc Rev. 4 (qmk#21130)

    * Fork Rev. 3 to 4

    * Update RGB LED positions

    * Adjust RGB positions

    * Enable more RGB modes

    * Update copyrights

    * Add license headers to keymaps

    * Use same type of license header

    Co-authored-by: Joel Challis <git@zvecr.com>

    * Fix I2C pins

    ---------

    Co-authored-by: Joel Challis <git@zvecr.com>

commit 7bafae6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 14 07:31:51 2023 -0700

    FJLabs Swordfish Layout Macro Refactor (qmk#21234)

    * physically arrange layout macro

    Arranges the layout macro to QMK standards (left to right, row by row).

    This change breaks compatibility with out-of-tree keymaps, because the
    order in which the keycode arguments must be passed is changed.

    * rename `LAYOUT_alice_all` to `LAYOUT_split_bs`

    * add `LAYOUT_2u_bs` macro

commit 9551a0a
Author: Ryan <fauxpark@gmail.com>
Date:   Wed Jun 14 22:01:13 2023 +1000

    Move `RGBLIGHT_LED_MAP` to data driven (qmk#21095)

commit 6c42861
Merge: 5fd5590 4055f2a
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 14 06:27:47 2023 +0000

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

commit 4055f2a
Author: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Date:   Wed Jun 14 14:27:08 2023 +0800

    [Keyboard]add 5108 Keyboard. (qmk#21184)

    Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
    Co-authored-by: jack <0x6a73@protonmail.com>

commit 5fd5590
Merge: aefdb39 5598754
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 13 15:18:40 2023 +0000

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

commit 5598754
Author: rhmokey <57172003+rhmokey@users.noreply.github.com>
Date:   Tue Jun 13 23:17:55 2023 +0800

    [Keyboard] Add mokey12x2 (qmk#20702)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Joel Challis <git@zvecr.com>

commit aefdb39
Merge: d9bea01 1194a6f
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 13 15:09:23 2023 +0000

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

commit 1194a6f
Author: Alabahuy <rezzaadio@gmail.com>
Date:   Tue Jun 13 22:08:37 2023 +0700

    [Keyboard] jaykeeb skyline (qmk#21219)

commit d9bea01
Merge: fd2a516 e8b7244
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 13 15:05:55 2023 +0000

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

commit e8b7244
Author: Alberto Pavano <38161192+ATron789@users.noreply.github.com>
Date:   Tue Jun 13 16:05:03 2023 +0100

    [Keyboard] rainkeebs trailmix (qmk#20189)

    Co-authored-by: jack <0x6a73@protonmail.com>

commit fd2a516
Merge: f4529eb dabbc93
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 13 06:33:41 2023 +0000

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

commit dabbc93
Author: David Hoelscher <infinityis@users.noreply.github.com>
Date:   Tue Jun 13 01:32:54 2023 -0500

    [Keyboard] Add ErgoStrafer keyboard (qmk#21195)

commit f4529eb
Author: Duncan Sutherland <dunk2k_2000@hotmail.com>
Date:   Tue Jun 13 07:19:38 2023 +0100

    [Keymap] Fix `scheikled` keymap for `dactyl_manuform/4x6` (qmk#21206)

commit af58f26
Merge: 94aaf38 ca6921b
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 13 06:17:56 2023 +0000

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

commit ca6921b
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 13 02:17:18 2023 -0400

    [Keyboard] Add ScottoNum macropad (qmk#21208)

commit 94aaf38
Merge: 84c7aaa 2d838d8
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 12 19:08:59 2023 +0000

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

commit 2d838d8
Author: Joe Scotto <contact@joescotto.com>
Date:   Mon Jun 12 15:08:13 2023 -0400

    [Keyboard] Add ScottoFrog macropad (qmk#21209)

commit 84c7aaa
Merge: f830b53 53f20b1
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 12 01:12:57 2023 +0000

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

commit 53f20b1
Author: Alabahuy <rezzaadio@gmail.com>
Date:   Mon Jun 12 08:12:19 2023 +0700

    [Keyboard] Add orba keyboard (qmk#21132)

commit f830b53
Merge: 1fcb9a0 fdb2851
Author: QMK Bot <hello@qmk.fm>
Date:   Sun Jun 11 07:56:32 2023 +0000

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

commit fdb2851
Author: Joe Scotto <contact@joescotto.com>
Date:   Sun Jun 11 03:56:20 2023 -0400

    [Keyboard] Add ScottoSplit Keyboard (qmk#20945)

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

commit 40c3b71
Author: flashquark <59234072+flashquark@users.noreply.github.com>
Date:   Sun Jun 11 03:55:06 2023 -0400

    [Keyboard] Add Flashquark Horizon Z (qmk#21055)

    Co-authored-by: jack <0x6a73@protonmail.com>

commit 1fcb9a0
Merge: beaf650 33c93d3
Author: QMK Bot <hello@qmk.fm>
Date:   Sun Jun 11 07:53:05 2023 +0000

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

commit 33c93d3
Author: Joe Scotto <contact@joescotto.com>
Date:   Sun Jun 11 03:52:43 2023 -0400

    [Keyboard] Add Scotto34 (PCB Edition) (qmk#21085)

    Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

commit 1914fbd
Author: Joe Scotto <contact@joescotto.com>
Date:   Sun Jun 11 03:52:24 2023 -0400

    [Keyboard] Add Scotto9 handwired macropad (qmk#21105)

    Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit beaf650
Merge: cf6c924 bfdfeb6
Author: QMK Bot <hello@qmk.fm>
Date:   Sun Jun 11 07:51:56 2023 +0000

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

commit bfdfeb6
Author: FanXingStudio <133078117+FanXingStudio@users.noreply.github.com>
Date:   Sun Jun 11 15:51:17 2023 +0800

    [Keyboard] Add kibou/winter (qmk#21161)

commit cf6c924
Author: Duncan Sutherland <dunk2k_2000@hotmail.com>
Date:   Sun Jun 11 08:48:56 2023 +0100

    [Keyboard] correct and modernise `dactyl_manuform/6x7` variant (qmk#21176)

commit 3444e96
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Sun Jun 11 14:55:03 2023 +0800

    Refactor the rain lighting decision operator (qmk#21139)

commit 55f2261
Merge: c4b1168 8cd9f07
Author: QMK Bot <hello@qmk.fm>
Date:   Sun Jun 11 06:27:53 2023 +0000

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

commit 8cd9f07
Author: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date:   Sun Jun 11 01:27:13 2023 -0500

    [Keyboard] Adding OSAv2 Topre PCB (qmk#21080)

commit c4b1168
Merge: 38edc48 dd8b4dc
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 23:34:17 2023 +0000

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

commit dd8b4dc
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Sat Jun 10 16:33:33 2023 -0700

    Atreyu: correct layout data (qmk#21197)

commit 38edc48
Merge: ea70b36 57b23b8
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 20:35:55 2023 +0000

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

commit 57b23b8
Author: Allen Choi <37539914+Thunderbird2086@users.noreply.github.com>
Date:   Sun Jun 11 04:35:15 2023 +0800

    [Keymap] thunderbird2086 layer status with RGB lighting/matrix (qmk#21063)

commit ea70b36
Merge: 0d574cd eee9a53
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 15:02:22 2023 +0000

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

commit eee9a53
Author: Florent Linguenheld <f@linguenheld.fr>
Date:   Sat Jun 10 17:01:44 2023 +0200

    Up keymap (qmk#20769)

    flinguenheld keymap aurora sweep

commit 0d574cd
Merge: c69bc9d 08289fc
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 14:59:13 2023 +0000

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

commit 08289fc
Author: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date:   Sat Jun 10 16:58:36 2023 +0200

    EC Alveus (qmk#20840)

    Cipulot's EC Alveus PR

commit c69bc9d
Merge: a9a68ff f35cb92
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 14:57:25 2023 +0000

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

commit f35cb92
Author: Tom Barnes <tom@mechboards.co.uk>
Date:   Sat Jun 10 15:56:43 2023 +0100

    Update newbs docs with some rp2040 stuff (qmk#21186)

    * Update newbs_building_firmware_configurator.md

    * Update docs/newbs_flashing.md

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

commit a9a68ff
Merge: b9d78e4 e01e3fc
Author: QMK Bot <hello@qmk.fm>
Date:   Sat Jun 10 02:17:31 2023 +0000

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

commit e01e3fc
Author: Jared <jaredthebass@gmail.com>
Date:   Fri Jun 9 19:16:46 2023 -0700

    Typo Correction in planck/rev7 readme.md (qmk#21194)

    Corrected typo explaining encoder requirements.

commit b9d78e4
Merge: c8e47be a875f7f
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 9 23:49:38 2023 +0000

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

commit a875f7f
Author: Joe Scotto <contact@joescotto.com>
Date:   Fri Jun 9 19:48:55 2023 -0400

    [Keyboard] Add ScottoGame Keyboard (qmk#20940)

commit c8e47be
Merge: c871f6a e3b80b4
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 9 18:35:05 2023 +0000

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

commit e3b80b4
Author: Ryan <fauxpark@gmail.com>
Date:   Sat Jun 10 04:34:24 2023 +1000

    Remove some keymap-level info.jsons (qmk#21191)

commit c871f6a
Merge: 4c60ebd 04b7a26
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 9 14:51:59 2023 +0000

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

commit 04b7a26
Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Date:   Fri Jun 9 16:51:17 2023 +0200

    Fix typo (qmk#21189)

commit 4c60ebd
Merge: 806b61c 2322819
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 9 01:46:47 2023 +0000

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

commit 2322819
Author: Jack Humbert <jack.humb@gmail.com>
Date:   Thu Jun 8 21:46:09 2023 -0400

    Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (qmk#21175)

    * adds planck/rev7

    * Remove config.h include

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

    * convert planck matrices to lite implementation

    ---------

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

commit 806b61c
Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date:   Fri Jun 9 10:00:22 2023 +1000

    [Core] RGB matrix ws2812 update (qmk#21135)

    * ws2812_update boolean to stop update every single cycle

    * lint1

    Co-authored-by: Joel Challis <git@zvecr.com>

    * lint2

    Co-authored-by: Joel Challis <git@zvecr.com>

    * Update quantum/rgb_matrix/rgb_matrix_drivers.c

    ---------

    Co-authored-by: Joel Challis <git@zvecr.com>

commit 760a976
Merge: f861695 a9f677b
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 20:08:49 2023 +0000

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

commit a9f677b
Author: Ryan <fauxpark@gmail.com>
Date:   Fri Jun 9 06:08:02 2023 +1000

    Slightly refine `g_led_config` parsing (qmk#21170)

commit f861695
Merge: d1d0925 4c6c387
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 09:11:17 2023 +0000

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

commit 4c6c387
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Jun 8 17:10:30 2023 +0800

    Add an emphasis on QMK MSYS terminal (qmk#21168)

    * Add an emphasis on QMK MSYS terminal

    Not using MSYS terminal is a frequent user error. This change
    adds an additional statement to guide users to run the first
    command in MSYS itself. Edited the same statement for consistency
    in the other OSes.

    * Update instructions for the other operating systems

commit d1d0925
Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date:   Thu Jun 8 11:58:53 2023 +1000

    [Core] Optimisation - Add RGB LED colour set check in drivers (qmk#21134)

commit 9a6056d
Merge: cc64247 d042b92
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 01:47:47 2023 +0000

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

commit d042b92
Author: NortonTech <haydentnorton@gmail.com>
Date:   Wed Jun 7 19:47:06 2023 -0600

    Add NortonTech handwired keypad (NortonTechPad) (qmk#21148)

commit cc64247
Merge: 90ea9e4 f136171
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 8 01:03:58 2023 +0000

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

commit f136171
Author: biuboom-jun <65760331+biuboom-jun@users.noreply.github.com>
Date:   Thu Jun 8 09:03:17 2023 +0800

    add kibou/wendy (qmk#21150)

commit 90ea9e4
Author: dexter93 <d3xter93@gmail.com>
Date:   Thu Jun 8 04:01:45 2023 +0300

    Reset `matrix_need_update` properly in eager debouncing algorithms (qmk#21154)

    The `matrix_need_update` variable needs to be reset to `false` in
    `transfer_matrix_values()`, otherwise that function continues to be
    invoked for every scanning loop (forever with `sym_eager_pk` and
    `sym_eager_pk`, or until some key gets released with
    `asym_eager_defer_pk`), and the scanning rate gets much lower because of
    all that useless work.

    Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

commit a059d12
Merge: 3fa92a4 dffbe1e
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:57:41 2023 +0000

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

commit dffbe1e
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 7 16:57:05 2023 -0700

    monoflex60: fix LAYOUT_60_iso_tsangan implementation (qmk#21158)

commit 3fa92a4
Merge: 5427494 57c5f3e
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:56:53 2023 +0000

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

commit 57c5f3e
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Jun 7 16:55:49 2023 -0700

    poker87d: correct layout data (qmk#21159)

commit 5427494
Merge: fd1e638 ae0342c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Jun 7 23:00:02 2023 +0000

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

commit ae0342c
Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Date:   Thu Jun 8 00:59:13 2023 +0200

    [Bugfix] LVGL bindings wrong offset math (qmk#21147)

commit fd1e638
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Jun 8 04:12:49 2023 +0800

    Use unsigned integer for mousekey kinetic speed (qmk#21151)

commit a02230f
Merge: ff1d7d2 bb57aa2
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 21:55:10 2023 +0000

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

commit bb57aa2
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Jun 6 14:54:31 2023 -0700

    peej/tripel: correct layout data (qmk#21145)

    Corrects the layout data for all three versions of the Peej Tripel.

commit ff1d7d2
Merge: 64eb985 45d0608
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 21:46:52 2023 +0000

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

commit 45d0608
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Jun 6 14:46:15 2023 -0700

    xelus/rs108: correct layout data (qmk#21146)

commit 64eb985
Merge: 6c9c948 dd9712c
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 07:04:38 2023 +0000

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

commit dd9712c
Author: Travis Mick <lq@le1.ca>
Date:   Tue Jun 6 01:03:57 2023 -0600

    [Keyboard] Add egg58 (qmk#21021)

commit 6c9c948
Merge: f61abde 97014f0
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:46:59 2023 +0000

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

commit 97014f0
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:46:21 2023 -0400

    [Keyboard] Add Scotto36 handwired keyboard (qmk#21104)

    Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

commit f61abde
Merge: 5b3e41c eaef139
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:43:14 2023 +0000

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

commit eaef139
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:42:27 2023 -0400

    [Keyboard] Add Scotto40 handwired keyboard (qmk#21103)

commit 5b3e41c
Merge: b0c483b e1c4b7c
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:35:05 2023 +0000

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

commit e1c4b7c
Author: Joe Scotto <contact@joescotto.com>
Date:   Tue Jun 6 01:34:28 2023 -0400

    [Keyboard] Add ScottoStarter handwired keyboard (qmk#21101)

commit b0c483b
Merge: 4c928b0 43ce7b0
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:18:16 2023 +0000

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

commit 43ce7b0
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Tue Jun 6 13:17:39 2023 +0800

    [Docs] Highlight keymap name entry (qmk#21138)

commit 4c928b0
Merge: c9cf971 9167e66
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Jun 6 05:14:31 2023 +0000

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

commit 9167e66
Author: FanXingStudio <133078117+FanXingStudio@users.noreply.github.com>
Date:   Tue Jun 6 13:13:47 2023 +0800

    [Keyboard] add kibou/harbour (qmk#21131)

commit c9cf971
Author: Ryan <fauxpark@gmail.com>
Date:   Tue Jun 6 11:08:04 2023 +1000

    Move `RGBLED_SPLIT` to data driven (qmk#21113)

    Co-authored-by: Joel Challis <git@zvecr.com>

commit f91ca76
Merge: 3617cbd 04812e9
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 5 20:43:42 2023 +0000

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

commit 04812e9
Author: Jeayo Keh <gezhaoyou@126.com>
Date:   Tue Jun 6 04:43:02 2023 +0800

    [Keyboard] Add soda/mango (qmk#21100)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Joel Challis <git@zvecr.com>

commit 3617cbd
Merge: 83a726c 8f108d1
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Jun 5 20:35:00 2023 +0000

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

commit 8f108d1
Author: Will Hedges <36576135+will-hedges@users.noreply.github.com>
Date:   Mon Jun 5 15:34:22 2023 -0500

    [Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120)

    Co-authored-by: jack <0x6a73@protonmail.com>
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
@will-hedges @waffle87 @coquizen
[Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120)
6f02502 
Co-authored-by: jack <0x6a73@protonmail.com>
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
@will-hedges @waffle87 @autoferrit
[Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120)
b648d64 
Co-authored-by: jack <0x6a73@protonmail.com>
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

@waffle87 waffle87 waffle87 approved these changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@will-hedges @drashna @fauxpark @waffle87 @lesshonor