summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-0/+55
|\
| * Add alternative Logos (#17787)Spaceman2022-07-261-0/+55
| |
* | Constrain Cirque Pinnacle coordinates (#17803)Daniel Kao2022-07-261-6/+6
| | | | | | | | | | | | Static x & y should be the same type as touchData.xValue & touchData.yValue: uint16_t. Their delta could be larger than int8_t and should be constrained to mouse_xy_report_t.
* | Avoid OOB in dynamic_keymap_reset (#17695)Joel Challis2022-07-261-5/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-263-2/+69
|\|
| * Make `qmk doctor` print out the last log entry for ↵Nick Brassel2022-07-263-2/+69
| | | | | | | | upstream/{master,develop}, including dates (#17713)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+155
|\|
| * Added WT65-D (#17724)Wilba2022-07-269-0/+155
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2621-0/+777
|\|
| * [Keyboard] Acheron Athena support (#16818)Álvaro A. Volpato2022-07-2621-0/+777
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Docs] Updates to Pointing Device Docs (#17777)Drashna Jaelre2022-07-262-15/+16
| |
* | bastardkb: fix info.json changes that got reverted during the last merge ↵Charly Delay2022-07-264-21/+3
| | | | | | | | | | | | | | from `master` to `develop` (#17800) * bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop` * Remove board name from root folder `info.json`
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-268-0/+599
|\|
| * [Keymap] Add ollyhayes keymap (#16632)Olly Hayes2022-07-258-0/+599
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+214
|\|
| * [Keyboard] add DJam keyboard (#17430)Leo Deng2022-07-259-0/+214
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654)Daniel Kao2022-07-252-13/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2611-0/+476
|\|
| * [Keyboard] Add Halokeys Elemental 75 (#17323)shamit052022-07-2511-0/+476
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+593
|\|
| * [Keyboard] Add Kawayo Keyboard (#17454)Cipulot2022-07-259-0/+593
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2610-0/+380
|\|
| * [Keyboard] Add Star75 support (#17421)hornslyn2022-07-2510-0/+380
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557)Albert Y2022-07-254-25/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-229/+42
|\|
| * takashicompany miniZone: fix QMK Configurator implementation (#17801)James Young2022-07-251-229/+42
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-1/+1
|\|
| * [Keyboard] Add missing mute button to sofle keymap (#17796)Daniel O'Brien2022-07-251-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-5/+3
|\|
| * Update README.md for teensy lc onekey (#17797)Diogo Sergio2022-07-251-5/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-268-169/+57
|\|
| * gboards/georgi: cleanup & fix (#17753)Ryan2022-07-268-169/+57
| |
* | [Keyboard] Fix compilation issues for Charybdis/Dilemma (#17791)Drashna Jaelre2022-07-263-9/+16
| | | | | | | | | | * [Keyboard] Fix debug printing for Charybdis/Dilemma * Fix compliation issue for dilemma
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-26150-546/+475
|\|
| * Move keyboard USB IDs and strings to data driven: A (#17781)Ryan2022-07-26150-546/+475
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-25248-905/+783
|\|
| * Move keyboard USB IDs and strings to data driven: C (#17789)Ryan2022-07-26248-905/+783
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-255-132/+159
|\|
| * Runes Skjöldr Touch-Up (#17792)James Young2022-07-255-132/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * skjoldr.h: use ___ for KC_NO * skjoldr.h: use K<row><column> notation Matrix was previously defined using identifiers in the format of K<column><row>. * skjoldr.h: add matrix diagram * info.json: apply friendly formatting - key legends as labels - correct key sizes and positioning * refactor keymaps Refactors the `default` and `via` keymaps. - use QMK-native keycode aliases - grid-align keycodes for readability * rename LAYOUT macro to LAYOUT_60_ansi_arrow * enable Community Layout support * info.json: correct maintainer value Field is meant to reference the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-251-1/+1
|\|
| * [Keyboard] Fix Charue Sunsetter_r2 compilation issues (#17793)Drashna Jaelre2022-07-251-1/+1
| |
* | [Docs] Fix custom debug function and sample output (#17790)Drashna Jaelre2022-07-251-7/+7
| |
* | Fix QK_MAKE's reboot check (#17795)Drashna Jaelre2022-07-251-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-07-25100-354/+325
|\|
| * Fixed spacebar position (#17784)ILWrites2022-07-251-7/+7
| |
| * Move keyboard USB IDs and strings to data driven: B (#17782)Ryan2022-07-25106-373/+331
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-252-2/+155
|\|
| * MechWild Mokulua: Correct QMK Configurator Data (#17783)James Young2022-07-252-2/+155
| | | | | | | | | | * Mokulua Mirrored: rebuild info.json file * Mokulua Standard: rebuild info.json file
* | [keyboard] bastardkb: restructure folder hierarchy (#16778)Charly Delay2022-07-25156-639/+5256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bastardkb: restructure folder hierarchy ahead of supporting other adapters/mcus Upcoming support for the following (adapter, mcu) pairs will be submitted in follow-up PRs: - `v2/elitec` - `v2/stemcell` - `blackpill` This PR contains the following changes: - Move previous implementation to an inner `v1/elitec` folder - Move keyboard USB IDs and strings to data driven - Update headers to update maintainers list - Run `qmk format-c` * bastardkb/charybdis: remove broken acceleration implementation * bastardkb/charybdis: fix debug output * bastardkb: add support for BastardKb the `v2/elitec` (adapter, mcu) pair * bastardkb: add Blackpill support * bastardkb/charybdis/3x5: add `bstiq` keymap * bastardkb/charybdis: add fake LEDs to the configuration For the Charybdis 3x5 (respectively 4x6), the LED config now simulates 36 (respectively 58) LEDs instead of the actual 35 (respectively 56) to prevent confusion when testing LEDs during assembly when handedness is not set correctly. Those fake LEDs are bound to the physical bottom-left corner. * bastardkbk/charybdis/readme.md: update build commands Merge pull request #5 from Nathancooke7/update_charybdis_readme_v2_shield. * bastardkb/charybdis: fix Via keymap with blackpill * bastardkb/charybdis: add 3x6 configuration * bastardkb/charybdis: remove unnecessary files * bastardkb/charybdis: remove obsolete code * bastardkb/charybdis/3x6: add Via keymap * bastardkb: add support for Splinky (RP2040) board * bastardkb: initial configuration for the Splinky (SPI not working yet) * bastardkb/charybdis/3x5/v2/splinky: tentative change to enable trackball * bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins * bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins * bastardkb/charybdis/4x6/v2/splinky: add SPI configuration and enable trackball * bastardkb/charybdis/3x6: add splinky config * bastardkb/*/v2/splinky: update drivers to `vendor` * bastardkb/dilemma: add new board * bastardkb/charybdis: fix infinite loop in `layer_state_set_user(…)` in the `via` keymaps * bastardkb/dilemma: add `bstiq` keymap * bastardkb: specify blackpill boards * bastardkb/charybdis: fix blackpill-specific define syntax * bastardkb: remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` which are no longer valid options * bastardkb: fix `QK_BOOT` keycodes * bastardkb/dilemma: fix mouse direction on X axis * bastardkb/charybdis/3x6: adjust CS * bastardkb/dilemma: adjust trackpad configuration * charybdis: fix `PWM33XX_CS_PIN` defines This is a follow-up of https://github.com/qmk/qmk_firmware/pull/17613. * bastardkb: remove Vial mentions from `bstiq` keymaps * Cleanup unnecessary comments Co-authored-by: Nathan <nathan.cooke@compass.com> Co-authored-by: Charly Delay <0xcharly@codesink.dev>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-241-3/+5
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 16:01:44 +0000