qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-11-15 12:16:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,637 Commits 60 Branches 1,725 Tags
3158dabb262beb094ecc6fd0a19655fbfa472d77
Commit Graph
15931 Commits
Author SHA1 Message Date
QMK Bot 3158dabb26 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 18:48:37 +00:00
QMK Bot 3042381679 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 18:47:54 +00:00
Alejandro Chacón 896f38c52c [Keyboard] Add alhenkb macropad (#20123) 2023-03-29 11:47:14 -07:00
QMK Bot 5358ce1e96 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 07:16:47 +00:00
Nick Brassel f18dd488da Fixup CI build for nack. (#20292) 2023-03-29 18:15:55 +11:00
QMK Bot ce3246a314 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 05:02:37 +00:00
fauxpark 9602938e9e Merge remote-tracking branch 'upstream/master' into develop 2023-03-29 16:00:41 +11:00
QMK Bot 04e3e0a55f Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:55:13 +00:00
RyanandNick Brassel 4869b8061c Move ortho & numpad layouts to data driven (#20183) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-03-29 15:54:34 +11:00
Ryan e2630f9b40 Fix some invalid layout macros (#20256) 2023-03-29 15:51:22 +11:00
QMK Bot b36a8e97e2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:48:41 +00:00
Ryan 06664e8a94 Fix layouts containing keys with multiple matrix positions (#20191) 2023-03-29 15:47:59 +11:00
QMK Bot 922b153a53 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 01:10:46 +00:00
QMK Bot 6195b4fca2 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 01:10:05 +00:00
Joel Challis e0b1637e15 I have zero involvement with this keyboard... (#20287) 2023-03-29 02:09:26 +01:00
QMK Bot c51fcb8057 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 16:29:41 +00:00
QMK Bot 26e60200ab Merge remote-tracking branch 'origin/master' into develop 2023-03-28 16:27:18 +00:00
takashicompanyandLess/Rikki a6b2b1ca41 Add new keyboard Tightwriter (#20136) 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
 2023-03-28 10:24:53 -06:00
QMK Bot 7cb5dce968 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 13:34:30 +00:00
QMK Bot 379bb62aac Merge remote-tracking branch 'origin/master' into develop 2023-03-28 13:33:45 +00:00
Albert Y 02cb5db67b Remove invalid characters (#20277) 2023-03-28 14:33:00 +01:00
QMK Bot 38c4a8e7d0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 05:43:22 +00:00
QMK Bot 7eabf7efd1 Merge remote-tracking branch 'origin/master' into develop 2023-03-28 05:42:43 +00:00
blindassassin111 00c3946fbe [keyboard] Correcting info.JSON for OSAv2 (#20247) 2023-03-27 23:42:04 -06:00
QMK Bot 5572a5eb99 Merge remote-tracking branch 'origin/develop' into xap 2023-03-27 19:01:46 +00:00
Joel Challis 79b0f9168e Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00
QMK Bot ff342d78d9 Merge remote-tracking branch 'origin/develop' into xap 2023-03-26 22:57:34 +00:00
QMK Bot 66d56a9480 Merge remote-tracking branch 'origin/master' into develop 2023-03-26 22:56:50 +00:00
Nick Brassel 3ee17cd5d3 [chore] keyboards/tzarc: Alignment with clang-format. (#20265) 2023-03-26 23:56:09 +01:00
QMK Bot eebe2e467a Merge remote-tracking branch 'origin/develop' into xap 2023-03-26 07:22:49 +00:00
Ryan 36ce81df59 Move WS2812_DRIVER to data driven (#20248) 2023-03-26 18:22:12 +11:00
QMK Bot 9ca6232eec Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:27:08 +00:00
QMK Bot 141d15cd12 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:26:13 +00:00
Andrew Kannan 153bcdcd8d Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK (#20131) 
* Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK

* Add 65_iso_blocker community layout support
 2023-03-23 20:25:15 +00:00
QMK Bot 8c5d59e6d0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:24:06 +00:00
QMK Bot e84d1ca3e7 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:23:28 +00:00
blindassassin111andDrashna Jaelre 37ac5e68e6 [Keyboard]Viktus Minne - Topre variant (#20044) 
* Adding the Viktus Minne topre pcb variant

* Update keyboards/viktus/minne_topre/readme.md

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

* Update rules.mk

* Moving layouts from *.h to info.json

* Removing minne_topre.h and updating others

* fixing *.c's

* Switch from int to void for ec_init

* Update info.json

* Update info.json

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-23 20:22:47 +00:00
QMK Bot 614c9cb871 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:21:34 +00:00
QMK Bot 1cbbe64e18 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:20:52 +00:00
blindassassin111 b035cd094b [keyboard] Correcting info.JSON for Viktus Minne (#20244) 2023-03-23 14:20:12 -06:00
QMK Bot 3d8aa1aade Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 17:22:21 +00:00
Ryan 1e07ff1fb1 Fix some more missing #pragma onces (#20241) 2023-03-23 17:21:37 +00:00
QMK Bot 12757600f2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:38:43 +00:00
Ryan ad625e7c06 Remove RGB_DI_PIN ifdefs (#20218) 2023-03-23 21:38:01 +11:00
QMK Bot 1be1e1547f Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:11:45 +00:00
QMK Bot b72b487b4d Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:10:35 +00:00
CipulotTom BarnesDrashna Jaelre
 		15cb7ded76 EC ProX PCB (#20047) 
* Add EC Pro X

Addition of EC Pro X PCB series.
This series comprises 2 versions:
- ANSI/ISO
- JIS

The PCBs are different and are compatible only with their respective cases.

* Moved from data driven row/col def to config def

* Added project url in info.json

* Implemented proper `LAYOUT_` changes

* Removen unnecessary `.h` includes

* Removal of `"w": 1`

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Fixed keymap error in ordering

* Update keyboards/cipulot/ec_prox/jis/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Update keyboards/cipulot/ec_prox/ansi_iso/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update keyboards/cipulot/ec_prox/jis/rules.mk

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

* Update rules.mk

---------

Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-23 10:09:50 +00:00
QMK Bot 825a152bea Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:08:18 +00:00
QMK Bot c7756f5326 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:07:25 +00:00
QMK Bot e2cad906a1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:07:09 +00:00