Commit Graph

28563 Commits

Author SHA1 Message Date
QMK Bot
7125743ae7 Merge remote-tracking branch 'origin/develop' into xap 2023-07-20 08:38:39 +00:00
QMK Bot
cfc16dd438 Merge remote-tracking branch 'origin/master' into develop 2023-07-20 08:37:54 +00:00
James Young
3597872702
Automata02 Alisaie Touch-Up (#21552)
* [style] friendly-format info.json

* [chore] remove key labels from info.json

* [chore] correct layout data

Fix a misleading Configurator implementation, and incorrect key sizes
and positioning on the bottom row.

* [chore] re-add key labels to info.json
2023-07-20 01:37:17 -07:00
QMK Bot
f42cb4e76e Merge remote-tracking branch 'origin/develop' into xap 2023-07-20 05:17:39 +00:00
QMK Bot
0056984506 Merge remote-tracking branch 'origin/master' into develop 2023-07-20 05:16:56 +00:00
James Young
5d0d39b522
HolySwitch Lightweight65 Community Layout Support (#21550)
* [chore] rename LAYOUT to LAYOUT_65_ansi_blocker

* [enhancement] enable Community Layout support
2023-07-19 22:16:17 -07:00
QMK Bot
12696c6a84 Merge remote-tracking branch 'origin/develop' into xap 2023-07-18 03:49:23 +00:00
QMK Bot
37b2ab4874 Merge remote-tracking branch 'origin/master' into develop 2023-07-18 03:48:46 +00:00
Alfredo Colas Gullon
b017e755c5
Fix compilation of lily58 rgb_state_reader (#21502) 2023-07-18 04:48:11 +01:00
QMK Bot
1df6315efe Merge remote-tracking branch 'origin/develop' into xap 2023-07-18 02:49:24 +00:00
QMK Bot
d095fe4436 Merge remote-tracking branch 'origin/master' into develop 2023-07-18 02:48:51 +00:00
James Young
5252f7f697
Keychron V4 Touch-Up (#21545)
* Keychron V4 ANSI: rename LAYOUT_ansi_61 to LAYOUT_60_ansi

* Keychron V4 ANSI: enable Community Layout support

* Keychron V4 ISO: correct layout data

Move position [3, 1] up by 0.25u.

* Keychron V4 ISO: rename LAYOUT_iso_62 to LAYOUT_60_iso

* Keychron V4 ISO: enable Community Layout support
2023-07-17 19:48:11 -07:00
QMK Bot
9bb8582864 Merge remote-tracking branch 'origin/develop' into xap 2023-07-17 20:49:29 +00:00
QMK Bot
77514e037d Merge remote-tracking branch 'origin/master' into develop 2023-07-17 20:48:49 +00:00
James Young
30f52ea770
GMMK2 65% ANSI Touch-Up (#21544)
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_65_ansi_blocker

Also adds a layout alias so as to not have to edit the user keymaps.

* [enhancement] enable Community Layout support
2023-07-17 13:48:15 -07:00
QMK Bot
a2e342f672 Merge remote-tracking branch 'origin/develop' into xap 2023-07-17 17:32:47 +00:00
QMK Bot
2ce895d80a Merge remote-tracking branch 'origin/master' into develop 2023-07-17 17:32:07 +00:00
James Young
f1aabbfdfa
AliceH66 Pianoforte Hotswap Touch-Up (#21542)
* [refactor] rename LAYOUT_tkl_ansi to LAYOUT_tkl_f13_ansi

* [enhancement] enable Community Layout support

* [chore] correct layout data

Correct the position of the spacebar.
2023-07-17 10:31:27 -07:00
QMK Bot
a330b18581 Merge remote-tracking branch 'origin/develop' into xap 2023-07-17 09:56:07 +00:00
Stefan Kerkmann
a992dc8c08
[Core] Update ChibiOS-Contrib (#21553) 2023-07-17 19:55:31 +10:00
QMK Bot
328f325dd1 Merge remote-tracking branch 'origin/develop' into xap 2023-07-16 13:43:35 +00:00
Ryan
da2d2f947d
quantum: remove direct quantum.h includes (#21507) 2023-07-16 23:42:56 +10:00
QMK Bot
676e226edb Merge remote-tracking branch 'origin/develop' into xap 2023-07-15 07:28:04 +00:00
Ryan
b9e5895184
Eliminate TMK_COMMON_* in makefiles (#21517) 2023-07-15 17:27:32 +10:00
QMK Bot
6b05f95aaf Merge remote-tracking branch 'origin/develop' into xap 2023-07-14 07:23:47 +00:00
QMK Bot
e5d99ec6af Merge remote-tracking branch 'origin/master' into develop 2023-07-14 07:23:13 +00:00
tan-t
fa0b4511dd
[Keyboard] add mothwing (#19342)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-07-14 00:22:38 -07:00
QMK Bot
cec986c3da Merge remote-tracking branch 'origin/develop' into xap 2023-07-14 03:16:36 +00:00
Joel Challis
28f29c63cb
Prepare ymdk/ymd75 for rev4 (#21484) 2023-07-14 04:15:59 +01:00
QMK Bot
e3b2a8fd0d Merge remote-tracking branch 'origin/develop' into xap 2023-07-12 23:15:35 +00:00
QMK Bot
6113857745 Merge remote-tracking branch 'origin/master' into develop 2023-07-12 23:15:00 +00:00
dependabot[bot]
28d5cd1696
Bump JamesIves/github-pages-deploy-action from 4.4.2 to 4.4.3 (#21518)
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.4.2...v4.4.3)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-07-13 00:14:23 +01:00
QMK Bot
fbe229c17c Merge remote-tracking branch 'origin/develop' into xap 2023-07-12 15:19:46 +00:00
QMK Bot
bfe27a00a0 Merge remote-tracking branch 'origin/master' into develop 2023-07-12 15:18:51 +00:00
QMK Bot
e0b4ac95c2 Merge remote-tracking branch 'origin/develop' into xap 2023-07-12 15:18:18 +00:00
Alabahuy
037e47800d
Fix jaykeeb indicator state and pins (#21466) 2023-07-12 09:18:12 -06:00
QMK Bot
49de9be0d8 Merge remote-tracking branch 'origin/master' into develop 2023-07-12 15:17:42 +00:00
takashicompany
c83ff03a40
[Keyboard] Add minidivide (#19870)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-07-12 09:17:04 -06:00
QMK Bot
acf5a886d7 Merge remote-tracking branch 'origin/develop' into xap 2023-07-12 08:39:33 +00:00
フィルターペーパー
83c73d42f9
process_combo: restore wait.h header (#21514)
Required for `wait_ms()` function
2023-07-12 09:38:59 +01:00
QMK Bot
793cba0963 Merge remote-tracking branch 'origin/develop' into xap 2023-07-12 01:29:48 +00:00
QMK Bot
e0ab8682e2 Merge remote-tracking branch 'origin/master' into develop 2023-07-12 01:29:11 +00:00
spbgzh
83c81826e3
[Keyboard] Add new nemui65 (#21304)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-07-11 19:28:36 -06:00
QMK Bot
85b8e59f5b Merge remote-tracking branch 'origin/develop' into xap 2023-07-11 15:53:11 +00:00
QMK Bot
876b9ed680 Merge remote-tracking branch 'origin/master' into develop 2023-07-11 15:52:28 +00:00
drewpyun
7f9653c1c8
[Keyboard] add rocketkeyboards mercury65 (#20811)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-07-11 08:51:48 -07:00
QMK Bot
94d2116a7c Merge remote-tracking branch 'origin/develop' into xap 2023-07-11 15:32:25 +00:00
QMK Bot
cbd42cb9ef Merge remote-tracking branch 'origin/master' into develop 2023-07-11 15:31:05 +00:00
QMK Bot
762f09d178 Merge remote-tracking branch 'origin/develop' into xap 2023-07-11 15:30:46 +00:00
Mike Cramer
a1eb2131ab
[Keymap] Dothtm/0.21/60 and 75 (#21442)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-07-11 08:30:29 -07:00