summaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-19 16:12:49 +0000
committerQMK Bot <hello@qmk.fm>2021-08-19 16:12:49 +0000
commitb7a3ddb6d129caaf3a05cc8e49ecbe78cf00538e (patch)
treeaf37edca096e9633ca2096ee3becaa906abbffeb /layouts
parentdb316716c1a9a055b9c24b889eaa61c97dc33425 (diff)
parent072459871ba45c90cf6e9a66bc975f63eb41e413 (diff)
downloadqmk_firmware-b7a3ddb6d129caaf3a05cc8e49ecbe78cf00538e.tar.gz
qmk_firmware-b7a3ddb6d129caaf3a05cc8e49ecbe78cf00538e.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ortho_4x12/junonum/config.h5
-rw-r--r--layouts/community/ortho_4x12/junonum/keymap.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h
index 4b4d010a6a..c16d74892d 100644
--- a/layouts/community/ortho_4x12/junonum/config.h
+++ b/layouts/community/ortho_4x12/junonum/config.h
@@ -34,4 +34,7 @@
#define ENCODER_RESOLUTION 4
// Reduce power consumption for iOS compatibility
-#define USB_MAX_POWER_CONSUMPTION 100 \ No newline at end of file
+#define USB_MAX_POWER_CONSUMPTION 100
+
+// Short tap threshold
+#define TAPPING_TERM 250
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index d4c840f174..0b0bdc36bb 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_RAISE] = LAYOUT_ortho_4x12(
KC_GRV, _______, _______, KC_LBRC, KC_RBRC, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
_______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, KC_4, KC_5, KC_6, KC_MINUS, KC_BSLS,
- _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_EQUAL, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_EQUAL, KC_ENT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY
),
@@ -86,8 +86,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1] = LAYOUT_ortho_4x12(
- KC_MENU, DP_ON, KC_PGDN, KC_UP, KC_PGUP, KC_INS, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
- KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_DEL ,
+ KC_APP, DP_ON, KC_PGDN, KC_UP, KC_PGUP, KC_INS, KC_CAPS, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
+ _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_DEL ,
_______, _______, _______, _______, _______, KC_END, KC_END, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,
_______, _______, _______, _______, _______, _______, _______, _______, DP_ON, _______, _______, _______
),