1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

21460 commits

Author SHA1 Message Date
QMK Bot ebd81b3217 Merge remote-tracking branch 'origin/master' into develop 2021-09-25 16:48:23 +00:00
Albert Y c74bd72d4f
[Keyboard] Fix pin spacing alignmnent (#14592)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-09-25 09:47:56 -07:00
QMK Bot a857956a3c Merge remote-tracking branch 'origin/master' into develop 2021-09-25 08:31:52 +00:00
Ryan 68c327f672
Remove keyboard-level COMBO_ENABLE rules (#14550) 2021-09-25 18:31:24 +10:00
QMK Bot 8fa9312b0f Merge remote-tracking branch 'origin/master' into develop 2021-09-24 23:30:19 +00:00
Drashna Jaelre 3be47b3eaa
[Keyboard] Fix default keymap for Potato65s (#14587) 2021-09-25 00:29:47 +01:00
QMK Bot 7deac7ada3 Merge remote-tracking branch 'origin/master' into develop 2021-09-24 23:29:40 +00:00
James Young 216620ee76
tidy up Clawsome Boards info.json files (#14586)
* removes `meta` field
* changes `maintainer` field to use GitHub username
2021-09-25 00:29:08 +01:00
QMK Bot cf7b59389e Merge remote-tracking branch 'origin/master' into develop 2021-09-24 23:28:56 +00:00
James Young 9e87b47a9c
Aozora Hotswap info.json clean-up (#14585)
* clean up info.json

* correct maintainer field to use GitHub username
* remove `meta` key

* clean up readme.md

* correct key count in intro paragraph
2021-09-25 00:28:25 +01:00
Joel Challis 3a2a39e5ec
Initial pass of F405 support (#14584)
* Initial pass of F405 support

* remove some conf files

* docs

* clang
2021-09-25 00:19:41 +01:00
Drashna Jaelre e1dfbfbfd3
[Keyboard] Fix typo in mechloving adelais header files (#14590) 2021-09-25 00:15:33 +01:00
James Young 20d3dc0c83
Patch for develop branch merge conflicts
Fixes bugs introduced by 675c5a5e12.
2021-09-24 12:42:57 -07:00
Drashna Jael're 675c5a5e12
Merge remote-tracking branch 'origin/master' into develop 2021-09-24 12:21:32 -07:00
Stan Gurenkov 4493a05b74
[Keyboard] refactor signum30 (#14527)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Stan Gurenkov <stan.gurenkov@docusign.com>
2021-09-24 10:05:29 -07:00
James Young 60b13d04cd
Alf X2 Refactor (#14572) 2021-09-24 09:29:58 -07:00
James Young 076a332613
Swift65 Solder Refactor (#14579) 2021-09-24 09:29:46 -07:00
WiZ.GG 3778dd5727
[Keyboard] add 2 keys in jkb65 keymap (#14576) 2021-09-24 09:29:18 -07:00
Andrew Braini 863d9c35fe
[Keyboard] Create the battleship gamepad keyboard. (#14551)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 09:27:29 -07:00
Aeonstrife 257bc473e5
[Keyboard] Add Potato65 Solderable PCB (#14047)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 09:13:53 -07:00
Nick Abe 768803ef72
[Keyboard] PLX info.json update (#14536)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 08:57:08 -07:00
Nick Abe 2d079c984f
[Keyboard] Add Rotor Keyboard (#14407)
* rotor keyboard

* readme image

* info.json update

* Update readme.md

* Update keyboards/rotor/rules.mk

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

* Update keyboards/rotor/info.json

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 08:56:37 -07:00
clickclackwho 4f37084677
[Docs] Broken FAQ hyperlink (#14578) 2021-09-24 08:43:05 -07:00
Albert Engelbrecht 77bb907fee
[Keyboard] Added A. Dux keyboard configurations (#14320)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:30:52 -07:00
phrygiandesign c6f92e37aa
[Keyboard] Add phrygian design ph100 (#13738)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:25:33 -07:00
mechlovin fcb7c7b04f
[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 (#14252)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:13:23 -07:00
ryanbughuang c242693ec7
[Keyboard] Add sam/sg81m layout (#13432)
Co-authored-by: Joel Challis <git@zvecr.com>
2021-09-23 23:41:05 -07:00
Albert Y e36c2cbf90
[Keyboard] Disable console on Sofle for size concerns (#14577)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-09-23 23:32:40 -07:00
umi 30140f48d0
[Docs] update Japanese translation of pr_checklist.md (#13693)
* update pr_checklist.md translation

* update file based on comments

* add id on feature_led_indicators.md and update text based on comments

* update file based on comments

* update file based on comment
2021-09-24 14:51:34 +09:00
Sets3n f4e42bde4a
kk980 - Fix Configurator rendering (#14556)
* add kk980

* fix

* fix config.h

* Modified readme.md

* fix

* Modified format.

* Modified image.

* Modified rules.mk

* Modified rules.mk + #

* fix info.json: keys dislocation
2021-09-23 20:16:20 +01:00
Drashna Jaelre a68c4d8b81
[Keyboard] Update default keymaps for OLKB boards (#14565) 2021-09-23 20:08:23 +01:00
James Young 29f199f456
AMJ96 Refactor (#14571)
* clean up amj96.h

- use #pragma once include guard
- remove extra comments
- update matrix position alignment (easier readability)

* info.json: apply human-friendly formatting

* rename LAYOUT to LAYOUT_all

* clean up rules.mk

Align to QMK's AVR template.

* clean up default keymap

- use four-space indent
- add RESET keycode (Fn+R)
- remove unnecessary functions

* clean up config.h

- use #pragma once include guard
- move lighting settings to the middle of the file (QMK template conformance)
- remove Magic and MIDI configuration blocks

* update readme.md file

- update keyboard info list
- add flashing instructions
- update Docs links
- remove trailing spaces

* remove "empty" config.h and readme.md from default keymap
2021-09-23 11:01:49 -07:00
QMK Bot d7e61e56bb Merge remote-tracking branch 'origin/master' into develop 2021-09-23 08:32:00 +00:00
James Young 66857b919b
Wuque Mammoth20x Layout Macro Refactor (#14568)
* mammoth20x: edit size of RightEncode key in Configurator

* physically arrange layout macro

Arranges the keycodes to resemble the assembled board.

* rename LAYOUT_default to LAYOUT

Includes "layout_aliases" tree in info.json for backwards compatibility.

* rules.mk touch-up

* convert tabs to spaces
* add line break before ENCODER_ENABLE (not included in QMK's template)

* readme.md touch-up

* remove zero-width space characters
* markdown fix for info paragraph
* update link text
2021-09-23 01:31:11 -07:00
James Young c679911f3d
Merge remote-tracking branch 'upstream/master' into develop 2021-09-23 00:59:31 -07:00
James Young 62ef4a9c8a
Meira Refactor (#14566)
* clean up keyboard header files

* use #pragma once include guard
* convert tabs to spaces
* remove redundant #include statements
* update revision references to main header (`../meira.h` -> `meira.h`)

* refactor default keymap

* use LAYOUT as layout macro reference
* use enum statement for layer indexes; make layers contiguous
* use four-space indent
* update keycode grid alignment

* update layout macro aliases

* move layout macro aliases to info.json
  * alias KEYMAP to LAYOUT_ortho_4x12 so the user keymaps don't have to be edited

* touch up meira.h

There's no Planck MIT layout reference here.

* add copyright headers

* workaround patch for grahampheath keymap

The `matrix_init_kb()` function in `meira.c` calls `backlight_set()`, but the grahampheath keymap disables Backlight to make space for Audio, causing the firmware to fail to compile.

This commit wraps the `backlight_set()` call in an ifdef statement, so the call is excluded if Backlight is disabled.

* clean up rules.mk inline comments

* re-order rules.mk settings

* clean up readme.md

* correct link to keyboard image
* change metadata section to unordered list
* spelling corrections
* update make instructions and Docs links
2021-09-23 00:49:02 -07:00
QMK Bot 399d26c990 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 04:03:00 +00:00
umi 0fc15f4d30
[Docs] update Japanese translation of feature_backlight.md (#14403)
* update feature_backlight.md translation

* update file based on comments
2021-09-23 13:02:32 +09:00
QMK Bot 125d4c413f Merge remote-tracking branch 'origin/master' into develop 2021-09-23 04:02:12 +00:00
umi 7f0c397c72
[Docs] update Japanese translation of feature_advanced_keycodes.md (#14309)
* update feature_advanced_keycodes.md translation

* update file based on comments
2021-09-23 13:01:42 +09:00
QMK Bot 3edd4bc48f Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:59:22 +00:00
umi 5347577346
[Docs] update Japanese translation of isp_flashing_guide.md (#13700)
* update isp_flashing_guide.md translation

* update isp_flashing_guide.md translation

* correct url

* trim remaining merge identifier
2021-09-23 12:58:56 +09:00
QMK Bot 787cce1415 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:55:47 +00:00
umi 7bfc6083b7
[Docs] update Japanese translation of feature_leader_key.md (#13669)
* update feature_leader_key.md translation

* update file based on comments

* update text based on comments
2021-09-23 12:55:19 +09:00
QMK Bot e41f1e9460 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:53:29 +00:00
umi 618a28c6ae
[Docs] update Japanese translation of one_shot_keys.md (#13656)
* update one_shot_keys.md translation

* update one_shot_keys.md translation

* correct paramter for function

* add change of #13754
2021-09-23 12:52:53 +09:00
QMK Bot d5df1b81a3 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 01:03:23 +00:00
drhigsby 4062860c05
[Keyboard] Bkf (#14534)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22 18:02:49 -07:00
James Young 4093732581
Merge remote-tracking branch 'upstream/master' into develop 2021-09-22 13:55:48 -07:00
James Young 1aaef6c988
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) (#14567)
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22)

* update keyboards/handwired/slash/rules.mk per fauxpark
2021-09-22 12:33:41 -07:00