mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-24 01:17:07 +06:00
Code Issues Packages Projects Releases Wiki Activity
15,359 Commits 8 Branches 1,419 Tags 332 MiB
fe58770df8
Commit Graph

15359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
6817771df7 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 04:57:18 +00:00
Ryan
e527b375e8
TKC M0lly refactor (#12227) 2021-03-17 15:56:45 +11:00
QMK Bot
ed8ffa4bb4 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 03:10:20 +00:00
Mojitas
4e8a218d17
[Keymap] Mojito - removed layer macros (#12201) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-16 20:09:45 -07:00
QMK Bot
3c92142f12 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 03:06:02 +00:00
peepeetee
57de02c9f2
[Keyboard] fix bm68rgb default keymap (#12199) 2021-03-16 20:05:20 -07:00
QMK Bot
c680c84a31 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 02:50:20 +00:00
Kyle McAlpine
3c4972a53f
[Keyboard] Fix issue with process_record_kb in Torn (#12189) 2021-03-16 19:49:48 -07:00
QMK Bot
da752e5d7d Merge remote-tracking branch 'origin/master' into develop 2021-03-17 02:44:50 +00:00
stanrc85
6af387ec6f
[Keymap] stanrc85 keymap updates (#12184) 2021-03-16 19:44:13 -07:00
QMK Bot
cefa23e4eb Merge remote-tracking branch 'origin/master' into develop 2021-03-17 02:24:08 +00:00
Gavin Austin
554b73643d
[Keyboard] Added Roses Lite Support (#12173) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-16 19:23:35 -07:00
QMK Bot
07ea935533 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 01:39:42 +00:00
Simon Arlott
e941ae3811
[Keyboard] Add YMDK NP24 (ATmega32U4 with 6 RGB LEDs) (#12120) 2021-03-16 18:39:09 -07:00
Michael Stapelberg
1d341ffbb0
core: add support for MK66F18 (Teensy 3.6) micro controller (#12258) 
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
 2021-03-17 06:45:21 +11:00
QMK Bot
319031154d Merge remote-tracking branch 'origin/master' into develop 2021-03-16 07:01:35 +00:00
James Young
f75420c209
box75: fix key positioning in info.json (#12256) 
* fix key positioning for box75
 2021-03-16 00:00:59 -07:00
QMK Bot
2defbde5ab Merge remote-tracking branch 'origin/master' into develop 2021-03-15 23:10:08 +00:00
Matteo Montemarani
d99806cc27
Pizza Keyboards Pizza65 addition (#11604) 
* Added Pizza65 from Pizza Keyboards

Addition of Pizza65

* Update pizza65.h

* Update info.json

* Update mcuconf.h

* Update rules.mk

* Updated makefile

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/rules.mk

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/readme.md

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

* Update keyboards/pizzakeyboards/pizza65/readme.md

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Chibios Config migration

* Update keyboards/pizzakeyboards/pizza65/readme.md

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/readme.md

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/pizza65.h

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update rules.mk

nk rollover activation

* conf updates

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c

Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c

Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>

* Update keymap.c

thanks to Acaban

* Update pizza65.h

update to the iso_blocker_doublebs layout macro

* Delete chconf.h

Deleting after the ChibiOS-conf migration.

* Delete config.h

Deleting after the ChibiOS-conf migration.

* Revert "Delete config.h"

This reverts commit 16d64619e68578382aca3b1475968563b662d07f.

* Delete mcuconf.h

Deleting after ChibiOS-conf migration.

* Delete halconf.h

Deleting after ChibiOS-conf migrations.

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
 2021-03-16 10:09:29 +11:00
QMK Bot
c12eae0c5e Merge remote-tracking branch 'origin/master' into develop 2021-03-15 23:03:53 +00:00
kb-elmo
cd8497b9fb
add support for Noah AVR PCB (#11563) 
* add support for Noah AVR PCB

* Update info.json

* Update readme.md

* Update keyboards/kb_elmo/noah_avr/rules.mk

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

* Update keymap.c

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-03-16 10:03:16 +11:00
James Young
469b4b21d2
Fixes for recent info.json files (#12248) 2021-03-16 07:45:39 +11:00
QMK Bot
56d193c5c8 Merge remote-tracking branch 'origin/master' into develop 2021-03-15 17:42:47 +00:00
vattern
926389f3a7
Keyboard/grandiceps (#11933) 
* Add Grandiceps keyboard

* Fix info.json

* Fix typo

* Fix typo

* cleanup format

* move mcu files to root

* Updated with PR changes

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* PR issues for chibios confmigrate

* PR Changes

Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-15 17:42:09 +00:00
QMK Bot
c3a2a7659e Merge remote-tracking branch 'origin/master' into develop 2021-03-15 08:25:35 +00:00
James Young
52b7ebd6be
M10-A refactor (#12242) 2021-03-15 19:25:00 +11:00
QMK Bot
8b9419aaf7 Merge remote-tracking branch 'origin/master' into develop 2021-03-15 08:07:38 +00:00
James Young
2e50b34c67
Add missing info.json files for keyboards (#12239) 
Recent changes to QMK Configurator's API have made it so an info.json file is required for QMK Configurator to know how to render the keyboard in question.

This PR adds info.json files for keyboards that did not have them, with a few exceptions for boards whose layouts I was unable to determine.

* add info.json file for 2key2crawl

* add info.json file for 40percentclub/4x4

* add info.json file for 40percentclub/5x5

* add info.json file for 4pplet/aekiso60/rev_a

* add info.json file for 4pplet/steezy60/rev_a

* add info.json file for 6ball

* add info.json file for 7c8/framework

* add info.json file for aeboards/constellation

* add info.json file for alpine65

* add info.json file for aplyard/aplx6

* add info.json file for arch_36

* add info.json file for arisu

* add info.json file for box75

* add info.json file for butterstick

* add info.json file for four_banger

* add info.json file for geekboards/tester

* add info.json file for handwired/2x5keypad

* add info.json file for handwired/412_64

* add info.json file for handwired/42

* add info.json file for handwired/aplx2

* add info.json file for handwired/brain

* add info.json file for handwired/cans12er

* add info.json file for handwired/ck4x4

* add info.json file for handwired/d48

* add info.json file for handwired/dactyl_manuform/dmote/62key

* add info.json file for handwired/daishi

* add info.json file for handwired/hexon38

* add info.json file for handwired/jot50

* add info.json file for handwired/jotanck

* add info.json file for handwired/jotpad16

* add info.json file for handwired/k8split

* add info.json file for handwired/myskeeb

* add info.json file for handwired/nicekey

* add info.json file for handwired/onekey

* add info.json file for handwired/postageboard

* add info.json file for handwired/riblee_f401

* add info.json file for handwired/riblee_f411

* add info.json file for handwired/rs60

* add info.json file for handwired/splittest

* add info.json file for handwired/trackpoint

* add info.json file for handwired/traveller

* add info.json file for hhkb_lite_2

* add info.json file for honeycomb

* add info.json file for ivy/rev1

* add info.json file for keebio/viterbi

* add info.json file for laptreus

* add info.json file for latin47ble

* add info.json file for latin64ble

* add info.json file for launchpad/rev1

* add info.json file for lets_split_eh/eh

* add info.json file for mechmini/v1

* add info.json file for meira

* add info.json file for meishi

* add info.json file for merge/iso_macro

* add info.json file for mschwingen/modelm

* add info.json file for pabile/p20

* add info.json files for pimentoso/paddino02

rev1, rev2/left, and rev2/right

* add info.json file for rgbkb/pan

* add info.json files for runner3680

3x6, 3x7, 3x8, 4x6, 4x7, 4x8, 5x6, 5x7, and 5x8

* add info.json file for sck/gtm

* add info.json file for splitish

* add info.json file for standaside

* add info.json file for ungodly/launch_pad

* add info.json file for xelus/trinityxttkl

* Revert "add info.json file for rgbkb/pan"

This reverts commit 280b89bc6157023a621a9864f5d74d59d62bb511.

* correct maintainer for ivy/rev1
 2021-03-15 01:06:55 -07:00
QMK Bot
2f59e1c1d9 Merge remote-tracking branch 'origin/master' into develop 2021-03-15 01:21:48 +00:00
github-actions[bot]
a18e1305b3
Format code according to conventions (#12244) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-03-15 12:21:14 +11:00
QMK Bot
998c58e89b Merge remote-tracking branch 'origin/master' into develop 2021-03-15 01:19:36 +00:00
xyzz
0779c34db8
Fix keycode mappings for via and ensure they don't change within protocol (#12130) 
* Fix keycode mappings for via and ensure they don't change within protocol

* Update keycodes

* Fix broken keyboards

* added the missing keycodes found in via

* Remove invalid keycodes

Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
 2021-03-15 12:19:01 +11:00
QMK Bot
35db567c9c Merge remote-tracking branch 'origin/master' into develop 2021-03-14 21:51:52 +00:00
NightlyBoards
9e1d04fea7
[Keyboard] Added Adellein Keyboard/PCB (#11547) 2021-03-14 14:51:21 -07:00
QMK Bot
93929e8d01 Merge remote-tracking branch 'origin/master' into develop 2021-03-14 20:19:39 +00:00
yhaliaw
b44bffe954
[Keymap] Add yhaliaw keymap for Planck/Rev6.1. (#11318) 2021-03-14 13:19:05 -07:00
QMK Bot
75867ff164 Merge remote-tracking branch 'origin/master' into develop 2021-03-14 20:17:43 +00:00
Ryan
739925c902
Add info.json for RGBKB Pan (#12218) 2021-03-15 07:17:09 +11:00
QMK Bot
78be537eff Merge remote-tracking branch 'origin/master' into develop 2021-03-14 19:56:33 +00:00
Monksoffunk
45e6bb7add
Add Cassette42 (#10562) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-15 06:55:59 +11:00
QMK Bot
d036ebeaf6 Merge remote-tracking branch 'origin/master' into develop 2021-03-14 19:24:07 +00:00
milestogo
7b7689d307
[Keymap] miles2go userspace update, add functions for babblepaste library, add prime_e keybard keymap (#9196) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-03-14 12:23:30 -07:00
Ryan
f236395176
LED Matrix: Clean up includes (#12197) 2021-03-13 11:38:26 +11:00
QMK Bot
5590c40b5b Merge remote-tracking branch 'origin/master' into develop 2021-03-13 00:38:14 +00:00
peepeetee
aa73411c14
Update RGB matrix effects documentation (#12181) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-13 11:37:39 +11:00
QMK Bot
71bb07d10a Merge remote-tracking branch 'origin/master' into develop 2021-03-12 22:38:13 +00:00
yiancar
b96c18c952
Hand 88 (#11963) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-13 09:37:41 +11:00
QMK Bot
e83f4e0173 Merge remote-tracking branch 'origin/master' into develop 2021-03-12 21:58:40 +00:00
Dan Thomas
225bff226f
fix info.json layout name for boardsource/5x12 (#12145) 2021-03-13 08:57:50 +11:00
QMK Bot
0ee473afd1 Merge remote-tracking branch 'origin/master' into develop 2021-03-12 21:50:57 +00:00