Commit graph

8 commits

Author SHA1 Message Date
QMK Bot
9b42ee1f6d Merge remote-tracking branch 'origin/master' into develop 2022-09-21 17:33:15 +00:00
bojiguard
ee22f34e69
Fungo rev1: fix QMK Configurator key sequence - info.json (#18434)
* * info.json: fix key position and order

* fix json format

* Update keyboards/fungo/rev1/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-21 18:32:31 +01:00
Joshua Diamond
a4d1d8b745
Resolve conflict merging master to develop (#18297)
* Discourage use of ENCODER_MAP at keyboard level (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

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

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

* Fungo rev1: fix QMK Configurator key sequence (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-09-06 17:42:43 -04:00
Dasky
dc4af81e0b
Remove legacy USE_SERIAL define (#18292)
* Remove legacy USE_SERIAL define

* tidy up missed comments
2022-09-06 18:46:34 +01:00
James Young
7160487ccd
Fungo rev1: fix QMK Configurator key sequence (#18293)
* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence
2022-09-06 18:36:37 +01:00
Ryan
68ad251667
Remove USB IDs and strings from fungo/rev1 (#18133) 2022-08-22 19:04:01 +10:00
QMK Bot
d93b5ef247
Format code according to conventions (#18119) 2022-08-20 21:07:57 +01:00
bojiguard
5222cf7673
add fungo keyboard (#17513)
by bojiguard
2022-08-20 21:01:04 +01:00