summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2022-09-06 17:42:43 -0400
committerGitHub <noreply@github.com>2022-09-06 17:42:43 -0400
commita4d1d8b7450e409d007f6e795ffb1cee42a8e511 (patch)
tree565467087111070e36c2b72fe0a8f18dad6563a8
parentdc4af81e0b375b559d270bbeb3495d61933f8c54 (diff)
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>
-rw-r--r--docs/feature_encoders.md4
-rw-r--r--docs/pr_checklist.md3
-rw-r--r--keyboards/fungo/rev1/info.json168
3 files changed, 83 insertions, 92 deletions
diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index f93ab9fd2d..60b613d6a5 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -69,7 +69,7 @@ Additionally, if one side does not have an encoder, you can specify `{}` for the
## Encoder map :id=encoder-map
-Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your `rules.mk`:
+Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your keymap's `rules.mk`:
```make
ENCODER_MAP_ENABLE = yes
@@ -88,6 +88,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif
```
+?> This should only be enabled at the keymap level.
+
Using encoder mapping pumps events through the normal QMK keycode processing pipeline, resulting in a _keydown/keyup_ combination pushed through `process_record_xxxxx()`. To configure the amount of time between the encoder "keyup" and "keydown", you can add the following to your `config.h`:
```c
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index ae5cb5eef6..1034631863 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -67,6 +67,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
- no `(-/+size)` comments related to enabling features
- remove the list of alternate bootloaders if one has been specified
- no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk)
+ - no "keymap only" features enabled
+ - `COMBO_ENABLE`
+ - `ENCODER_MAP_ENABLE`
- keyboard `config.h`
- don't repeat `MANUFACTURER` in the `PRODUCT` value
- no `#define DESCRIPTION`
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index d34e95d578..6941d70d81 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -11,101 +11,87 @@
"layouts": {
"LAYOUT_fungo_split_num": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.5},
+ {"x":0, "y":0.375},
+ {"x":1, "y":0.375},
+ {"x":2, "y":0.125},
+ {"x":3, "y":0},
+ {"x":4, "y":0.125},
+ {"x":5, "y":0.25},
+ {"x":6, "y":0.5},
+ {"x":12, "y":0.5},
+ {"x":13, "y":0.25},
+ {"x":14, "y":0.125},
+ {"x":15, "y":0},
+ {"x":16, "y":0.125},
+ {"x":17, "y":0.375},
+ {"x":18, "y":0.375},
- {"x": 12, "y": 0.5},
- {"x": 13, "y": 0.25},
- {"x": 14, "y": 0.125},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0.125},
- {"x": 17, "y": 0.375},
- {"x": 18, "y": 0.375},
-
+ {"x":0, "y":1.375},
+ {"x":1, "y":1.375},
+ {"x":2, "y":1.125},
+ {"x":3, "y":1},
+ {"x":4, "y":1.125},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.5},
+ {"x":12, "y":1.5},
+ {"x":13, "y":1.25},
+ {"x":14, "y":1.125},
+ {"x":15, "y":1},
+ {"x":16, "y":1.125},
+ {"x":17, "y":1.375},
+ {"x":18, "y":1.375},
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.5},
+ {"x":0, "y":2.375},
+ {"x":1, "y":2.375},
+ {"x":2, "y":2.125},
+ {"x":3, "y":2},
+ {"x":4, "y":2.125},
+ {"x":5, "y":2.25},
+ {"x":6, "y":2.5},
+ {"x":12, "y":2.5},
+ {"x":13, "y":2.25},
+ {"x":14, "y":2.125},
+ {"x":15, "y":2},
+ {"x":16, "y":2.125},
+ {"x":17, "y":2.375},
+ {"x":18, "y":2.375},
- {"x": 12, "y": 1.5},
- {"x": 13, "y": 1.25},
- {"x": 14, "y": 1.125},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1.125},
- {"x": 17, "y": 1.375},
- {"x": 18, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.5},
+ {"x":0, "y":3.375},
+ {"x":1, "y":3.375},
+ {"x":2, "y":3.125},
+ {"x":3, "y":3},
+ {"x":4, "y":3.125},
+ {"x":5, "y":3.25},
+ {"x":6, "y":3.5},
+ {"x":7, "y":4},
+ {"x":8.25, "y":3.75},
+ {"x":9.75, "y":3.75},
+ {"x":11, "y":4},
+ {"x":12, "y":3.5},
+ {"x":13, "y":3.25},
+ {"x":14, "y":3.125},
+ {"x":15, "y":3},
+ {"x":16, "y":3.125},
+ {"x":17, "y":3.375},
+ {"x":18, "y":3.375},
- {"x": 12, "y": 2.5},
- {"x": 13, "y": 2.25},
- {"x": 14, "y": 2.125},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2.125},
- {"x": 17, "y": 2.375},
- {"x": 18, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
- {"x": 6, "y": 3.5},
-
- {"x": 12, "y": 3.5},
- {"x": 13, "y": 3.25},
- {"x": 14, "y": 3.125},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3.125},
- {"x": 17, "y": 3.375},
- {"x": 18, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.25},
- {"x": 3, "y": 4.25},
- {"x": 5.25, "y": 3},
- {"x": 5.75, "y": 5},
- {"x": 7, "y": 4},
-
- {"x": 11, "y": 4},
- {"x": 13.25, "y": 5},
- {"x": 13.75, "y": 3},
- {"x": 15, "y": 4.25},
- {"x": 16, "y": 4.25},
- {"x": 17, "y": 4.375},
- {"x": 18, "y": 4.375},
-
-
- {"x": 7, "y": 5},
- {"x": 8.25, "y": 3.75},
- {"x": 8.25, "y": 4.75},
-
- {"x": 9.75, "y": 4.75},
- {"x": 9.75, "y": 3.75},
- {"x": 11, "y": 5},
-
-
-
-
-
- ]
+ {"x":0, "y":4.375},
+ {"x":1, "y":4.375},
+ {"x":2, "y":4.25},
+ {"x":3, "y":4.25},
+ {"x":4.333, "y":4.25},
+ {"x":5.667, "y":4.625},
+ {"x":7, "y":5},
+ {"x":8.25, "y":4.75},
+ {"x":9.75, "y":4.75},
+ {"x":11, "y":5},
+ {"x":12.333, "y":4.625},
+ {"x":13.667, "y":4.25},
+ {"x":15, "y":4.25},
+ {"x":16, "y":4.25},
+ {"x":17, "y":4.375},
+ {"x":18, "y":4.375}
+ ]
}
}
}