summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #126 from lalalademaxiya1/keychron_q6_prolokher2023-07-0328-0/+2662
|\
| * Updated q6 prolalalademaxiya12023-06-301-3/+1
| * Merge branch 'temp' into keychron_q6_prolalalademaxiya12023-06-30222-6240/+3620
| |\
| * | Update keyboards/keychron/q6_pro/rules.mklalalademaxiya12023-06-301-1/+0
| * | Update keyboards/keychron/q6_pro/q6_pro.hlalalademaxiya12023-06-301-1/+1
| * | Update keyboards/keychron/q6_pro/mcuconf.hlalalademaxiya12023-06-301-3/+0
| * | Update keyboards/keychron/q6_pro/q6_pro.clalalademaxiya12023-06-301-1/+0
| * | Update keyboards/keychron/q6_pro/info.jsonlalalademaxiya12023-06-301-1/+0
| * | Update keyboards/keychron/q6_pro/halconf.hlalalademaxiya12023-06-301-1/+0
| * | Update keyboards/keychron/q6_pro/ansi_encoder/config.hlalalademaxiya12023-06-301-3/+1
| * | Update keyboards/keychron/bluetooth/transport.clalalademaxiya12023-06-301-2/+0
| * | Add q6 pro isolalalademaxiya12023-06-1920-199/+1169
| * | Fix key keep down after keyboard waked uplalalademaxiya12023-06-082-0/+6
| * | Update k6_pro.clalalademaxiya12023-06-061-1/+5
| * | Update q6_pro.c fixed the wrong pid and device name after factory resetlalalademaxiya12023-06-051-3/+5
| * | Update q6_pro.clalalademaxiya12023-06-051-15/+32
| * | Correct encoder map definition spellinglalalademaxiya12023-05-244-122/+122
| * | Update q6 prolalalademaxiya12023-05-225-13/+10
| * | Add keychron q6 prolalalademaxiya12023-05-2217-0/+1679
* | | Merge branch 'temp' into keychron_q8_prolalalademaxiya12023-06-30222-6240/+3620
|\ \ \ | | |/ | |/|
| * | fix K2 Pro caplock LED issue on startuplokher2023-06-278-2/+0
| * | add compiled firmwarelokher2023-06-1542-0/+0
| * | move OPT_DEFS += -DKC_BLUETOOTH_ENABLE to bluetooth.mklokher2023-06-1329-54/+57
| * | fix conflictionlokher2023-06-1210-99/+99
| * | Merge branch 'dd-config-bt-playground' of https://github.com/adophoxia/qmk_fi...Adophoxia2023-05-268-18/+17
| |\ \
| | * \ Merge branch 'dd-config-bt-playground' of https://github.com/adophoxia/qmk_fi...Adophoxia2023-05-262-2/+2
| | |\ \
| | | * | Update keyboards/keychron/k6_pro/info.jsonadophoxia2023-05-261-1/+1
| | | * | Update keyboards/keychron/k3_pro/info.jsonadophoxia2023-05-261-1/+1
| | * | | Removed duplicate `vid` in seperate variant folders & use correct `rgb_matrix...Adophoxia2023-05-266-16/+15
| | |/ /
| * / / Remove effects from `k8_pro/iso/white/config,h`Adophoxia2023-05-261-26/+0
| |/ /
| * | Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmwa...Adophoxia2023-05-254-4/+4
| |\|
| * | Move `LAYOUT` options for Q Pro back into seperate variantsAdophoxia2023-05-257-371/+373
| * | Update keyboards/keychron/q3_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/q2_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/q1_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k9_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k8_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k7_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k6_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k5_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k4_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k3_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k2_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k1_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k13_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Update keyboards/keychron/k10_pro/info.jsonadophoxia2023-05-251-3/+0
| * | Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmwa...Adophoxia2023-05-141-2/+1
| |\ \
| * | | Move `custom_lite` options from `rules.mk` to `info.json`Adophoxia2023-05-142-2/+0
| * | | Move `vid` into main `info.json` for K and Q ProAdophoxia2023-04-2950-41/+42
| * | | DD-conversion for odd K-Pro seriesAdophoxia2023-04-2863-2268/+1312