mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-28 03:26:51 +06:00
Code Issues Packages Projects Releases Wiki Activity
17,350 Commits 8 Branches 1,419 Tags 332 MiB
fc50b6d22e
Commit Graph

17350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
fc50b6d22e Merge remote-tracking branch 'origin/master' into develop 2021-08-16 20:11:52 +00:00
James Young
d9bb42e37b
Linworks Fave87 Layout Macro Refactor (#14008) 
* correct LAYOUT_tkl_ansi data

Number row was positioned 0.25u too low.

* correct LAYOUT_tkl_ansi macro

- remove position K027 (right half of Split Backspace)
- remove position K096 (right portion of Split Right Shift)

* correct LAYOUT_tkl_iso macro

- remove position K027 (right half of Split Backspace)
- remove position K096 (right portion of Split Right Shift)

* enable Community Layout support

* add LAYOUT_tkl_ansi_split_bs_rshift and LAYOUT_tkl_iso_split_bs_rshift
 2021-08-16 13:11:09 -07:00
Joel Challis
2bc8215ce5
Unify behaviour of wait on AVR (#14025) 2021-08-16 17:28:12 +01:00
QMK Bot
4818debcd0 Merge remote-tracking branch 'origin/master' into develop 2021-08-16 10:18:27 +00:00
James Young
0c6155ec42
Pimentoso TouhouPad Layout Macro refactor (#14010) 
* physically arrange layout macro, phase 1

Break the keymap up into rows.

* physically arrange layout macro, phase 2

Moves the Escape and Enter keys to the top row.

* refactor default keymap

- use QMK short-form keycodes
- grid align keycodes

* physically arrange layout macro, phase 3

Moves the X key (Bomb) to the bottom row.

* physically arrange layout macro, phase 4

Physically arrange the Escape and Enter keys.

* physically arrange layout macro, phase 5

Physically arrange the arrow keys.

* physically arrange layout macro, phase 6

Physically align the X (Bomb) key.

* align escape characters in layout macro

* info.json: apply human-friendly formatting
 2021-08-16 03:17:25 -07:00
QMK Bot
6c662a600c Merge remote-tracking branch 'origin/master' into develop 2021-08-16 06:44:50 +00:00
James Young
b512afc347
Fix line endings in keyboards/absinthe/keymaps/via/rules.mk (#14028) 2021-08-15 23:44:03 -07:00
QMK Bot
3202b3900e Merge remote-tracking branch 'origin/master' into develop 2021-08-16 02:41:52 +00:00
James Young
3c3c5965f1
Gorthage Truck Refactor (#14006) 
* info.json: apply human-friendly formatting

* info.json: make key labels more friendly to `qmk info -l`

* correct LAYOUT_3u key sequence

* correct LAYOUT_7u key sequence

* correct LAYOUT_10u key sequence

* refactor default keymap

- use QMK short-form keycodes
- update grid alignment
- use four-space indent
- touch up with `qmk cformat`

* refactor 10u keymap

- use QMK short-form keycodes
- add encoder_update_user() function
- update grid alignment
- use four-space indent

* refactor 7u keymap

- use QMK short-form keycodes
- add encoder_update_user() function
- update grid alignment
- use four-space indent

* refactor gorthage_truck.h

- update grid alignments
- use XXX for KC_NO
- insert omitted KC_NO instances

* correct keyboard metadata in info.json

- use GitHub username for maintainer
- correct keyboard dimensions

* add encoder_update_kb() function to gorthage_truck.c

Gives QMK Configurator compile jobs encoder functionality.

* update maintainer field in info.json

As requested by jpuerto96 (s8erdude).
 2021-08-15 19:41:02 -07:00
Joel Challis
ab941ce614
Move all the flash logic from tmk_core (#13927) 2021-08-15 21:55:23 +01:00
Drashna Jaelre
4e3726bfe1
Fixup Audio startup and add to documents (#13606) 
* Fixup Audio startup and add to documents

* fix doc descriptions
 2021-08-15 21:51:50 +01:00
James Young
4b453dca92
Remove MIDI Configuration boilerplate (#11151) 
* remove keyboard-level instances of `MIDI_ENABLE = no`

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e  '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} +
```

Co-Authored-By: Nick Brassel <nick@tzarc.org>

* fix case-sensitivity issues on MIDI_ENABLE

Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} +
```

* replace `# MIDI controls` with `# MIDI support`

Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} +
```

* align inline comments

Aligns the inline comments to the length used by the QMK AVR rules.mk template.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes           # MIDI support;g'  {} +
```

* remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} +
```

* remove MIDI configuration boilerplate from keyboard config.h files

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-08-16 06:51:13 +10:00
Zach White
fd340f8957
Defer the expensive search for layout macros until info.json has been processed (#14007) 
* defer the expensive search for layout macros until info.json has been processed

* fixup names
 2021-08-16 06:30:58 +10:00
Drashna Jaelre
f56c202fb3
Fix ifdefs for OLED split sync code (#14017) 2021-08-15 00:54:08 -07:00
Drashna Jaelre
488aaa0980
Enable sync of OLED/ST7565 display on/off state on Splits (#13542) 
* Enable sync of OLED/ST7565 display on/off state on Splits

* Only send if states are not matched

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-08-15 15:39:08 +10:00
fauxpark
4b3691e72d Merge remote-tracking branch 'upstream/master' into develop 2021-08-15 15:27:25 +10:00
Ryan
4c93c350a6
AL1 refactor (#13679) 2021-08-15 15:19:01 +10:00
Ryan
b1d8efeb59
LFKeyboards: Replace KC_FNx with F(x) (#13999) 2021-08-15 15:18:41 +10:00
Zach White
8a54127782
Fix errors that have cropped up in develop (#14005) 
* frooastboard: remove duplicate values from config.h

* pistachio_pro: remove unused pin D5
 2021-08-15 11:02:46 +10:00
Zach White
60a36863bc
[Keyboard] ez_maker/directpins for easy one-offs in qmk_configurator (#13321) 
* new keyboard: handwired/directpins

* fix promicro keyboard_name

* add teensy2 and teensy2++ support

* align with handwired/onekey

* tweak pids

* add teensy 3.2 and teensy lc to directpins

* move directpins from handwired to ez_maker

* add docs for easy maker
 2021-08-14 08:42:59 -07:00
QMK Bot
110a320321 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 15:08:27 +00:00
Ramon Imbao
209fd753cb
[Keyboard] Add TKL-FF PCB (#14003) 2021-08-14 08:07:55 -07:00
QMK Bot
a6d77fdf27 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 14:59:20 +00:00
Rifaa Subekti
1e4f0d9dcf
[Keyboard] add Stealth macropad (#13986) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-14 07:58:44 -07:00
QMK Bot
0bb9a5c128 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 14:18:47 +00:00
Ryan
fce12f0075
Rework keymap_extras docs (#13949) 2021-08-15 00:18:20 +10:00
QMK Bot
3c013ca7b0 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 13:20:22 +00:00
James Young
de29364827
Ducky One2mini Layout Macro fixes (#14002) 2021-08-14 23:19:50 +10:00
QMK Bot
d1be25e9ab Merge remote-tracking branch 'origin/master' into develop 2021-08-14 09:10:32 +00:00
James Young
47b76f556b
Function96 V2 Configurator fixes (#13996) 
* info.json: apply human-friendly formatting

* correct key sequence for LAYOUT_iso

* correct key sequence for LAYOUT_iso_splitspace

* add layout data for LAYOUT_all
 2021-08-14 02:10:03 -07:00
QMK Bot
4039c5dda9 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 09:03:03 +00:00
James Young
90583a1668
Orthocode Layout Macro rework (#13995) 
* move rotary encoder to top row of layout macro

Makes the layout macro and keycodes resemble the assembled keyboard.

* update info.json data

- convert tabs to spaces
- use human-friendly formatting
- fill in key object labels
- adjust object sequence for layout macro changes
 2021-08-14 02:02:24 -07:00
QMK Bot
e021357299 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 08:48:55 +00:00
James Young
e2c6dadfbf
Noxary 378 Layout Macro rework (#13998) 
* physically arrange layout macro

* add info.json
 2021-08-14 01:48:25 -07:00
QMK Bot
3036189584 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 06:36:00 +00:00
yulei
ed350a1aa6
add falcon keyboard (#13674) 
* added falcon keyboard

* Update keyboards/matrix/falcon/rules.mk

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

* Update keyboards/matrix/falcon/rules.mk

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* added description for the bootloader

* Apply suggestions from code review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-14 16:35:32 +10:00
QMK Bot
1715fa0e8b Merge remote-tracking branch 'origin/master' into develop 2021-08-14 04:55:04 +00:00
Ramon Imbao
088d6abf54
[Keyboard] Add Irene Keyboard (#13991) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-13 21:54:38 -07:00
Pete Sevander
fd3dc3a997
Fix combo_disable (#13988) 
- Dump key buffer when combos are disabled.
- Recursive calls to `dump_key_buffer` need to start dumping the buffer
  from index i+1 to avoid possible infinite loops.
- Handle combo key releases even though combo processing is disabled.
 2021-08-14 14:45:52 +10:00
Drashna Jaelre
2881517097
Fix Line endings in Absinthe VIA keymap (#13997) 2021-08-14 13:57:41 +10:00
QMK Bot
e80772da40 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 01:15:07 +00:00
Joshua T
ade989962a
[Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-13 18:14:21 -07:00
QMK Bot
1412a785ed Merge remote-tracking branch 'origin/master' into develop 2021-08-14 00:01:38 +00:00
James Young
424b9ff709
Crin Refactor (#13982) 
* rename LAYOUT_default to LAYOUT_all

* apply human-friendly formatting to info.json

* correct keyboard dimensions

* correct data for LAYOUT_tsangan

* add labels to LAYOUT_ansi data

* add labels to LAYOUT_all data

* add labels to LAYOUT_iso data

* crin.h: update grid alignment of matrix identifiers

* crin.h: add matrix diagram

* physically position matrix identifiers for LAYOUT_all

- move k2d to top row (right half of split Backspace)
- move k41 to fourth row (right half of split Left Shift [KC_NUBS])

* physically position matrix identifiers for LAYOUT_iso

- move k1d to top row ([KC_NUHS])
- add k41 to fourth row ([KC_NUBS], previously missing)

* refactor keymaps

- grid-align keycodes
- use four-space indent

* correct data for LAYOUT_iso

- move Enter key to home row

* rename LAYOUT_tsangan to LAYOUT_ansi_tsangan

* add LAYOUT_iso_tsangan

* update readme.md

- add `make` command for building
- add "Flashing example..."
- touch-up bootloader jump instructions (previous Markdown didn't render ideally on GitHub)

* extend keymap functionality

- add Grave Accent, Function keys, Print Screen, Scroll Lock and Pause keycodes to keymaps
- add RESET keycode (Fn+R)
- use KC_RGHT for Right arrow

* touch-up bootloader instructions on readme

- note that Bootmagic Lite jump erases persistent settings
- note that Fn+R is RESET keycode by default
 2021-08-13 17:01:05 -07:00
Drashna Jaelre
7ef4d0c886
Fix pmw3360 code to only output debug info if mouse debugging is enabled (#13993) 2021-08-13 14:20:47 -07:00
Drashna Jael're
7ed235d15d
Merge remote-tracking branch 'origin/master' into develop 2021-08-13 14:15:58 -07:00
Evelien-Lillian Dekkers
af98005b02
[Keyboard] Add Gud70 (#12575) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-13 12:53:02 -07:00
alittlepeace
9b922d55dd
[Keyboard] Adding VIA to Absinthe (#13031) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-13 12:35:56 -07:00
Sergey Omelchenko
74c9c3e9c2
[Keyboard] Macropad v2 polling rate fix (#13129) 2021-08-13 12:34:47 -07:00
eniigmakeyboards
4db9aa65b2
[Keyboard] Add eniigmakeyboards/ek60 (#13140) 
* add eniigmakeyboards/ek60

* Update keyboards/eniigmakeyboards/ek60/rules.mk

Updated layouts

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

* Update keymap.c

Added GPL2+ header

* Update keymap.c

Added GPL2+

* Update rules.mk

Added ISO layout here

* Update readme.md

Added instructions for resetting bootloader

* Update keyboards/eniigmakeyboards/ek60/rules.mk

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

Co-authored-by: adamws <adamws@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-13 12:34:27 -07:00