qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-28 12:58:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
22,760 Commits 58 Branches 1,722 Tags
d0e737c686add65300120224e82e94e422e1ecc2
Commit Graph
22760 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot d0e737c686 Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 00:23:20 +00:00
QMK Bot 4e50de3a4b Merge remote-tracking branch 'origin/master' into develop 2022-08-04 00:22:37 +00:00
James Young 5a631ed9ac Balloondogcaps TR90 and TR90PM: rename LAYOUT to LAYOUT_ortho_3x3 (#17879) 
* balloondogcaps/tr90: rename LAYOUT to LAYOUT_ortho_3x3

* balloondogcaps/tr90pm: rename LAYOUT to LAYOUT_ortho_3x3
 2022-08-04 01:21:59 +01:00
QMK Bot 4b807a0d8a Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:56:37 +00:00
QMK Bot 42a36a2095 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:55:51 +00:00
QMK Bot dced141e2f Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:55:08 +00:00
James Young b01814bf68 boardsource/the_mark: add QMK Configurator layout data (#17898) 
* boardsource/the_mark: add QMK Configurator layout data

* add keyboard maintainers to info.json

Adds the individual and organization accounts as listed maintainers.
 2022-08-03 23:54:50 +01:00
QMK Bot d8a15ce5bb Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:54:33 +00:00
QMK Bot 7d8fdfb412 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:53:56 +00:00
Ryan a30c1884c7 Move keyboard USB IDs and strings to data driven: U (#17900) 2022-08-03 23:53:46 +01:00
QMK Bot adf8218399 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:53:16 +00:00
Ryan 1fd8d5c322 Move keyboard USB IDs and strings to data driven: V (#17901) 2022-08-03 23:52:24 +01:00
QMK Bot d664fbac28 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:13:54 +00:00
QMK Bot 0a198b59a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:13:21 +00:00
Ryan a8744b1630 Move keyboard USB IDs and strings to data driven: S (#17889) 2022-08-04 08:12:37 +10:00
QMK Bot 67cf91dcea Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:06:50 +00:00
QMK Bot 237039cdcd Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:06:14 +00:00
Ryan b40c03140e Move keyboard USB IDs and strings to data driven: R (#17885) 2022-08-04 08:05:40 +10:00
QMK Bot f8c7eafaf6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 20:08:44 +00:00
QMK Bot c6a6f987c9 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 20:08:10 +00:00
Joel Challis 92bcbee226 Fix up splittest/bluepill (#17897) 2022-08-03 21:06:54 +01:00
QMK Bot fcdaabd3cf Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 17:24:30 +00:00
QMK Bot f326b0b40e Merge remote-tracking branch 'origin/master' into develop 2022-08-03 17:23:55 +00:00
Stephen J BushDrashna JaelreJoel ChallisRyan
 		df8a538489 Userspace: muppetjones (#1) (#13461) 
* Userspace: muppetjones (#1)

Add and update lily58 to work with userspace
Add and update kyria keymap to work with userspace
Add and update planck keymap with userspace
Add etchamouse code and docs to userpace
Add userspace
Update mouse encoder for smoother movement.
Encoder + mouse
Added casemodes by andrewjrae

* Rollback lily58 state reader and add missing GPL

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* fix lily58 keymap

* Updates to user and lily for muppetjones.

Updated parameters for etchamouse for smoother mouse movement. Updated lily keymap and userspace to actually work together.

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

* Updated keymaps and userspace

* Little more cleanup.

* Update keyboards/lily58/keymaps/muppetjones/rules.mk

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

* Rollback accidental libchibios update

* Apply suggestions from code review

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

* Update kyria keymap

* Move kyria keymap to splitkb/kyria

* Update planck keymap

* Remove all changes to keyboards/lily58/lib/layer_state_reader.c

* Update lily58 keymap

* Recommended change

* Update keymap readme

* Update kyria keymap and userspace

* Apply suggestions from code review

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

* Renamed users/muppetjones/README.md to lc

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-03 18:23:17 +01:00
QMK Bot f48b1bce35 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 14:59:50 +00:00
QMK Bot e93124f05c Merge remote-tracking branch 'origin/master' into develop 2022-08-03 14:59:13 +00:00
Ryan 5f6cf24294 Move keyboard USB IDs and strings to data driven: Q (#17883) 2022-08-03 15:58:29 +01:00
QMK Bot 0560cc0500 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 13:21:40 +00:00
QMK Bot 4c81d4e526 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 13:20:50 +00:00
yuleiandDrashna Jaelre c4e767b4c9 added neson design's 700e keyboard (#17768) 
* added neson design's 700e keyboard

* Apply suggestions from code review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-03 14:20:10 +01:00
QMK Bot 2e17c4d44c Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 10:33:49 +00:00
QMK Bot 671e211930 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 10:33:16 +00:00
jotix 4ec2626b43 jotix's community ortho_4x12 layout change (#17891) 2022-08-03 11:32:23 +01:00
QMK Bot 62f5899e98 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 08:33:45 +00:00
QMK Bot 2dfccd29c8 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 08:33:04 +00:00
dvermdandRyan 0206bd9df3 add bluepill mcu to splittest (#16959) 
* add bluepill mcu to splittest

* fix typo

* refactoring

* mcu config goes to mcuconf.h of keyboard
* keymap specific config goes to keymap config.h
* keyboard specific depending of keymap goes to post_config.h

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* splittest/bluepill: improve documentation

Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-03 09:31:37 +01:00
QMK Bot 663c4c7848 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 07:24:30 +00:00
QMK Bot 61a3fe4fac Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:23:52 +00:00
Ryan b6757d2380 Move keyboard USB IDs and strings to data driven: P (#17875) 2022-08-03 17:23:15 +10:00
QMK Bot 5a166ff290 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 07:17:10 +00:00
QMK Bot d4f9eb5225 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:16:28 +00:00
Ryan 3da6575e24 Move keyboard USB IDs and strings to data driven: M (#17859) 2022-08-03 17:15:43 +10:00
QMK Bot bdf98363cd Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 07:05:18 +00:00
QMK Bot bce4fb4574 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:04:43 +00:00
RyanandJames Young 1b92c204c1 Move keyboard USB IDs and strings to data driven: K (#17846) 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-08-03 17:03:47 +10:00
QMK Bot cf2a96525b Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 06:49:11 +00:00
QMK Bot d52d7bc658 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 06:48:37 +00:00
kkokdaeandDrashna Jaelre ce9bb6d39b [keymap] Add kkokdae keymap for keyboardio/atreus (#17843) 
* [keymap] Add kkokdae keymap for keyboardio/atreus

* Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c

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

* Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c

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

* Revert "Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c"

This reverts commit 8e9ccc78c7.

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-03 07:47:48 +01:00
QMK Bot 90a07b78cf Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 06:11:58 +00:00
QMK Bot 40499bed06 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 06:11:19 +00:00