masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,802 Commits 2 Branches 0 Tags 274 MiB
Commit Graph

701 Commits

Author SHA1 Message Date
Nick Brassel 891d18d356
Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) 
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.

* Update flashing.md

* Update chconf.h

* Update config.h

* Update halconf.h

* Update mcuconf.h
 2021-04-25 13:40:56 +10:00
QMK Bot 7795e167ab Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:46:58 +00:00
Christiano Haesbaert d330203486
[Keyboard] Add amigopunk, a handwired 75% ALPS (#12489) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 10:46:19 -07:00
QMK Bot a9e6dc3629 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:18:12 +00:00
Dimitris Papavasiliou bd07120d33
[Keyboard] Fix and improve SPI transport in the Lagrange (#12606) 
Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
 2021-04-20 10:17:39 -07:00
QMK Bot 86ece8e98e Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:04:50 +00:00
Eric Wood 94d9d2bb31
[Keyboard] Add handwired/frankie_macropad (#12349) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-18 23:04:16 -07:00
QMK Bot 19b143688f Merge remote-tracking branch 'origin/master' into develop 2021-04-14 21:51:45 +00:00
Jan Christoph Ebersbach b33e6793de
Dactyl manuform 5x6 2 5 keymap (#11353) 
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-14 17:51:08 -04:00
James Young a8d64c8b89
Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172) 2021-04-12 21:18:52 +02:00
QMK Bot d4b3d00d88 Merge remote-tracking branch 'origin/master' into develop 2021-04-08 16:48:07 +00:00
Adrian 75f83210f4
Add new handwired keyboard (Ergocheap) (#11857) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-08 18:47:24 +02:00
QMK Bot ea472b46c9 Merge remote-tracking branch 'origin/master' into develop 2021-03-27 08:04:42 +00:00
James Young a866fbf381
handwired/rs60: use LAYOUT_ortho_5x12 directly (#12397) 
This commit renames the macro LAYOUT to LAYOUT_ortho_5x12, and removes the alias.
 2021-03-27 19:03:42 +11:00
QMK Bot a3760c0891 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:39:24 +00:00
James Young 1d706bd77c
handwired/bolek: correct key object order (#12356) 2021-03-25 22:38:52 +11:00
QMK Bot 183dde75de Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:35:06 +00:00
Brandon Claveria 8b39ae13c7
add equator (#12369) 
Co-authored-by: Swiftrax <swiftrax@gmail.com>
 2021-03-25 22:34:29 +11:00
QMK Bot 743d6c430b Merge remote-tracking branch 'origin/master' into develop 2021-03-24 10:13:37 +00:00
Ryan 723d9af04d
Add info.json for handwired/datahand (#12320) 2021-03-24 21:12:55 +11:00
QMK Bot 9afbbf21fd Merge remote-tracking branch 'origin/master' into develop 2021-03-23 18:19:00 +00:00
Viktor Eikman d395c81606
Configurator fixes for handwired/concertina/64key (#12316) 
* Fixed bug that was hiding a key in info.json.

* Improvements to presentation.
 2021-03-23 11:18:19 -07:00
QMK Bot 31b657e8ea Merge remote-tracking branch 'origin/master' into develop 2021-03-17 17:08:39 +00:00
klausweiss f490777502
[Keyboard] Add handwired/bolek keyboard (#12234) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-17 10:07:56 -07:00
QMK Bot 8b9419aaf7 Merge remote-tracking branch 'origin/master' into develop 2021-03-15 08:07:38 +00:00
James Young 2e50b34c67
Add missing info.json files for keyboards (#12239) 
Recent changes to QMK Configurator's API have made it so an info.json file is required for QMK Configurator to know how to render the keyboard in question.

This PR adds info.json files for keyboards that did not have them, with a few exceptions for boards whose layouts I was unable to determine.

* add info.json file for 2key2crawl

* add info.json file for 40percentclub/4x4

* add info.json file for 40percentclub/5x5

* add info.json file for 4pplet/aekiso60/rev_a

* add info.json file for 4pplet/steezy60/rev_a

* add info.json file for 6ball

* add info.json file for 7c8/framework

* add info.json file for aeboards/constellation

* add info.json file for alpine65

* add info.json file for aplyard/aplx6

* add info.json file for arch_36

* add info.json file for arisu

* add info.json file for box75

* add info.json file for butterstick

* add info.json file for four_banger

* add info.json file for geekboards/tester

* add info.json file for handwired/2x5keypad

* add info.json file for handwired/412_64

* add info.json file for handwired/42

* add info.json file for handwired/aplx2

* add info.json file for handwired/brain

* add info.json file for handwired/cans12er

* add info.json file for handwired/ck4x4

* add info.json file for handwired/d48

* add info.json file for handwired/dactyl_manuform/dmote/62key

* add info.json file for handwired/daishi

* add info.json file for handwired/hexon38

* add info.json file for handwired/jot50

* add info.json file for handwired/jotanck

* add info.json file for handwired/jotpad16

* add info.json file for handwired/k8split

* add info.json file for handwired/myskeeb

* add info.json file for handwired/nicekey

* add info.json file for handwired/onekey

* add info.json file for handwired/postageboard

* add info.json file for handwired/riblee_f401

* add info.json file for handwired/riblee_f411

* add info.json file for handwired/rs60

* add info.json file for handwired/splittest

* add info.json file for handwired/trackpoint

* add info.json file for handwired/traveller

* add info.json file for hhkb_lite_2

* add info.json file for honeycomb

* add info.json file for ivy/rev1

* add info.json file for keebio/viterbi

* add info.json file for laptreus

* add info.json file for latin47ble

* add info.json file for latin64ble

* add info.json file for launchpad/rev1

* add info.json file for lets_split_eh/eh

* add info.json file for mechmini/v1

* add info.json file for meira

* add info.json file for meishi

* add info.json file for merge/iso_macro

* add info.json file for mschwingen/modelm

* add info.json file for pabile/p20

* add info.json files for pimentoso/paddino02

rev1, rev2/left, and rev2/right

* add info.json file for rgbkb/pan

* add info.json files for runner3680

3x6, 3x7, 3x8, 4x6, 4x7, 4x8, 5x6, 5x7, and 5x8

* add info.json file for sck/gtm

* add info.json file for splitish

* add info.json file for standaside

* add info.json file for ungodly/launch_pad

* add info.json file for xelus/trinityxttkl

* Revert "add info.json file for rgbkb/pan"

This reverts commit 280b89bc6157023a621a9864f5d74d59d62bb511.

* correct maintainer for ivy/rev1
 2021-03-15 01:06:55 -07:00
QMK Bot b113772bb1 Merge remote-tracking branch 'origin/master' into develop 2021-03-10 22:48:53 +00:00
Joel Challis 790f94533c
Refactor to use led config - Part 6 (#12115) 
* Convert to config

* Convert to config

* Convert to config

* Convert to config

* Convert to config

* Convert to config

* Convert to config

* Convert to config

* revert changes
 2021-03-10 22:48:18 +00: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
Joel Challis 415a8bc249
ARM - Refactor SLEEP_LED to support more platforms (#8403) 
* Initial refactor of ARM SLEEP_LED to enable more platforms

* fix build issues

* Disable SLEEP_LED for boards with no caps lock code

* Enable GPT14 for boards with caps lock code and SLEEP_LED enabled

* Enable GPT for boards with caps lock code and SLEEP_LED enabled
 2021-02-28 15:52:43 +00:00
James Young f41e5ec928
Compilation fixes for handwired/concertina/64key (#11987) 
* concatenate config.h to 64key directory

* move rules.mk to 64key directory

This commit makes the firmware actually compile.

* insert complete rules.mk contents

Conforms the file to QMK's template.

* move info.json to 64key directory

* remove concertina.h

This file no longer serves a purpose now that everything is in the 64key directory.

* complete 64key readme.md

Conforms the file more to QMK's template.
 2021-02-28 17:10:26 +11:00
gazeddy cd12fe86d3
New Variants of Console Keyboard (#11973) 
* initial push of console keyboard variants

* update readme

* fixed compilation issue

* update Readme

* added 18 and 27 key variants

* missed commas

* update info.json

* added readme

* correct info.json

* correct info.json

* info.json again

* fixed keymap.c
 2021-02-28 17:09:41 +11:00
ridingqwerty 6b1170cb97
Onekey keymap: quine (#10732) 2021-02-28 16:31:40 +11:00
Zach White 58e733b5a0 remove keyboard_folder from info.json 2021-02-27 16:17:12 -08:00
QMK Bot 23ed6c4ec0 Merge remote-tracking branch 'origin/master' into develop 2021-02-27 04:25:27 +00:00
YangPiCui 804d5c1c5d
[Keyboard] Evk v1.3 add a key (#11880) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-02-26 20:24:55 -08:00
Drashna Jael're 146b042514
Merge remote-tracking branch 'origin/master' into develop 2021-02-23 13:57:26 -08:00
Drashna Jaelre 0b69e4df81
[Keymap] Drashna Updates - Split+OLED edition (#11968) 2021-02-23 10:57:24 -08:00
QMK Bot 2abfa624c9 Merge remote-tracking branch 'origin/master' into develop 2021-02-23 01:55:01 +00:00
Ikta 11146ecd08
pill60 fix info.json to be used in configurator (#11979) 2021-02-23 01:54:29 +00:00
QMK Bot 29c19b6f40 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:19:36 +00:00
Ikta 311bff3d56
[Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919) 2021-02-20 22:19:06 -08:00
QMK Bot cec56b35b9 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 22:47:14 +00:00
gazeddy d35d65f2e0
Added ConsoleKeyboard (#11950) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-02-21 09:46:43 +11:00
QMK Bot 1a97f29f5d Merge remote-tracking branch 'origin/master' into develop 2021-02-20 19:32:47 +00:00
Viktor Eikman 5655d6e5f5
[Keyboard] Concertina (#11922) 
* [Keyboard] Concertina

* Added a novel handwired keyboard.

* Concertina lint

* Perfunctory changes to pass CI.

* Concertina line width

* Changes from code review: GPL headers, modernization, full-width
  representation of matrix to match info.json.
 2021-02-20 14:32:04 -05:00
QMK Bot 9f6ac28d13 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 05:42:13 +00:00
Richard Nunez 73e2bf54f8
Adding new handwired ortho 5x14 keyboard (#11597) 
Co-authored-by: Richard Nunez <richard.nunez@macrossplusinc.com>
 2021-02-20 16:41:40 +11:00
QMK Bot 161cea77ba Merge remote-tracking branch 'origin/master' into develop 2021-02-19 06:12:38 +00:00