mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-12-29 12:48:52 +06:00
Code Issues Packages Projects Releases Wiki Activity
d58dc522a5
keychron_qmk_firmware/users
History
James Young 7bec943043
Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch
2021-08-09 12:14:22 -07:00
..
_example
333fred [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
ajp10304
alfrdmalr
anderson
arkag 2021 May 29 Breaking Changes Update (#13034) 2021-05-29 14:38:50 -07:00
art
badger
bbaserdem Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bcat Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
billypython [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
bocaj Fix RGB/LED Suspend defines (#13146) 2021-06-09 22:59:19 -07:00
brandonschlack add missing _MACRO to users/brandonschlack/brandonschlack.h 2021-01-30 13:11:33 -08:00
brett
callum rename callum's custom keycode that conflicts with a LUFA define 2021-01-30 13:11:33 -08:00
cbbrowne
cjuniet
csc027 [Keymap] csc027/keymap-updates (#12694) 2021-05-13 20:54:41 -07:00
curry Fix RGB/LED Suspend defines (#13146) 2021-06-09 22:59:19 -07:00
cwebster2 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
d4mation Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
danielo515 keymap_extras: Remove deprecated defines (#12949) 2021-07-06 09:05:11 +10:00
datagrok
dennytom/chording_engine
devdev [Keymap] add personal keymap files, and sofle_rgb default maps, (#12267) 2021-05-26 22:30:34 -07:00
dhertz [Keymap] Add dhertz' kanu layout (#11346) 2021-01-12 17:53:15 -08:00
doogle999 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
draevin Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
drashna [Keymap] Drashna split transport improvement (#13905) 2021-08-07 21:40:48 -07:00
dshields Remove API_SYSEX_ENABLEs from rules.mk (#13389) 2021-06-30 23:30:42 -07:00
dudeofawesome
edvorakjp [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
ericgebhart Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
gary
gordon Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
greatwizard 2021 May 29 Breaking Changes Update (#13034) 2021-05-29 14:38:50 -07:00
haervig [Keymap] Add haervig userspace and keymaps (#13362) 2021-07-01 10:12:19 -07:00
hvp undef TAPPING_TERM in users/hvp/hvp.h 2021-01-30 13:11:33 -08:00
ibnuda
imchipwood [Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924) 2021-07-20 09:40:54 -07:00
ishtob Remove MIDI_ENABLE_STRICT from user keymaps (#11750) 2021-02-06 09:35:10 +11:00
issmirnov Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jackhumbert
jarred
jdelkins Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
kageurufu
klackygears
konstantin [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
kuatsure
kuchosauronad0 [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
losinggeneration Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
manna-harbour_miryoku [Keymap] Update Miryoku (#13307) 2021-07-03 09:09:02 -07:00
mattly
mechmerlin
mguterl
miles2go Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
mnil [Keymap] Add my keymaps for the Keebio Iris and Planck (#13005) 2021-06-18 17:55:56 -07:00
mtdjr [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
mverteuil
narze [Keymap] Add narze lily58 keymap & update my other keymaps (#13110) 2021-07-03 00:50:32 -07:00
nchristus
ninjonas Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
noroadsleft Update noroadsleft userspace and keymaps (2021-06-02) (#13086) 2021-06-02 23:06:30 -07:00
not-quite-neo
nstickney [User] changes to nstickney's keymaps (#11456) 2021-08-09 10:34:36 -07:00
pcoves
peej [Keymap] Add peej userspace and keymaps (#11332) 2021-01-19 13:10:28 +11:00
pvinis [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
replicaJunction
riblee Add OLED support for Riblee F411 (#10778) 2020-11-02 21:20:22 +00:00
ridingqwerty Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
rishka
rmw
romus Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
rossman360
rs 2021 May 29 Breaking Changes Update (#13034) 2021-05-29 14:38:50 -07:00
rupa userspace and keymap changes for rupa (#10489) 2020-11-10 16:04:46 +11:00
rverst [Keymap] Feature/extend keymap (#12778) 2021-06-24 12:23:43 +10:00
scheiklp
sethBarberee Update sethBarberee Userspace (#12620) 2021-05-08 10:26:51 -07:00
sigma
sigul keymap_extras: Remove deprecated defines (#12949) 2021-07-06 09:05:11 +10:00
snowe snowe keymap/userspace and Ocean Dream animation (#12477) 2021-06-24 12:21:40 +10:00
spacebarracecar keymap_extras: Remove deprecated defines (#12949) 2021-07-06 09:05:11 +10:00
spidey3 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
spotpuff Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
stanrc85 [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
talljoe Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tominabox1 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
turbomech [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
twschum
vosechu
wanleg
xtonhasvim
xulkal [Bug] Develop - Change uint32_t to layer_state_t (#13596) 2021-07-19 09:50:55 -07:00
yanfali Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
yet-another-developer 2021 May 29 Breaking Changes Update (#13034) 2021-05-29 14:38:50 -07:00
zer09
readme.md
yanfali_wkl

readme.md

User space

This is a place for users to put code that they might use between keyboards. If you build the keymap mine, /users/mine/rules.mk will be included in your build, and /users/mine/ will be in your path - keep these things in mind when naming your files and referencing them from other places.