1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

9509 commits

Author SHA1 Message Date
QMK Bot 07a7724f2b Merge remote-tracking branch 'origin/master' into develop 2021-08-07 06:50:18 +00:00
Jack Kenney e4342f8630
[Keymap] JackKenney's keymap for GMMK Pro (#13853) 2021-08-06 23:49:25 -07:00
QMK Bot 58bb1dbde7 Merge remote-tracking branch 'origin/master' into develop 2021-08-07 06:07:10 +00:00
Drashna Jaelre 9c03d41f6a
[Keyboard] Fix oled_task_user for chocolatebar (#13911) 2021-08-06 23:06:39 -07:00
QMK Bot e8112e49cd Merge remote-tracking branch 'origin/master' into develop 2021-08-07 05:59:33 +00:00
James Young 95fed3bfcf
clean up CRLF instances (#13910) 2021-08-07 15:59:03 +10:00
QMK Bot e2ac8d5f3e Merge remote-tracking branch 'origin/master' into develop 2021-08-07 05:48:48 +00:00
Moritz a3cb3e139a
[Keyboard] Add Fave87 (#13873)
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-06 22:48:17 -07:00
QMK Bot b38fdc0a57 Merge remote-tracking branch 'origin/master' into develop 2021-08-07 04:48:50 +00:00
misonoworks d917bfb277
[Keyboard] Add MisonoWorks Chocolate Bar keyboard (#13798)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: autumnisacutie <63772942+autumnisacutie@users.noreply.github.com>
2021-08-06 21:48:19 -07:00
QMK Bot 36b2f06d9e Merge remote-tracking branch 'origin/master' into develop 2021-08-07 00:03:19 +00:00
mechlovin 744019c032
[Keyboard] Add Hex4B PCB (#13435)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: vuhopkep <boy9x0@gmail.com>
2021-08-06 17:02:46 -07:00
QMK Bot 25425dc9bc Merge remote-tracking branch 'origin/master' into develop 2021-08-07 00:02:28 +00:00
yfuku 6721825df5
[Keyboard] Add owl8 keyboard (#13380)
* add owl8

* use DIRECT_PINS

* fix encoder

* Changed to use action_exec.
2021-08-06 17:01:52 -07:00
Gigahawk 13b94b468d
Copy GMMK Pro screw specs to ISO readme (#13908) 2021-08-07 08:11:17 +10:00
QMK Bot 9e7bfdf6c6 Merge remote-tracking branch 'origin/master' into develop 2021-08-06 11:55:12 +00:00
Gigahawk bdf86c4cbd
Add replacement screw specifications to GMMK Pro readme (#13903) 2021-08-06 04:54:43 -07:00
QMK Bot 3ba2ce40a5 Merge remote-tracking branch 'origin/master' into develop 2021-08-06 05:18:45 +00:00
James Young b9a1b61f6a
Flehrad Tradestation Refactor (#13897)
* add license headers

Apache 2.0 per the included `license` file.

* info.json: use human-friendly formatting

* refactor keymaps

- split `default` keymap into `default` and `tradestation` keymaps (one for each layout)
- remove boilerplate functions
- apply four-space indent

* partial clean up of rules.mk

- update section header comment blocks
2021-08-05 22:18:17 -07:00
Drashna Jaelre ea5d778f90
[Keyboard] Remove console from keebio via keyboards (#13901) 2021-08-05 21:29:29 -07:00
QMK Bot 293168f444 Merge remote-tracking branch 'origin/master' into develop 2021-08-06 04:28:58 +00:00
James Young 28b59c30d2
MetaMechs Timber Wolf Configurator Fixes (#13895)
* info.json: use human-friendly formatting

* info.json: fix key sequences for ISO layouts

All the ISO layouts had the Enter key out-of-sequence, causing key-assignment mismatches in QMK Configurator.
2021-08-05 21:28:26 -07:00
Nick Brassel 0dafd83f72
Fix up builds after #8591 (#13900) 2021-08-06 09:57:09 +10:00
Pete Sevander 7e983796e1
Process combos earlier & overlapping combos (#8591)
* Combo processing improvements.

Now it is possible to use ModTap and LayerTap keys as part of combos.
Overlapping combos also don't trigger all the combos, just exactly the
one that you press.

New settings:
- COMBO_MUST_HOLD_MODS
- COMBO_MOD_TERM
- COMBO_TERM_PER_COMBO
- COMBO_MUST_HOLD_PER_COMBO
- COMBO_STRICT_TIMER
- COMBO_NO_TIMER

* Remove the size flags from combo_t struct boolean members.

This in the end actually saves space as the members are accessed so many
times. The amount of operations needed to access the bits uses more
memory than setting the size saves.

* Fix `process_combo_key_release` not called correctly with tap-only combos

* Fix not passing a pointer when NO_ACTION_TAPPING is defined.

* Docs for `COMBO_ONLY_FROM_LAYER`

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update quantum/process_keycode/process_combo.c

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Add `EXTRA_SHORT_COMBOS` option.

Stuff combo's `disabled` and `active` flags into `state`. Possibly can
save some space.

* Add more examples and clarify things with dict management system.

- Simple examples now has a combo that has modifiers included.
- The slightly more advanced examples now are actually more advanced
  instead of just `tap_code16(<modded-keycode>)`.
- Added a note that `COMBO_ACTION`s are not needed anymore as you can
  just use custom keycodes.
- Added a note that the `g/keymap_combo.h` macros use the
  `process_combo_event` function and that it is not usable in one's
  keymap afterwards.

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Change "the" combo action example to "email" example.

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Fix sneaky infinite loop with `combo_disable()`

No need to call `dump_key_buffer` when disabling combos because the
buffer is either being dumped if a combo-key was pressed, or the buffer is empty
if a non-combo-key is pressed.

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Update docs/feature_combo.md

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-06 09:44:57 +10:00
Nick Brassel 6aaf3e84e9
Rework as per 9824 (#13898) 2021-08-06 08:14:43 +10:00
Joel Challis bdaea259af
Tidy up rgbkb/mun (#13801)
* Tidy up rgbkb/mun
2021-08-05 00:59:50 +01:00
QMK Bot cb4d91f85f Merge remote-tracking branch 'origin/master' into develop 2021-08-04 21:33:19 +00:00
James Young f4c55db8dd
cKeys Handwire 101 Refactor (#13879)
* update info.json

- use human-friendly formatting
- remove `key_count` key

* rename LAYOUT to LAYOUT_ortho_4x4

* refactor default keymap

- add license header
- qmk cformat pass
- keycode grid alignment

* remove empty config.h file from default keymap

* update Manufacturer and Product strings

* tidy up handwire_101.c

- add license header
- remove boilerplate functions

* tidy up handwire_101.h

- add license header
- remove instructive comment

* minor rules.mk tidy-up

- remove Bootloader selection sample comments

* rewrite SEND_STRING() statements per fauxpark

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-04 22:32:27 +01:00
Dasky 3917fd5639
[Keyboard] Fix knops keymaps (#13872) 2021-08-04 12:10:31 -07:00
Drashna Jaelre 3568eafd65
[Keyboard] Switch Draculad to using WPM char hack (#13886) 2021-08-04 11:30:49 -07:00
QMK Bot 6525b82f5f Merge remote-tracking branch 'origin/master' into develop 2021-08-04 12:25:28 +00:00
James Young 4445455c1f
BM65ISO: refactor layout macro (#13860) 2021-08-04 22:24:54 +10:00
QMK Bot d9f30d366a Merge remote-tracking branch 'origin/master' into develop 2021-08-04 10:35:54 +00:00
Reza Jelveh 8e8803459f
Updated Ducky 2 one mini support (#11112)
* Initial Ducky One 2 Mini keyboard and keymap

* Keymap macro issue, together with general polish suggestions

* Separate default keymap into proper default, iso and ansi versions

* info.json updates (Configurator support). DEBOUNCE define adjust.

* Unused keymap defines removed.

* update requested ducky one mini2 board changes

* ducky: don't trigger app key with left shift

* ducky: make default mouse key behavior more linear

* ducky: add GRAVE_ESC_GUI_OVERRIDE to allow for win+esc to work

* ducky: playpause on fn space

* ducky: disable RGB_MATRIX until driver is merged

* ducky: clang-format matrix and one2mini.c

* ducky: update requested changes

Remove WFI_IDLE since it's already in the rules.mk CORTEX_ENABLE_WFI_IDLE=TRUE

* ducky: update requested changes

* ducky: move winkey grave esc to default keymap

* ducky: remove dipswitch from keymap and use DIP_SWITCH_MATRIX_GRID instead

* ducky: info.json lint

* ducky: enable DIP_SWITCH_ENABLE rule

* ducky: update readme

* ducky: fix backslash on default keymap

* ducky: remove unused USB_LED_CAPSLOCK_INDEX 28

* ducky: move mbi5042 led driver to ducky keyboard

* ducky: cosmetics

* ducky: requested changes

* ducky: refactor matrix.c again so we can better compare it to other boards

* ducky: remove bootmagic_lite as the boards bootloader trigger is actually handled in its own bootloader

* ducky: remove custom matrix

* ducky: update for chibios-contrib changes

* ducky: debug new USB driver

* ducky: debug usb issues

* ducky: update chibios version

* ducky: remove halconf.h

* ducky: update rules.mk

* ducky: update chconf.h

* Matching submodules.

* Restructure to explicitly define which board is in use, remove RGB driver pending followup PR.

* Revert "Matching submodules."

This reverts commit 2fbb34e0c6.

Co-authored-by: GitWellBack <48095880+GitWellBack@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-04 20:35:17 +10:00
QMK Bot d27ab328dc Merge remote-tracking branch 'origin/master' into develop 2021-08-04 02:10:01 +00:00
James Young ae20574f84
barracuda: update info.json layout macro reference (#13874)
* barracuda: update info.json layout macro reference

- change LAYOUT to LAYOUT_ortho_3x11

* remove Community Layouts rule

ortho_3x11 isn't a valid Community Layout.
2021-08-04 03:09:25 +01:00
QMK Bot 4ffc9d8288 Merge remote-tracking branch 'origin/master' into develop 2021-08-03 23:30:12 +00:00
James Young 8802d28aad
boardsource/holiday/spooky: update info.json layout macro reference (#13875)
- change LAYOUT to LAYOUT_ortho_2x3
2021-08-04 00:29:41 +01:00
QMK Bot 2dbc71f037 Merge remote-tracking branch 'origin/master' into develop 2021-08-03 22:54:45 +00:00
Ryan Baker d1cbea685e
rb86 (#13824)
* rb86

* adjudicate comments
2021-08-04 08:54:12 +10:00
Joakim Tufvegren 1409b36851
Remove the #10088 hotfix for Teensy 3.1-like Input:Club keyboards (#12870)
* Remove the #10088 hotfix for K20x MCU:s.

It seems to _cause_ the issue it intended to solve there.

* Cleaner way of removing #10088 hotfix.

Now only affects Ergodox Infinity, Whitefox and K-type, though.

Switches over Ergodox Infinity to the `IC_TEENSY_3_1` board, since that
was a nice place to implement the `restart_usb_driver` override.
However, I would guess this issue is present for other K20x/Teensy 3.1
boards as well...

* Fix comment regarding `IC_TEENSY_3_1` for all keyboards using it.
2021-08-04 07:38:37 +10:00
Joel Challis 3f419dc872
Unconditionally call led_init_ports (#12116)
* Unconditionally call led_init_ports

* Another call to led_init_ports
2021-08-03 18:34:32 +01:00
QMK Bot 2bc7511b9e Merge remote-tracking branch 'origin/master' into develop 2021-08-03 17:21:26 +00:00
James Young f2fc23d1b1
aves65: complete layout data (#13868)
add layout data for:
- LAYOUT_all
- LAYOUT_65_iso
- LAYOUT_65_iso_split_bs
- LAYOUT_65_iso_blocker_split_bs
- LAYOUT_65_ansi
- LAYOUT_65_ansi_split_bs
- LAYOUT_65_ansi_blocker
- LAYOUT_65_ansi_blocker_split_bs
2021-08-03 10:20:53 -07:00
QMK Bot 51eb5285a6 Merge remote-tracking branch 'origin/master' into develop 2021-08-03 17:04:00 +00:00
James Young e9a3e20813
4pplet/eagle_viper_rep/rev_a: fix missing key object (#13867)
Adds a key object for the KC_NUHS key to the info.json data.
2021-08-03 10:03:25 -07:00
QMK Bot 738e8e72ba Merge remote-tracking branch 'origin/master' into develop 2021-08-03 16:40:14 +00:00
Jonathan Rascher 853344235a
[Keymap] Minor cleanup of bcat keymaps and userspace (#13224) 2021-08-03 09:39:43 -07:00
QMK Bot 6961976855 Merge remote-tracking branch 'origin/master' into develop 2021-08-03 07:04:43 +00:00
James Young 4d42fb2031
40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866)
* 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8

* remove ortho_4x8 from Community Layouts rule

ortho_4x8 isn't a valid option here.
2021-08-03 00:04:07 -07:00
QMK Bot a14f331c0a Merge remote-tracking branch 'origin/master' into develop 2021-08-03 03:17:45 +00:00
James Young 2d78a43556
capsunlocked/cu7: fix missing key object (#13862)
Adds a key object for the encoder keypress.
2021-08-03 13:17:06 +10:00
QMK Bot a174d20d06 Merge remote-tracking branch 'origin/master' into develop 2021-08-03 00:53:24 +00:00
James Young be9031d01d
0xCB Static: fix qmk info and Configurator issues (#13856) 2021-08-02 17:52:46 -07:00
QMK Bot 5decdad8c6 Merge remote-tracking branch 'origin/master' into develop 2021-08-02 08:24:57 +00:00
JTM c2f227d2a8
Function96 V2: Fixed info.json file (#13322)
Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.
2021-08-02 01:24:25 -07:00
Nick Brassel ee3c138385 Merge remote-tracking branch 'upstream/master' into develop 2021-08-02 13:55:36 +10:00
Jonavin 53683e8d20
fix develop branch move file (#13832)
Co-authored-by: zvecr <git@zvecr.com>
2021-08-01 22:37:59 +10:00
James Young 4b630c46fe
Duck Eagle/Viper V2 Refactor (#13828) 2021-07-31 13:12:49 -07:00
Drashna Jaelre 41a770ded3
[Keyboard] Fix SRC include for matrix/m20add issi driver (#13826) 2021-07-31 12:18:11 -07:00
James Young 851d995a7d
Merro60 Layout Macro Refactor (#13827) 2021-07-31 12:17:55 -07:00
James Young 1305b6d82e
Momoka Ergo: layout macro/Configurator fix (#13825)
* momoka_ergo.h: use modified QMK 3-character notation

Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively.

* physically arrange layout macro

Arrange the layout macro and keycodes to resemble the assembled keyboard.

* info.json: rebuild LAYOUT data

Fixes mispositioned keys in QMK Configurator.
2021-07-31 12:16:51 -07:00
Drashna Jaelre 7bcbeffc2d
Fix compile issues due to LED changes (#13821) 2021-07-31 17:30:13 +01:00
slashbunny 3f5482bbb7
Update endgame keymap to work with suspend changes (#13805)
Updates the Massdrop CTRL keyboard engame keymap to work after the
changes to USB suspend in #12697

Fixes #13782
2021-07-31 16:28:09 +01:00
Joel Challis 70fb3e1aaf
__flash? (#13799) 2021-07-31 14:35:30 +01:00
Joel Challis 206a995ccd
Move some led drivers to common folder (#13749)
* Move some led drivers to common folder
2021-07-31 14:31:09 +01:00
James Young 954806c80f
DP60 layout macro renames (#13811)
* info.json: apply human-friendly formatting

* rename LAYOUT_60_wkl to LAYOUT_60_ansi_tsangan_split_rshift

* rename LAYOUT_60_wkl_split_bs to LAYOUT_60_tsangan_hhkb

* info.json: remove `key_count` keys
2021-07-31 14:25:47 +01:00
James Young 4604b58769
Charue Sunsetter: layout macro fixes (#13809)
* remove K214 from LAYOUT_1065_ansi macro

Position K214 is only used by the ISO layout (as KC_NUHS); it doesn't get used here. Removing it so the layout macro matches the info.json layout data.

Also updates info.json to use human-friendly formatting.

* add layout macros

Adds:

- LAYOUT_1065_ansi_split_bs macro
- LAYOUT_1065_iso macro
- LAYOUT_1065_iso_split_bs macro
- `default_iso` keymap

* add LAYOUT_all macro

Adds LAYOUT_all macro and a `default_all` keymap.

This PCB is unusual in that the ANSI Backslash and ANSI Enter do not share their matrix positions with the Non-US Backslash or ISO Enter keys at all. This layout macro supports both the ANSI and ISO positions in one macro/keymap.
2021-07-31 14:23:27 +01:00
James Young 56f84774d7
Rartland: add 65_ansi and 65_iso layouts (#13807)
* add 65_ansi and 65_iso layouts

... with Community Layout support

* add block comment of layouts to rartland.h
2021-07-31 14:22:12 +01:00
peott-fr d191ccfdc5
[Keymap] Add peott-fr Kinesis keymap (#13812) 2021-07-31 06:14:56 -07:00
Jay Greco 56200de2eb
[Keyboard] Reduce nibble oled_status keymap size (#13813) 2021-07-31 06:11:11 -07:00
Drashna Jaelre e755c5fe1f
[Keyboard] Fix RGBKB Pan Rev1 Encoder RGB handling (#13781) 2021-07-31 06:09:47 -07:00
MakotoKurauchi fb6c66a14b
change DIP_SWITCH_ENABLE to off (#13815) 2021-07-31 18:51:32 +09:00
QMK Bot 6c33290ffa Merge remote-tracking branch 'origin/master' into develop 2021-07-31 09:47:25 +00:00
James Young ec2f6026b9
Neito: correct key sequence in info.json (#13808) 2021-07-31 02:47:00 -07:00
QMK Bot 6d82c92476 Merge remote-tracking branch 'origin/master' into develop 2021-07-31 00:34:43 +00:00
Nick Brassel a4c050b5ae
Fix up paths for bioi boards - parallel compilation failures due to file collisions. (#13806) 2021-07-31 10:34:14 +10:00
QMK Bot 99fc2173a4 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 23:15:44 +00:00
Joel Challis addb389a5e
Move ergosaurus via keymap to correct location (#13802) 2021-07-31 00:15:11 +01:00
QMK Bot f1af7da9ba Merge remote-tracking branch 'origin/master' into develop 2021-07-30 21:00:46 +00:00
Ryan 7bfe53ee2f
Fix onekey console keymap (#13797) 2021-07-30 22:00:14 +01:00
QMK Bot 770a525425 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:45:24 +00:00
James Young aece9ad5fa
Xelus Dharma: add info.json file (#13796) 2021-07-30 11:44:50 -07:00
QMK Bot de1898e69e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:18:01 +00:00
James Young e180524c10
txuu: rename LAYOUT to LAYOUT_65_ansi_blocker_split_bs (#13794)
Renames the layout macro to be more conformant to the rest of QMK.
2021-07-30 11:17:48 -07:00
James Young 57ad8db60e
Tiger910: fix Left Control key size in info.json (#13793) 2021-07-30 11:17:30 -07:00
QMK Bot d34e61a43c Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:17:17 +00:00
James Young 4758ea2188
Stratos: fix layout macro reference in info.json (#13792)
- change LAYOUT_60_ansi_tsangan_hhkb to LAYOUT_60_tsangan_hhkb
2021-07-30 11:16:59 -07:00
QMK Bot 70dceefa01 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:16:50 +00:00
James Young 069f479af4
Ristretto: fix Configurator layout data (#13791) 2021-07-30 11:16:37 -07:00
James Young 6af2d3a32c
X-Bows Ranger: rename LAYOUT to LAYOUT_tkl_ansi (#13795) 2021-07-30 11:16:18 -07:00
QMK Bot 701808372e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 17:10:40 +00:00
Ryan d1db008745
Onekey cleanup (#13786) 2021-07-30 18:10:05 +01:00
QMK Bot 3461bdad43 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 17:02:12 +00:00
Matthew Dias cfca970718
[Keyboard] Add portal 66 (#13767) 2021-07-30 10:01:43 -07:00
QMK Bot e6c884415d Merge remote-tracking branch 'origin/master' into develop 2021-07-30 16:54:23 +00:00
8bits4ever 1e2408af91
[Keyboard] Add Commodore Amiga 1200 Membrane Converter (#13705)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-30 09:53:55 -07:00
QMK Bot 04a2fa8ff3 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:13:15 +00:00
James Young 77735b0a56
Pearl Boards Pandora: correct layout macro reference in info.json (#13787) 2021-07-30 08:12:36 -07:00
QMK Bot dfb370402e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:12:13 +00:00
James Young 6823e03b01
Ocean Sus Board: rename layout macro (#13785)
- rename LAYOUT_ortho_3x4 to LAYOUT_ortho_4x3
  - ... because ortho layouts in QMK are named by <rows>x<columns> instead of <columns>x<rows>
2021-07-30 08:11:37 -07:00
QMK Bot f87c72ef8f Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:11:30 +00:00
James Young f2d34f38be
Nack: rename layout macro to LAYOUT_ortho_4x13 (#13784) 2021-07-30 08:10:59 -07:00
QMK Bot ba1fdf97b1 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 07:17:44 +00:00
James Young d93089d8ea
MNK1800s: fix Configurator key sequence (#13783) 2021-07-30 17:17:11 +10:00
QMK Bot 38686dd0c5 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 07:07:41 +00:00
James Young e1ce0d2836
Clawsome Luggage Rack: correct keymap directory name (#13780)
Rename `keyboards/clawsome/luggage_rack/keymap/` to `keyboards/clawsome/luggage_rack/keymaps/`.
2021-07-30 00:07:10 -07:00
James Young 80d8c4a483
Merge remote-tracking branch 'upstream/master' into develop 2021-07-29 23:04:06 -07:00
Álvaro A. Volpato a1f7d86ef5
[Keyboard] Initial Noxary 378 support (#13156)
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-07-29 22:54:06 -07:00
Jonavin 03212ced24
[Keymap] jonavin gmmk pro keymap add RGB functionality (#13591)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
2021-07-29 22:38:38 -07:00
James Young 7e1d28006f
CherryB Studio CB1800: fix key sequence in info.json (#13779)
This commit fixes the position in sequence of the arrow keys.
2021-07-29 22:37:41 -07:00
Jonavin 219ce2b58a
[Keymap] jonavin quefrency keymap (#13751)
add winkeylock and rgb functions
Co-authored-by: Jonavin <=>
2021-07-29 22:36:21 -07:00
James Young 104cdef329
Cannonkeys Balance: Configurator fixes (#13778) 2021-07-29 22:26:47 -07:00
Trent Hoh 327e5a08d9
[Keyboard] Added YMD40v2 VIA (#13770)
VIA support for YMD40v2
2021-07-29 22:24:21 -07:00
fvolpe83 86c0a6d3d7
[Keymap] Update keymaps for fvolpe83 (#13739)
changed folder name to match github username, changed caps from LT(1,KC_CAPS) to MO(1) and updated readme
2021-07-29 22:16:51 -07:00
James Young fab1af4154
AnomalyKB a65i Configurator fixes (#13775) 2021-07-29 22:11:57 -07:00
Ramon Imbao 987e8e3529
[Keyboard] Add Mona v1.1 (#13721)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-29 22:08:05 -07:00
James Young 8ca6d835b9
Atomic Refactor (#13761)
* info.json: human-friendly formatting

- one key per line
- line breaks between physical rows
- four-space indent

* info.json: add data for LAYOUT_grid

* fix keymap paths

This commit corrects the paths for three keymaps that were in the wrong directory.

* refactor and bugfix abienz keymap

- remove extra commas
- use QMK-native aliases for KC_TRNS and KC_NO
- add include for Colemak keycode support
- use four-space indent

* refactor and bugfix michelle keymap

- remove inline comments for keymap layout
- remove extra commas
- use QMK-native aliases for KC_TRNS and KC_NO
- use four-space indent

* refactor and bugfix twolayer keymap

- remove extra commas
- refactor action_get_macro() keycode to QMK-native keycode
- use QMK-native aliases for KC_TRNS
- use four-space indent
- adjust grid alignment

* rename LAYOUT_grid to LAYOUT_ortho_5x15

* refactor config.h file

- use #pragma once include guard
- update MANUFACTURER and PRODUCT strings to be consistent with other OLKB boards
- remove Magic config (all settings are default)

* refactor atomic.c

- add license header
- use GPIO control functions

* refactor atomic.h

- add license header
- use #pragma once include guard
- remove redundant file includes

* refactor rules.mk

- remove Bootloader selection comments
- unify Build Option header comment to QMK template
- unify Build Option rules and inline comments

* alias LAYOUT_grid to LAYOUT_ortho_5x15
2021-07-29 12:14:26 -07:00
James Young c0149dc376
Alu84 Refactor (#13760)
* info.json: human-friendly formatting

* use QMK 3-character notation for layout macro/data

* alu84.h: use #pragma once include guard

* clean up alu84.c

Remove unnecessary includes and functions.

* refactor config.h

- use #pragma once include guard
- enable Backlight Breathing
- align comments to QMK AVR template

* refactor default keymap

- add license header
- use layer_names enum
- refactor keymap to be more generic
- remove unnecessary and empty functions

* refactor turbomech keymap.c

- edit license header
- refactor keymap for readability (use QMK-native keycode aliases)
- remove unnecessary and empty functions

* refactor turbomech config.h

- use #pragma once include guard
- align to QMK template

* refactor turbomech rules.mk

Edit the file to make it conform to QMK template.

* align rules.mk to QMK template

* touch-up default keymap

* touch-up alu84.h

* rename LAYOUT to LAYOUT_75_ansi

Also enables Community Layout Support

* modernize readme.md

- update description
- convert keyboard data to list
- add flashing and bootloader instructions
- update Docs links

* alias LAYOUT to LAYOUT_75_ansi

* change readme image URL per fauxpark

* touch up turbomech keymap rules.mk per fauxpark

* rules.mk: convert tab to spaces
2021-07-29 11:09:16 -07:00
QMK Bot 441914e0ad Merge remote-tracking branch 'origin/master' into develop 2021-07-29 17:45:54 +00:00
James Young a78fdbb1f6
Draytronics Elise Configurator fixes (#13763) 2021-07-29 10:45:22 -07:00
QMK Bot d243512ad6 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:50:56 +00:00
TreasureTypes 5a0985aa4a
[Keyboard] Add Treasure TYPE-9 Series II (#13725)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-29 09:50:05 -07:00
QMK Bot 703d886c21 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:12:56 +00:00
Alabahuy aa0b7079a4
[Keyboard] add sus board (#13701) 2021-07-29 09:12:29 -07:00
QMK Bot ae6a3ae20e Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:12:19 +00:00
Takeshi Nishio 441fd2ca5b
[Keyboard] Match Vendor ID to my other keyboard, "unison". (#13699)
Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
2021-07-29 09:11:40 -07:00
QMK Bot 5bb736d1d6 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:04:06 +00:00
Uy Bui 6bdecb16c0
[Keyboard] we27 update info.json (#13678) 2021-07-29 09:03:21 -07:00
QMK Bot 935079f266 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:58 +00:00
bomb 768072e824
[Keyboard] Add Mojo68 for Melgeek (#13578)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:50:28 -07:00
QMK Bot 957bd4d1d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:24 +00:00
AquaCylinder ae268596ce
[Keyboard] Add Emi20 (#13603)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:49:51 -07:00
QMK Bot faf4f6d005 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:49:11 +00:00
DA ad6acb3a03
[Keyboard] add cherryb studio cb1800 keyboard (#13639)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:48:39 -07:00
QMK Bot 58baf5a3d8 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:48:22 +00:00
QMK Bot 04a0f0cb18 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:47:52 +00:00
X-Bows Tech 8fa674727d
[Keyboard] Add X-Bows Ranger Keyboard (#13660)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:47:51 -07:00
Jonavin 8d611f6873
[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670)
Co-authored-by: Jonavin <=>
2021-07-29 08:47:14 -07:00
QMK Bot 1df2f23ab4 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:43:12 +00:00
N2-Sumikko dc2dfe2a6c
[Keyboard] Add halfcliff keyboard (#13515)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:42:28 -07:00
QMK Bot 5418777454 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:29:02 +00:00
ESCA47 3a48cd64cb
[Keyboard] Add GetawayVan (#13412)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:28:33 -07:00
QMK Bot ec8d08810f Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:23:56 +00:00
Jordan Blackbourn f3d7901950
[Keyboard] Added Orthocode keyboard (#13487)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:23:27 -07:00
QMK Bot 69661eb5ab Merge remote-tracking branch 'origin/master' into develop 2021-07-28 23:34:48 +00:00
James Young ccdb432f71
Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759)
* info.json: human-friendly formatting

- one key object per line; line breaks between physical rows
- four-space indent
- remove trailing whitespace

* info.json: correct key object order for LAYOUT_numpad_6x4
2021-07-28 16:34:17 -07:00
QMK Bot 2f4361c88f Merge remote-tracking branch 'origin/master' into develop 2021-07-28 07:25:28 +00:00
Jonavin 9088df04c3
[Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752)
Co-authored-by: Jonavin <=>
2021-07-28 00:24:51 -07:00
Joel Challis 7ac7ca96e9
Remove some legacy files (#13715) 2021-07-27 23:57:42 +01:00
Ryan 56443fe3cf
Fix typo in Dactyl Manuform (#13740) 2021-07-27 08:16:41 -07:00
Ryan 468f705455
Dactyl Manuform cleanup (#13686) 2021-07-27 22:00:38 +10:00
QMK Bot 998ac203e4 Merge remote-tracking branch 'origin/master' into develop 2021-07-27 02:44:18 +00:00
James Young a617c8b80a
[Keyboard] Ares refactor (#13730) 2021-07-26 19:43:48 -07:00
Albert Y be34fdea4b
[Keyboard] Add RGB matrix support for Kyria (#12789)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-26 19:42:34 -07:00
Drashna Jaelre 3affdcb45b
Reduce firmware size in prep for #12670 (#13724)
* Reduce firmware size in pre for #12670

* Also disable pixel mode, just in case
2021-07-27 12:41:28 +10:00
Albert Y e032fbe326
[Keyboard] Update kyria make path example (#13720)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-26 18:01:16 -07:00
Drashna Jaelre eb46c954dc
[Keymap] Drashna's Defaults cleanup (#13722) 2021-07-26 17:59:49 -07:00
Joel Challis 368efb5d2b
Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731) 2021-07-27 10:17:58 +10:00
Nick Brassel 394272a266 Merge remote-tracking branch 'upstream/master' into develop 2021-07-27 10:11:52 +10:00
datafx b1c5a53a68
Add bootloader size (#13729)
* Add bootloader size

Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic

* Include dz60rgb v2.1

Add boot loader size to this pcb also
2021-07-27 10:07:29 +10:00
James Young e6e4ec6267
40percentclub/nein: update info.json layout macro reference (#13726)
- change LAYOUT to LAYOUT_ortho_3x3
2021-07-26 21:02:44 +01:00
Xelus22 e0375c0b71
[Keyboard Update] Change to L422 (#13717)
* change to L422

* Add bootloader

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

* add bootloader

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-26 16:05:13 +10:00
Cyril a73e0a7b13
Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" (#13456)
This reverts commit e25f05224f.
2021-07-25 22:51:23 -07:00
Xelus22 b9902a3f59
[Keyboard] Valor Rev 2 (#13551)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25 22:34:39 -07:00
bomb 2e5cecd704
[Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25 21:22:13 -07:00
Drashna Jaelre 4bb595f94b
[Keyboard] Fix up SplitKB keyboards (#13511) 2021-07-25 18:18:39 -07:00
Drashna Jaelre d45da3f0fb
[Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041)
* [Keyboard] Update ZSA Keyboard Readmes and keymaps

* Apply suggestions from code review

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

* Remove custom rgb code for RGB_M_P

* Fix inevitable typo

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

* Update keyboards/planck/ez/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25 18:18:22 -07:00
Drashna Jaelre a030950fd6
[Keyboard] Fix compile size for the Vitamins Included via keymap (#13696) 2021-07-25 14:19:38 +10:00
Dasky a938c54512
dirty fix (#13695) 2021-07-25 12:33:30 +10:00
Nick Brassel 4ec8764c70 Merge remote-tracking branch 'upstream/master' into develop 2021-07-25 12:17:15 +10:00
Drashna Jaelre b69e7431aa
[Keyboard] Fix keymaps for clueboard 66_hotswap (#13694)
* [Keyboard] Fix default keymap for clueboard proto

* Fix keymaps, because they're not actually revision compatible

* Add copyright headers
2021-07-25 12:07:46 +10:00
Drashna Jaelre fdf3ce3cd1
[Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691) 2021-07-25 11:05:48 +10:00
Drashna Jaelre 210da7b233
[Keyboard] Fix Compile size on ungodly Launch Pad (#13692) 2021-07-25 11:05:19 +10:00
Ryan 8cc568bc29
Fix & clean up tronguylabs/m122_3270 (#13684) 2021-07-25 11:02:36 +10:00
Drashna Jaelre 95730d4f96
[Keyboard] Fix compile size for the Merge UM70 via keymap (#13690) 2021-07-25 11:01:13 +10:00
Drashna Jaelre 0b95ac2e4b
Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689) 2021-07-24 20:17:04 +01:00
Dasky ab42945c9a
[Keyboard] Fix Q1 change dip switch to bool (#13687) 2021-07-24 10:45:34 -07:00
QMK Bot 93fc2cbc8a Merge remote-tracking branch 'origin/master' into develop 2021-07-24 16:37:57 +00:00
lokher 145d89ab91
[Keyboard] Add Keychron Q1 (#13397)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-24 09:37:24 -07:00
QMK Bot e681c4368b Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:40:38 +00:00
James Won 44a0aa924c
[Keymap] add kinesis/keymaps/jwon (#13618)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-24 08:40:05 -07:00
QMK Bot 7aa1938fa4 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:39:35 +00:00
Xelus22 1b002b7dcc
[Keyboard] Dharma (#13663)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-24 08:39:26 -07:00
Shane Celis d4bc77ac94
feature: Add swap hands support for sofle keyboard. (#13654) 2021-07-24 08:39:04 -07:00
Joel Challis e562238309
Fix up xd002 rgb keymaps (#13685) 2021-07-24 15:50:32 +01:00
Drashna Jaelre 7907a72584
[Keyboard] Reduce compile size for dz60rgb v2.1 (#13680) 2021-07-24 19:36:41 +10:00
Drashna Jaelre a2d0efe5ad
[Keyboard] Fix type on pandora via keymap (#13681) 2021-07-24 18:06:56 +10:00
Drashna Jaelre b8a1e14f53
Remove deprecated callbacks for encoders and dip switches (#13404) 2021-07-24 00:37:19 -07:00
Drashna Jaelre 73d4d7dc2b
[Keyboard] Quick hack to fix Astro65 board (#13665)
* [Keyboard] Quick hack to fix Astro65 board

* Use proper pins
2021-07-23 23:38:54 -07:00
QMK Bot b7fe93c4b8 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 03:45:59 +00:00
Rafael Yumagulov e08203f16a
[Keyboard] Added Compound keyboard support (#12942)
* [Keyboard] Added Compound keyboard support

* Small fixes for Compound keyboard

* Fixed readme and header file for Compound keyboard

* Update keyboards/compound/rules.mk

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

* Changed info.json and readme.md for Compound Keyboard

info.json - removed key_count
readme.md - changed PCB picture url to low-resolution

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-23 20:45:24 -07:00
Drashna Jaelre 83a0d85f2b
[Keyboard] Fix split matrix for sekigon grs 70ec (#13672) 2021-07-23 18:06:06 -07:00
Drashna Jaelre e35672169e
[Keyboard] Fix matrix delay on Drop boards (#13671) 2021-07-23 23:36:39 +01:00
Drashna Jaelre 8f1ebdb718
[Keyboard] Disable console by default on all Keebio boards (#13649) 2021-07-23 14:57:24 -07:00
Drashna Jaelre 164a74a078
[Keyboard] Enable LTO by default on BastardKB Scylla (#13664) 2021-07-23 11:28:41 -07:00
Takeshi ISHII 5b904a92c4
[Keyboard] Fix symmetric70_proto build break on develop branch (#13667)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-23 09:05:06 -07:00
Nick Brassel 6747890562
[Keyboard] Remove broken, unmaintained converter/ibm_5291 (#13658) 2021-07-23 08:17:15 -07:00
QMK Bot 8ea31698c9 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 15:11:42 +00:00
Matthew Dias 4a47ee937d
[Keyboard] Add model-v keyboard (#13643)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-23 08:10:01 -07:00