Commit Graph

8 Commits (70267b35c357f2744262300db03eafe642159734)

Author SHA1 Message Date
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
James Young 7d2f70f398
Checker Boards NOP60 touch-up (#13526)
* apply human-friendly formatting to info.json

* fix JSON tree errors in info.json

* rename layout macros

- rename LAYOUT_2x3u to LAYOUT_60_tsangan_hhkb_split_space
- rename LAYOUT_7u to LAYOUT_60_tsangan_hhkb

* rename 2x3u keymap to default
2021-07-12 23:32:54 -07:00
QMK Bot 638373a16c Merge remote-tracking branch 'origin/master' into develop 2021-07-02 13:01:28 +00:00
Joel Challis 9f49ec51a1
Fix up recent checkerboards additions (#13414) 2021-07-02 14:00:55 +01:00
QMK Bot 348750294b Merge remote-tracking branch 'origin/master' into develop 2021-07-02 00:46:10 +00:00
npspears 6db4b49fec
add support for Axon40 and G_IDB60 (#13075)
* add support for Axon40

* add support for G_IDB60

* added bootloader reset instructions

* added bootloader reset instructions
2021-07-02 10:45:31 +10:00
Zach White b908275354
Optimize our jsonschema by using refs (#13271)
* fix some broken info.json files

* optimize our jsonschema using refs

* fix formatting after vscode broke it

* make flake8 happy

* cleanup

* make our schema validation more compact and flexible
2021-06-24 20:48:53 -07:00
npspears 54e788364a
[Keyboard] add ortho Candybar and NOP60 PCBs (#12807)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-13 09:36:12 -07:00