Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit cc6202d
Merge: 94b74b5 67be956
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 22 16:33:41 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 67be956
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 22 09:33:01 2023 -0700

    Teahouse Ayleen Community Layout Support and Touch-Up (qmk#21341)

    * [chore] correct layout data

    * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_tsangan

    * [enhancement] enable Community Layout support

commit 94b74b5
Merge: aad5746 c01a3cf
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 22 16:32:06 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit c01a3cf
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 22 09:31:34 2023 -0700

    Viktus OSAv2 Numpad Community Layout Support and Configurator Touch-Up (qmk#21342)

    * [style] sort JSON keys in layout objects

    * [chore] correct layout data

    * [refactor] rename LAYOUT_all_split to LAYOUT_ortho_5x4

    * [refactor] rename LAYOUT_2u_plus_2u_enter_2u_zero to LAYOUT_numpad_5x4

    * [enhancement] enable Community Layout support

commit aad5746
Author: Ryan <fauxpark@gmail.com>
Date:   Fri Jun 23 00:07:28 2023 +1000

    Move protocol makefiles into their respective folders (qmk#21332)

    * Move protocol makefiles into their respective folders

    * Fix USB-USB converter

commit fb76c94
Author: Joel Challis <git@zvecr.com>
Date:   Thu Jun 22 15:06:57 2023 +0100

    Fix `rate/pistachio_pro:via` (qmk#21339)

commit bfd6bb8
Merge: 8ca7570 87ab130
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 22 13:46:17 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 87ab130
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 22 06:45:39 2023 -0700

    Soda Pocket: correct layout data (qmk#21333)

    [chore]

    Correct the layout data for the keyboard.

    This commit fixes a misleading Configurator implementation.

commit 8ca7570
Merge: 5a4fab0 2176c76
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 22 13:45:27 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 2176c76
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu Jun 22 06:44:48 2023 -0700

    Spleeb: correct layout data (qmk#21334)

    * [style] friendly-format info.json

    * [chore] correct layout data

    Fix a poor Configurator/CLI rendering.
  • Loading branch information
@freznel10
freznel10 committed Jun 23, 2023
1 parent 262393f commit 46acadf
Show file tree
Hide file tree
Showing 17 changed files with 375 additions and 107 deletions.
5 changes: 3 additions & 2 deletions builddefs/build_keyboard.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,11 @@ include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk

ifneq ($(strip $(PROTOCOL)),)
include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]'))
else
include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
PROTOCOL_KEY = $(PLATFORM_KEY)
endif
include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk

# Setup definitions based on the selected MCU
$(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))
Expand Down
8 changes: 4 additions & 4 deletions keyboards/rate/pistachio_pro/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,31 @@ enum layer_names {

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_via(
[_BASE] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY,
JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_DEL, KC_END, KC_PGDN,
JP_EISU, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, KC_SPC, LT(_FN, JP_HENK), JP_KANA, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN] = LAYOUT_via(
[_FN] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, JP_DOT, JP_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_RESERVE_0] = LAYOUT_via(
[_RESERVE_0] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_RESERVE_1] = LAYOUT_via(
[_RESERVE_1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
Expand Down
20 changes: 10 additions & 10 deletions keyboards/soda/pocket/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,25 @@
{"matrix": [2, 3], "x": 3.25, "y": 2.25},
{"matrix": [2, 4], "x": 4.25, "y": 2.25},
{"matrix": [2, 5], "x": 5.25, "y": 2.25},
{"matrix": [3, 3], "x": 6.25, "y": 2.25, "h": 2},

{"matrix": [3, 4], "x": 3.25, "y": 3.25},
{"matrix": [3, 5], "x": 4.25, "y": 3.25},
{"matrix": [3, 6], "x": 5.25, "y": 3.25},
{"matrix": [3, 3], "x": 3.25, "y": 3.25},
{"matrix": [3, 4], "x": 4.25, "y": 3.25},
{"matrix": [3, 5], "x": 5.25, "y": 3.25},
{"matrix": [3, 6], "x": 6.25, "y": 2.25, "h": 2},

{"matrix": [4, 1], "x": 1, "y": 4.25},

{"matrix": [4, 3], "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "x": 4.25, "y": 4.25},
{"matrix": [4, 5], "x": 5.25, "y": 4.25},
{"matrix": [5, 0], "x": 6.25, "y": 4.25, "h": 2},

{"matrix": [5, 1], "x": 0, "y": 5.25},
{"matrix": [5, 2], "x": 1, "y": 5.25},
{"matrix": [5, 4], "x": 2, "y": 5.25},
{"matrix": [5, 0], "x": 0, "y": 5.25},
{"matrix": [5, 1], "x": 1, "y": 5.25},
{"matrix": [5, 2], "x": 2, "y": 5.25},

{"matrix": [5, 5], "x": 3.25, "y": 5.25, "w": 2},
{"matrix": [5, 6], "x": 5.25, "y": 5.25}
{"matrix": [5, 4], "x": 3.25, "y": 5.25, "w": 2},
{"matrix": [5, 5], "x": 5.25, "y": 5.25},
{"matrix": [5, 6], "x": 6.25, "y": 4.25, "h": 2}
]
}
}
Expand Down
21 changes: 15 additions & 6 deletions keyboards/spleeb/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,61 +54,70 @@
{"matrix": [0, 4], "x": 4, "y": 0.2},
{"matrix": [0, 5], "x": 5, "y": 0.4},
{"matrix": [0, 6], "x": 6, "y": 0.9},

{"matrix": [5, 6], "x": 9.75, "y": 0.9},
{"matrix": [5, 5], "x": 10.75, "y": 0.4},
{"matrix": [5, 4], "x": 11.75, "y": 0.2},
{"matrix": [5, 3], "x": 12.75, "y": 0},
{"matrix": [5, 2], "x": 13.75, "y": 0.2},
{"matrix": [5, 1], "x": 14.75, "y": 0.6},
{"matrix": [5, 0], "x": 15.75, "y": 0.6},

{"matrix": [1, 0], "x": 0, "y": 1.6},
{"matrix": [1, 1], "x": 1, "y": 1.6},
{"matrix": [1, 2], "x": 2, "y": 1.2},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.2},
{"matrix": [1, 5], "x": 5, "y": 1.4},
{"matrix": [1, 6], "x": 6, "y": 1.9},

{"matrix": [6, 6], "x": 9.75, "y": 1.9},
{"matrix": [6, 5], "x": 10.75, "y": 1.4},
{"matrix": [6, 4], "x": 11.75, "y": 1.2},
{"matrix": [6, 3], "x": 12.75, "y": 1},
{"matrix": [6, 2], "x": 13.75, "y": 1.2},
{"matrix": [6, 1], "x": 14.75, "y": 1.6},
{"matrix": [6, 0], "x": 15.75, "y": 1.6},

{"matrix": [2, 0], "x": 0, "y": 2.6},
{"matrix": [2, 1], "x": 1, "y": 2.6},
{"matrix": [2, 2], "x": 2, "y": 2.2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.2},
{"matrix": [2, 5], "x": 5, "y": 2.4},
{"matrix": [2, 6], "x": 6, "y": 2.9},

{"matrix": [7, 6], "x": 9.75, "y": 2.9},
{"matrix": [7, 5], "x": 10.75, "y": 2.4},
{"matrix": [7, 4], "x": 11.75, "y": 2.2},
{"matrix": [7, 3], "x": 12.75, "y": 2},
{"matrix": [7, 2], "x": 13.75, "y": 2.2},
{"matrix": [7, 1], "x": 14.75, "y": 2.6},
{"matrix": [7, 0], "x": 15.75, "y": 2.6},

{"matrix": [3, 1], "x": 1, "y": 3.6},
{"matrix": [3, 2], "x": 2, "y": 3.2},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3.2},
{"matrix": [3, 5], "x": 5, "y": 3.4},
{"matrix": [3, 6], "x": 7.2, "y": 3.15},

{"matrix": [8, 6], "x": 8.6, "y": 3.15},
{"matrix": [8, 5], "x": 10.75, "y": 3.4},
{"matrix": [8, 4], "x": 11.75, "y": 3.2},
{"matrix": [8, 3], "x": 12.75, "y": 3},
{"matrix": [8, 2], "x": 13.75, "y": 3.2},
{"matrix": [8, 1], "x": 14.75, "y": 3.6},

{"matrix": [4, 2], "x": 3, "y": 4.45},
{"matrix": [4, 3], "x": 4, "y": 4.45},
{"matrix": [4, 4], "x": -0.15, "y": 4.65},
{"h": 1.25, "matrix": [4, 5], "x": 0.85, "y": 4.4},
{"h": 1.25, "matrix": [4, 6], "x": 1.85, "y": 4.4},
{"h": 1.25, "matrix": [9, 6], "x": -3.1, "y": 4.6},
{"h": 1.25, "matrix": [9, 5], "x": -2.1, "y": 4.6},
{"matrix": [9, 4], "x": -1.1, "y": 4.85},
{"matrix": [4, 4], "x": 5, "y": 4.45},
{"matrix": [4, 5], "x": 6, "y": 4.3, "h": 1.25},
{"matrix": [4, 6], "x": 7, "y": 4.4, "h": 1.25},

{"matrix": [9, 6], "x": 8.75, "y": 4.4, "h": 1.25},
{"matrix": [9, 5], "x": 9.75, "y": 4.3, "h": 1.25},
{"matrix": [9, 4], "x": 10.75, "y": 4.45},
{"matrix": [9, 3], "x": 11.75, "y": 4.45},
{"matrix": [9, 2], "x": 12.75, "y": 4.45}
]
Expand Down
Loading

0 comments on commit 46acadf

Please sign in to comment.