1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

9040 commits

Author SHA1 Message Date
QMK Bot a480520e4e Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:32:52 +00:00
Giorgi Chavchanidze 8bc8eadaf9
[Keymap] Orthon keymap for idobo (#13584)
Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
2021-07-19 17:32:20 -07:00
QMK Bot f9332747e3 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:30:40 +00:00
Suschman 7e698c71cd
Six Pack and ortho_ layout updates (#13587)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Suschman <suschman@gmail.com>
2021-07-19 17:30:09 -07:00
QMK Bot f493f560cc Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:27:04 +00:00
James Young 046429fa87
Knobgoblin: rename ortho keymap to default (#13592)
Keyboard did not previously have a `default` keymap.
2021-07-19 17:26:34 -07:00
QMK Bot 85c4672981 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:07:14 +00:00
James Young 4b55b7f852
converter/periboard_512: add Configurator layout data (#13600) 2021-07-19 17:06:45 -07:00
QMK Bot 2a3dde1d94 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:06:21 +00:00
James Young 58f9321a77
fluxlab zplit: keymap restructuring (#13599) 2021-07-19 17:05:47 -07:00
QMK Bot 1ece36549a Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:05:18 +00:00
Xelus22 5b6780f999
[Keyboard][Bug] Constellation Rev2 (#13595) 2021-07-19 17:04:14 -07:00
Xelus22 b73a29aaea
[Bug] Develop - Change uint32_t to layer_state_t (#13596)
* fix sat75

* update uint32_t to layer_state
2021-07-19 09:50:55 -07:00
QMK Bot f792aee954 Merge remote-tracking branch 'origin/master' into develop 2021-07-18 00:41:56 +00:00
James Young 07ae72ea6b
LazyDesigners Bolt: move via keymap to keymaps directory (#13581) 2021-07-17 17:41:29 -07:00
QMK Bot 1374722033 Merge remote-tracking branch 'origin/master' into develop 2021-07-17 23:26:23 +00:00
James Young 876f861715
Discipline layout macro/Configurator fixes (#13574)
* use human-friendly formatting in info.json

* move layout macro aliases to info.json

* correct and complete layout data

Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros.

- rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl
- rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl
- rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl
- rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
2021-07-17 16:25:56 -07:00
QMK Bot 2eb8349437 Merge remote-tracking branch 'origin/master' into develop 2021-07-17 23:18:15 +00:00
James Young 26e64f4fd3
ACR60 Refactor (#13575)
* modernize acr60.h

- use #pragma once include guard
- add license header
- use four-space indent
- use QMK three-character notation for layout macro arguments

* human-friendly format info.json

* remove `key_count` keys from info.json

* rename LAYOUT_2_shifts to LAYOUT_all

* move LAYOUT_all to top

* use QMK three-character notation in info.json

* refactor default keymap

- add license header
- remove third layer (does nothing)
- replace Shift-Escape keycode with KC_GESC
- use LAYOUT_all macro instead of LAYOUT

* modernize readme.md

- update header
- convert metadata section to list
- add flashing and bootloader jump instructions
- update Docs links

* use #pragma once include guard in config.h

* update LED Indicator API

* add license headers
2021-07-17 16:17:48 -07:00
QMK Bot c329b549e4 Merge remote-tracking branch 'origin/master' into develop 2021-07-17 17:16:52 +00:00
James Young ca0e7e7bd9
Cutie Club Giant Macro Pad: add info.json (#13576) 2021-07-17 10:16:20 -07:00
QMK Bot 4be8eec4f2 Merge remote-tracking branch 'origin/master' into develop 2021-07-17 08:43:29 +00:00
James Young b127180c0c
Xelus Akis Configurator Fixes (#13577)
* correct layout macro references

The keyboard's header file and info.json referenced different layout macro names.

* correct layout data

Insert an object for the Non-US Backslash key, which was previously missing.
2021-07-17 01:43:02 -07:00
QMK Bot cdae9a7b19 Merge remote-tracking branch 'origin/master' into develop 2021-07-16 19:16:39 +00:00
Dasky 932a67ced2
Limit RGB brightness for crkbd when not defined (#13568) 2021-07-16 12:16:06 -07:00
QMK Bot edefcdc94f Merge remote-tracking branch 'origin/master' into develop 2021-07-16 16:43:21 +00:00
lukeski14 89eeb4987c
adding tw40 via support (#13032) 2021-07-17 02:42:50 +10:00
QMK Bot 4bef126293 Merge remote-tracking branch 'origin/master' into develop 2021-07-16 16:40:05 +00:00
Oliver Granlund 455a988aa6
[Keyboard] Neito + my DZ60 keymap tweaks (#11773) 2021-07-16 09:39:35 -07:00
Nick Brassel 610788184a Merge remote-tracking branch 'upstream/master' into develop 2021-07-16 09:11:51 +10:00
Andre Brait c330fa725d
Set some default configurations for GMMK Pro (#13219)
* Set some default configurations for GMMK Pro

* Remove FORCE_NKRO to avoid issues with KVMs
2021-07-16 09:06:23 +10:00
QMK Bot e07401bb5a Merge remote-tracking branch 'origin/master' into develop 2021-07-15 16:55:32 +00:00
bomb 68b1ef2d1d
[Keyboard] correct the info.json for qmk configurator and add two empty layers for via (#13552) 2021-07-15 09:54:58 -07:00
QMK Bot b7ec43ed14 Merge remote-tracking branch 'origin/master' into develop 2021-07-15 04:24:45 +00:00
Zach White 9d0b7ab9b9
[keyboard] Clueboard 2x1800 2021 Support (#13220)
* 2x1800 2021

* add support for writing a whole frame at a time

* improvements

* wip

* fix scrolling

* small tweak

* add a buffer that's larger than the display

* add the start of a font

* working upper and lower case letters

* add qmk animation

* integrate the message sign into the qmk task system

* add encoder defaults

* add MAX7219_LED_CUSTOM to config.h

* tweaks

* remove unneeded keymaps

* add a keymap showing how to control the signboard

* cleanup

* cleanup

* add a way to disable the startup test

* make it easier to define options at the keymap level

* Fix define names

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>

* Apply suggestions from gcochard

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>

* feedback from noroads

* format info.json

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
2021-07-14 21:24:15 -07:00
QMK Bot f134c5e124 Merge remote-tracking branch 'origin/master' into develop 2021-07-14 20:56:59 +00:00
mechlovin 18c6e1d46d
[Keyboard] Add Serratus PCB (#13281)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 13:55:52 -07:00
QMK Bot 21b3234780 Merge remote-tracking branch 'origin/master' into develop 2021-07-14 20:55:48 +00:00
Koobaczech 867d60bd64
[Keyboard] Tidying up my projects and subprojects (#13289)
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ethan Madden <maddene@madden.ninja>
2021-07-14 13:55:12 -07:00
Ryan fd8628ccdc
Migrate more fn_actions stuff (#13502) 2021-07-15 03:52:45 +10:00
QMK Bot e69c325a9c Merge remote-tracking branch 'origin/master' into develop 2021-07-14 17:50:47 +00:00
Ryan 99f637e82c
Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509) 2021-07-15 03:50:09 +10:00
Zach White 44d322623e Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json
2021-07-14 10:30:28 -07:00
mechlovin 1c9af238dc
correct data info.json (#13544)
rouge87 and rogue87
2021-07-14 08:46:44 -07:00
bomb 9c4916e2e8
[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (#13494)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 08:39:54 -07:00
James Young dd5ead676b
Traveller handwired layout macro refactor (#13539) 2021-07-13 21:28:56 -07:00
James Young 70efc82c1c
Lucid Phantom soldered: layout macro touch-up (#13540) 2021-07-13 21:27:11 -07:00
Albert Y b29179de1a
RGB Matrix support for Scylla (#13415)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-13 21:26:00 -07:00
Joel Challis ef8267d6a7
Refactor Drop boards to custom matrix lite (#13468) 2021-07-13 21:07:33 -07:00
Ian Klug 6cdba3a437
[Keyboard] Add ianklug grooveboard (#13536)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-13 21:04:14 -07:00