Commit Graph

15885 Commits

Author SHA1 Message Date
Zach White
b0069c5c05
Begin the process of deprecating bin/qmk in favor of the global cli (#12109)
* Begin the process of deprecating bin/qmk in favor of the global cli

* Correctly set the qmk bin
2021-03-07 19:10:03 -08:00
QMK Bot
7d45b7f269 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 23:34:13 +00:00
Armando Magalhães
2aa38f5bd3
[Keymap] add crkbd/keymaps/armand1m (#12098) 2021-03-07 15:33:40 -08:00
QMK Bot
43b47495e3 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 20:20:33 +00:00
maz0r
75fd6bd269
[Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support (#12019)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-07 12:20:02 -08:00
Zach White
b15288fb87 trivial change to trigger api update 2021-03-07 12:01:13 -08:00
QMK Bot
e6e572bf5c Merge remote-tracking branch 'origin/master' into develop 2021-03-07 16:15:38 +00:00
Zach White
86e6be342c minor change to trigger api update 2021-03-07 08:14:43 -08:00
QMK Bot
37d1fa53e0 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 06:40:08 +00:00
Ryan
8556068534
Require BOOTLOADER = qmk-dfu for :bootloader target (#12136) 2021-03-07 17:39:35 +11:00
QMK Bot
f48d95b415 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 05:26:50 +00:00
Zach White
0763269ec5 fix CI job: api-data->api_data 2021-03-06 21:26:07 -08:00
QMK Bot
5fb16e3442 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 05:22:57 +00:00
Pierre Chevalier
01b8ef39f5 Remove stale references to "handwired/ferris"
The code was moved to the "ferris" directory.

Fixes the following commands:
```
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json
```

Addresses this issue:
https://github.com/pierrechevalier83/ferris/issues/5
2021-03-06 21:22:24 -08:00
QMK Bot
d170a1c0e2 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 05:18:28 +00:00
Zach White
08e512a273 upload api data to spaces 2021-03-06 21:17:55 -08:00
QMK Bot
fbd6b28633 Merge remote-tracking branch 'origin/master' into develop 2021-03-06 23:57:11 +00:00
Zach White
1cbf1c681a
Enforce minimum versions for jsonschema and MILC (#12141) 2021-03-06 15:56:45 -08:00
QMK Bot
56d5131715 Merge remote-tracking branch 'origin/master' into develop 2021-03-06 23:13:57 +00:00
peepeetee
9b85b1b638
[Keyboard] bm68rgb (#12128)
* add support for Bbm68rgb

* pull request changes filled

* pull request changes filled(this time for real)

* added new line to files that did not have new lines at end of file

* updated modifier keys for rgb effects

* Update keyboards/bm68rgb/readme.md

* Apply suggestions from code review

* Apply suggestions from code review

* add nkro suppport

* Update keyboards/bm68rgb/rules.mk

* modified keymap to better correspond to physical layout

* updated comment style
2021-03-06 15:13:20 -08:00
QMK Bot
bee226b3ee Merge remote-tracking branch 'origin/master' into develop 2021-03-06 21:04:21 +00:00
icesoup
788b1854b4
[Keyboard] add Soup10 support (#11921)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-06 13:03:48 -08:00
QMK Bot
6e19dbc923 Merge remote-tracking branch 'origin/master' into develop 2021-03-06 18:57:16 +00:00
Aleblazer
86e28b4db8
Adding Zodiark Split keyboard (#11837)
* Adding Files for Zodiark

* zodiark.h and keymap.c layout corrections

* Apply suggestions from code review

Applied all suggestions from zvecr.

Co-authored-by: Joel Challis <git@zvecr.com>

* Applied all suggestions from fauxpark

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

* Defined matrix driver

* Update keymap with GPL2

* Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap

* Apply suggestions from code review

Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme.

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

* Added VIA keymap

* Corrected VIA Keymap oled.c

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-06 18:56:48 +00:00
QMK Bot
cde4165097 Merge remote-tracking branch 'origin/master' into develop 2021-03-06 08:50:30 +00:00
Ryan
9c94de070a
Remove ifdefs for UC and X/XP too (#12131) 2021-03-06 19:50:01 +11:00
QMK Bot
c375a8d75b Merge remote-tracking branch 'origin/master' into develop 2021-03-06 06:45:23 +00:00
Ryan
23d6ca9942
Remove a few more ifdefs from quantum_keycodes (#12129) 2021-03-06 17:44:48 +11:00
Drashna Jaelre
b7f2f40ae5
Set default OLED Update Interval for Split Keyboards (#12107)
Because the matrix scanning is slower for splits, in general,
the frequent updating of the OLEDs can slow down the matrix scanning.
To help prevent that, set the update interval for the OLEDs to not
update as frequently.
2021-03-05 16:26:57 -08:00
QMK Bot
6e938f1f24 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 22:23:19 +00:00
Conor Burns
b16bfac107
added 0xCB/1337 keyboard (#12089)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-03-05 23:22:42 +01:00
QMK Bot
e1ce619bf7 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 20:26:58 +00:00
Takeshi ISHII
09dfc08207
add OLED_DRIVER_ENABLE into show_options.mk (#12121) 2021-03-05 20:26:26 +00:00
QMK Bot
3acb3a09fc Merge remote-tracking branch 'origin/master' into develop 2021-03-05 18:43:45 +00:00
bluepylons
07fce7ba13
[Keyboard] add Boston keyboard (#11273)
* Added boston keyboard

* Added Boston keyboard

* Changed some keycodes, added layers, added encoder layer change, added RGB layer indicator

* Cleaned up whitespace

* Update config.h

Cleaned up whitespace

* Cleaned up whitespace

* Added keyboard_post_init_kb code for RGBLEDs so that they start on a defined color

* Modified layout so that split backspace right is at a more intuitive location for configurator

* Cleaned up whitespace, changed some labels

* Modified keymap to accommodate revised layout in boston.h

* Removed "on port C6" from Line 20 (committed suggestion)

* Removed "Encoder Enable" from Line 8 (committed suggestion)

* Removed empty #define DESCRIPTION as suggested

* Implemented lock LED changes as suggested by drashna

* Implemented lock LED changes as suggested by Drashna, changed WS2812 driver byte order

* Updated HSV color  codes to reflect WS2812 byte order change

* Implemented suggestion from noroadsleft

* Implemented suggestion from noroadsleft

* Updated readm.md per suggestions from noroadsleft

* Update keyboards/boston/readme.md per noroadsleft's suggestion

* Removed empty layers from default keymap

* Stripped empty layers and much code from default keymap ; moved to RGB Light Layers keycap
2021-03-05 10:43:09 -08:00
QMK Bot
7ca9604422 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 18:30:41 +00:00
Sendy YK
52d8cbf092
[Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap (#11329)
* Add 60_ansi_arrow_split_bs_7u_spc layout & keymap

* Update readme.md

* Minor updates

* Update dz60.h

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update readme.md

* Update readme.md

* Update keymap.c

* Update layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json

* Update keymap.c

* Update readme.md
2021-03-05 10:30:06 -08:00
QMK Bot
ebfd555ad1 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 18:26:10 +00:00
Dimitris Papavasiliou
73b8f85816
[Keyboard] Lagrange handwired keyboard (#11374)
* [Keyboard] Add the Lagrange keyboard

* Covert the master side to use the SPI driver.
2021-03-05 10:25:20 -08:00
QMK Bot
f8f2cf7500 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 18:04:50 +00:00
datafx
aadea5ab97
[Keyboard] Monstargear XO87 Solderable support (#11716)
* Support for XO87 solderable version

* cleanup

* Remove abandoned code

* replaced KEYMAP with LAYOUT and moved LAYOUT macro to solderable.h.  deleted unneeded files.

* Update keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c

* update info.json with missing keys

* Apply suggestions from code review

* Apply suggestions from code review

correct layout macro
2021-03-05 10:04:14 -08:00
QMK Bot
cc6cd394e5 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 05:16:14 +00:00
yiancar
54f7708eaa
[Keyboard] NK65 rev 1.4 (#11991)
NK65 Pinout change for rev 1.4.

* Update Pinout for new PCB rev

* Create readme.md

* Update keyboards/nk65/v1_4/rules.mk
2021-03-04 21:15:41 -08:00
QMK Bot
7e051e0619 Merge remote-tracking branch 'origin/master' into develop 2021-03-05 04:25:54 +00:00
imchipwood
d7aa245c33
dumbpad refactor - adding support for various PCB revisions (#9259)
* Placeholder commit - Refactored to support different PCB revisions

Individual revision folders still need:
-  info.json
-  readme.md

all v0x folders support up to two LEDs for layer indication

all v1x folders support up to two LEDs for layer indication
plus one extra LED for numlock indication

v0x - supports single-encoder v0.x PCB revisions

v0x_right - supports reversible, single-encoder v0.x PCB revisions

v0x_dualencoder - supports dual-encoder v0.x PCB revisions

v1x - supports single-encoder v1.x PCB revisiions

v1x_right - supports reversible, single-encoder v1.x PCB revisions

* Added info.json and readme.md files for all dumbpad revisions

* More refactoring, adding shared config.h and rules.mk

Removed config.h from default keymap folders - defining TAPPING_TOGGLE in config.h

* Minor formatting fix

* MATRIX_COL_PINS for v1x_right was not reversed - changed to match v0x_right

* adding support for v1x dual encoder PCB

* adding alt-f2 tapdance routine for personal keymaps

* adding dumbpad build using teensy 2.0 instead of Pro Micro

* matched v1x dumbpad encoder and led pins to latest PCB revisions

* updated readme, removed v1x_teensy until someone requests it

* changed device name to match tmk udev rules, removed unnecessary ifdef

* removed user keymaps and folders

* missed hotdox keymap - removing

* fixing info.json keyboard_names for all versions

* Changed biton32 to get_highest_layer in keyboards/dumbpad/v0x/v0x.c

* keyboards/dumbpad/v0x/v0x.c - remove matrix_scan_kb, process_record_kb

* /dumbpad/v0x/keymaps/default/keymap.c - remove empty functions

* /dumbpad/v0x/keymaps/default/keymap.c - changed biton32 to get_highest_layer

* keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c - remove empty functions

* keyboards/dumbpad/v0x_right/readme.md - smaller board layout image

* keyboards/dumbpad/v1x_dualencoder/readme.md - smaller board image

* keyboards/dumbpad/v1x/readme.md - smaller board image

* keyboards/dumbpad/v1x_right/readme.md - smaller board image

* Update keyboards/dumbpad/rules.mk

* Apply suggestions from code review

Batch applying suggestions from review

* fixed removal of led_set_kb

* Implementing requested changes from old pull request 9259

* removing unused rules

* removed rules.mk from dumbpad base folder

* adding templates for each layout

* testing default keymap json

* Testing applying default keymap for dumbpad

* Layout correction: v1.x are 17 position pcb's

* Update keyboards/dumbpad/v0x/rules.mk

* Update keyboards/dumbpad/v0x/rules.mk

* Update keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c

* Update keyboards/dumbpad/v0x_dualencoder/rules.mk

* Update keyboards/dumbpad/v0x_dualencoder/rules.mk

* Update keyboards/dumbpad/v1x_dualencoder/rules.mk

* Update keyboards/dumbpad/v1x_dualencoder/templates/keymap.c

* Update keyboards/dumbpad/v1x_right/rules.mk

* Update keyboards/dumbpad/v1x_right/rules.mk

* Update keyboards/dumbpad/rules.mk

* Update keyboards/dumbpad/v0x_dualencoder/templates/keymap.c

* Update keyboards/dumbpad/v0x_right/rules.mk

* Update keyboards/dumbpad/v1x/rules.mk

* Update keyboards/dumbpad/v1x/rules.mk

* Update keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c

* Update keyboards/dumbpad/v1x_dualencoder/rules.mk

* Update keyboards/dumbpad/v0x_right/rules.mk

* Removing binary files
2021-03-04 20:25:19 -08:00
QMK Bot
a71fb6057d Merge remote-tracking branch 'origin/master' into develop 2021-03-04 23:04:36 +00:00
Quentin
2cb0b41ce7
update correct layout name (#12096) 2021-03-04 23:03:58 +00:00
QMK Bot
474cffbc0f Merge remote-tracking branch 'origin/master' into develop 2021-03-04 23:00:06 +00:00
Nick Blyumberg
e25f05224f
Fixed the ortho60 and ortho48 matrix layout after testing (#12106) 2021-03-04 22:59:20 +00:00
QMK Bot
4fcc709f4e Merge remote-tracking branch 'origin/master' into develop 2021-03-04 19:08:37 +00:00