Squashed commit of the following:

commit 5a4fab0
Merge: c601b1f cc4ac72
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 04:36:15 2023 +0000

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

commit cc4ac72
Author: James Young <[email protected]>
Date:   Wed Jun 21 21:35:35 2023 -0700

    Igloo Configurator Touch-Up (qmk#21303)

    * [refactor] friendly-format info.json

    * [enhancement] add matrix diagram

    * [enhancement] remove key overlaps in layout data

commit c601b1f
Merge: adc954f 33f76d7
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 02:12:05 2023 +0000

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

commit 33f76d7
Author: James Young <[email protected]>
Date:   Wed Jun 21 19:11:32 2023 -0700

    Quarkeys Z40 Community Layout Support and Touch-Up (qmk#21329)

    * [refactor] rename LAYOUT to LAYOUT_planck_mit

    * [style] friendly-format info.json

    * [style] refactor keymaps

    - grid-align keycodes
    - use four-space indent
    - remove trailing whitespace

    * [chore] tidy-up keyboard data in info.json

    - spell-check `manufacturer` value
    - use valid `url`
    - reference GitHub username for `maintainer`

    * [chore] tidy-up readme

    - link to maintainer's GitHub account
    - add Hardware Availability link
    - break-out Hardware Specs into its own section

    * [enhancement] enable Community Layout support

    * [chore] replace product image in readme

    Source repository for previous URL seems to have been deleted.

commit adc954f
Merge: 87b371c b8a12db
Author: QMK Bot <[email protected]>
Date:   Thu Jun 22 00:43:08 2023 +0000

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

commit b8a12db
Author: James Young <[email protected]>
Date:   Wed Jun 21 17:42:30 2023 -0700

    Pteropus: correct layout data (qmk#21326)

    * [style] friendly-format info.json

    * [chore] correct layout data

    Fix keys overlapping when rendered in QMK Configurator or CLI.

commit 87b371c
Author: James Young <[email protected]>
Date:   Wed Jun 21 14:20:02 2023 -0700

    ProtoTypist PT-80 Refactor (qmk#21325)

    * [style] friendly-format info.json

    * [docs] add layout/matrix diagram

    * [style] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] LAYOUT_all macro

    Move the JSON object for the Enter key to the end of the home row.

    * [style] refactor default keymap

    - update keycode grid alignment
    - remove trailing whitespace

    * [refactor] LAYOUT_tkl_iso macro

    Move the JSON object for the Enter key to the end of the home row.

    This commit fixes a key sequence error with the `tkl_iso` Community
    Layout support.

    * [style] refactor default_ansi keymap

    - update keycode grid alignment
    - remove trailing whitespace

    * [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

    Fix incorrect matrix position assignments on the function row keys for
    the `LAYOUT_tkl_iso` macro.

    * [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

    Fix incorrect matrix position assignments on the function row keys for
    the `LAYOUT_tkl_ansi` macro.

commit 810cd9b
Merge: e3faa76 6f39205
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 19:30:39 2023 +0000

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

commit 6f39205
Author: James Young <[email protected]>
Date:   Wed Jun 21 12:30:04 2023 -0700

    Laneware LW75: correct layout data (qmk#21314)

    [refactor]

    Fixes misleading Configurator implementations of the available layouts.

commit e3faa76
Merge: fa1b533 20c0043
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 18:42:56 2023 +0000

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

commit 20c0043
Author: lindgrenj6 <[email protected]>
Date:   Wed Jun 21 13:42:23 2023 -0500

    [Keymap] Add lindgrenj6 planck layout (qmk#21155)

commit fa1b533
Merge: b6c76cd 4cc427c
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 18:30:50 2023 +0000

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

commit 4cc427c
Author: James Young <[email protected]>
Date:   Wed Jun 21 11:30:15 2023 -0700

    Lucid Velvet Solder Layout Additions and Touch-Up (qmk#21313)

    * [refactor] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] refactor default keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [bugfix] fix key sequence error in default keymap

    * [enhancement] fix key overlaps in Configurator

    * [enhancement] add matrix diagram

    * [refactor] rename LAYOUT to LAYOUT_all

    * [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi

    * [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_iso

commit b6c76cd
Merge: 673b536 b814ff5
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 17:39:03 2023 +0000

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

commit b814ff5
Author: James Young <[email protected]>
Date:   Wed Jun 21 10:38:18 2023 -0700

    Lucid Velvet Hotswap Layout Additions and Touch-Up (qmk#21312)

    * [refactor] refactor via keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [refactor] refactor default keymap

    - grid-align keycodes
    - remove trailing whitespace

    * [bugfix] fix key sequence error in default keymap

    * [enhancement] fix key overlap in Configurator

    * [enhancement] add matrix diagram

    * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi

    * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

    * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

    * [enhancenment] enable Community Layout support

commit 673b536
Merge: 3274e0a 71b77df
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 16:00:31 2023 +0000

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

commit 71b77df
Author: James Young <[email protected]>
Date:   Wed Jun 21 08:59:54 2023 -0700

    Keebio Cepstrum Configurator Touch-Up (qmk#21310)

    * [enhancement] remove redundant layout data

    Remove the redundant layout data from the keyboard-level `info.json`.

    * [enhancement] correct JSON syntax in rev1/info.json

    * [enhancement] friendly-format rev1/info.json

    * [enhancement] correct layout data

commit 3274e0a
Merge: 08ba8a0 ecca9c5
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 03:05:47 2023 +0000

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

commit ecca9c5
Author: lalalademaxiya1 <[email protected]>
Date:   Wed Jun 21 11:05:07 2023 +0800

    Add Keychron C2 Pro (qmk#20701)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 08ba8a0
Merge: 6373543 595d393
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 03:02:34 2023 +0000

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

commit 595d393
Author: jonylee@hfd <[email protected]>
Date:   Wed Jun 21 11:01:43 2023 +0800

    [Keyboard] Add Monsgeek M5 (qmk#21182)

    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 6373543
Merge: dad41bd 2f1cac6
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 02:58:50 2023 +0000

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

commit dad41bd
Author: James Young <[email protected]>
Date:   Tue Jun 20 19:58:44 2023 -0700

    ProtoTypist PT-60 Refactor (qmk#21322)

commit 2f1cac6
Author: Albert Y <[email protected]>
Date:   Wed Jun 21 10:58:13 2023 +0800

    [Docs] Code markdown amendment (qmk#21323)

commit c69f82f
Merge: 6ec91a7 7753249
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 02:30:16 2023 +0000

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

commit 7753249
Author: James Young <[email protected]>
Date:   Tue Jun 20 19:29:44 2023 -0700

    NovelKeys NK+: correct layout data (qmk#21317)

    * NovelKeys NK+: correct layout data

    Add key sizes to the layout data.

    * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan

commit 6ec91a7
Merge: ffdc70b 42cd55e
Author: QMK Bot <[email protected]>
Date:   Wed Jun 21 00:33:07 2023 +0000

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

commit 42cd55e
Author: Jack Humbert <[email protected]>
Date:   Tue Jun 20 20:32:32 2023 -0400

    Planck Matrix Fixes (qmk#21196)

    * fix non-default keymap compiling, initial matrix state, watchdog options

    * fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

    * chore: update function name on all cases.

    * remove old midi tone option

    Co-authored-by: Ryan <[email protected]>

    * fixes abhixec's planck keymap

    * add audio enable condition to abhixec's planck keymap

    * add audio enable condition to all muse includes

    * Revert "add audio enable condition to all muse includes"

    This reverts commit 9779e90.

    * Revert "add audio enable condition to abhixec's planck keymap"

    This reverts commit 24c742a.

    * Revert "fixes abhixec's planck keymap"

    This reverts commit 4bb085d.

    ---------

    Co-authored-by: Peter.Falken <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit ffdc70b
Author: Nick Brassel <[email protected]>
Date:   Wed Jun 21 08:41:49 2023 +1000

    Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (qmk#21272)

commit 45dc1cc
Author: James Young <[email protected]>
Date:   Tue Jun 20 15:40:31 2023 -0700

    EC Pro X JIS Layout Touch-Up (qmk#21260)

    * [refactor] update `info.json` for readability

    - sort the JSON objects representing the keyboard's keys in the order:
      - label, matrix, x, y, w, h
    - convert numeric JSON values to integers where appropriate

    * [refactor] remove key labels from `info.json`

    * [refactor] keymap refactor

    - grid-align keycodes

    * [bugfix] move Enter key to home row

    Moves the JSON object representing the Enter key to the home row.

    Fixes an issue that resulted in correct key assignment only if the
    keymap being compiled/flashed was based upon the `via` keymap.

commit ac14fce
Author: James Young <[email protected]>
Date:   Tue Jun 20 10:18:16 2023 -0700

    Kalakos Bahrnob65 Configurator Layout Touch-Up (qmk#21309)

    * [enhancement] add matrix diagram

    * [refactor] friendly-format info.json

    * [enhancement] remove key overlaps

commit a9f49a0
Merge: 01cfc72 85b8044
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 17:17:10 2023 +0000

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

commit 85b8044
Author: James Young <[email protected]>
Date:   Tue Jun 20 10:16:35 2023 -0700

    KJ-Modify RS40 Configurator Touch-Up (qmk#21311)

    * [refactor] friendly-format info.json

    * [enhancement] remove key overlap

    Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

    * [enhancement] replace store links with product links

    Replace URLs that point to the vendor's shop with URLs to the vendor's
    product listing.

commit 01cfc72
Merge: 965cfec 45c52c7
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:42:27 2023 +0000

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

commit 45c52c7
Author: lalalademaxiya1 <[email protected]>
Date:   Tue Jun 20 23:41:45 2023 +0800

    [Keyboard] Add Keychron C1 Pro (qmk#20700)

    Co-authored-by: adophoxia <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 965cfec
Merge: a2e2d92 958cae3
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:39:02 2023 +0000

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

commit 958cae3
Author: Roberts Kursitis <[email protected]>
Date:   Tue Jun 20 18:38:26 2023 +0300

    [Keyboard] Add Alisaie (qmk#21266)

commit a2e2d92
Merge: d98b60c 0abe312
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 15:36:05 2023 +0000

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

commit 0abe312
Author: Derek <[email protected]>
Date:   Tue Jun 20 11:35:23 2023 -0400

    [Keyboard] Add bigsmoothknob (qmk#21265)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: jack <[email protected]>

commit d98b60c
Author: jonylee@hfd <[email protected]>
Date:   Tue Jun 20 10:31:46 2023 +0800

    Move kb83 keyboard (qmk#20761)

    * move hfdkb/keyboard_sw/k83 --> inland/kb83

    * move hfdkb/keyboard_sw/k83 --> inland/kb83

    * Update data/mappings/keyboard_aliases.hjson

    * Update keyboard_aliases.hjson

    * fixed  the Configurator layout data

    * fixed the Configurator layout data

    * Revert "Update keyboard_aliases.hjson"

    This reverts commit c085c54.

    * Revert "fixed  the Configurator layout data"

    * Update keyboard_aliases.hjson

    * Update info.json

commit 808228c
Merge: be6f92c 7bd1d18
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 01:56:07 2023 +0000

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

commit 7bd1d18
Author: Drashna Jaelre <[email protected]>
Date:   Mon Jun 19 18:55:27 2023 -0700

    [Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (qmk#21290)

    Co-authored-by: Ryan <[email protected]>

commit be6f92c
Merge: b749a5f 31e39a9
Author: QMK Bot <[email protected]>
Date:   Tue Jun 20 01:46:21 2023 +0000

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

commit 31e39a9
Author: James Young <[email protected]>
Date:   Mon Jun 19 18:45:47 2023 -0700

    dnworks SBL Community Layout Support and Touch-Up (qmk#21267)

commit b749a5f
Author: jack <[email protected]>
Date:   Mon Jun 19 13:59:35 2023 -0600

    Fixup `nightly_boards/n40_o` (qmk#21307)

commit c4a67d3
Author: jack <[email protected]>
Date:   Mon Jun 19 09:46:27 2023 -0600

    Remove encoder in-matrix workaround code (qmk#20389)

commit 74fbd5a
Author: jack <[email protected]>
Date:   Mon Jun 19 06:10:25 2023 -0600

    Fixup `dekunukem/duckypad` (qmk#21298)

builddefs/build_keyboard.mk

@@ -27,7 +27,6 @@ QMK_BIN ?= qmk
 # Set the filename for the final firmware binary
 KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
-KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
 
 ifeq ($(strip $(DUMP_CI_METADATA)),yes)
  $(info CI Metadata: KEYBOARD=$(KEYBOARD))
@@ -44,7 +43,7 @@ endif
 # Object files and generated keymap directory
 # To put object files in current directory, use a dot (.), do NOT make
 # this an empty or blank macro!
-KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
+INTERMEDIATE_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
 
 ifdef SKIP_VERSION
  OPT_DEFS += -DSKIP_VERSION
@@ -60,7 +59,7 @@ VERSION_H_FLAGS += --skip-git
 endif
 
 # Generate the board's version.h file.
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h)
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
 
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
@@ -121,7 +120,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 
 # Pull in rules from info.json
-INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
+INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
 # Check for keymap.json first, so we can regenerate keymap.c
@@ -161,28 +160,28 @@ endif
 
 # Have we found a keymap.json?
 ifneq ("$(wildcard $(KEYMAP_JSON))", "")
- KEYMAP_C := $(KEYMAP_OUTPUT)/src/keymap.c
- KEYMAP_H := $(KEYMAP_OUTPUT)/src/config.h
+ KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
+ KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 
  # Load the keymap-level rules.mk if exists
  -include $(KEYMAP_PATH)/rules.mk
 
  # Load any rules.mk content from keymap.json
- INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
+ INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
  include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
-$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
+$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
  $(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
  @$(BUILD_CMD)
 
-$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
+$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON)
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
  $(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
  @$(BUILD_CMD)
 
-generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
+generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/keymap.c
 
 endif
 
@@ -323,34 +322,34 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
  INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
 endif
 
-CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
-KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
+CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
+KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 
-$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
- $(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h)
+ $(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h)
  @$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
- $(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.c)
+ $(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c)
  @$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
- $(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
+ $(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h)
  @$(BUILD_CMD)
 
-generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
+generated-files: $(INTERMEDIATE_OUTPUT)/src/info_config.h $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h
 
-generated-files: $(KEYMAP_OUTPUT)/src/info_deps.d
+generated-files: $(INTERMEDIATE_OUTPUT)/src/info_deps.d
 
-$(KEYMAP_OUTPUT)/src/info_deps.d:
+$(INTERMEDIATE_OUTPUT)/src/info_deps.d:
  @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
- $(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(KEYMAP_OUTPUT)/src/info_deps.d)
+ $(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(INTERMEDIATE_OUTPUT)/src/info_deps.d)
  @$(BUILD_CMD)
 
--include $(KEYMAP_OUTPUT)/src/info_deps.d
+-include $(INTERMEDIATE_OUTPUT)/src/info_deps.d
 
 .INTERMEDIATE : generated-files
 
@@ -423,8 +422,7 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
-VPATH += $(KEYBOARD_OUTPUT)/src
-VPATH += $(KEYMAP_OUTPUT)/src
+VPATH += $(INTERMEDIATE_OUTPUT)/src
 
 include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
@@ -471,17 +469,14 @@ PROJECT_CONFIG := $(CONFIG_H)
 CONFIG_H += $(POST_CONFIG_H)
 ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
 
-OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
-$(KEYMAP_OUTPUT)_SRC := $(SRC)
-$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
--DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
--DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
-$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
-$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
-$(KEYBOARD_OUTPUT)_SRC := $(PLATFORM_SRC)
-$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)
-$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC)
-$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
+OUTPUTS := $(INTERMEDIATE_OUTPUT)
+$(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
+$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \
+ -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
+ -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
+ $(PROJECT_DEFS)
+$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC)
+$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG)
 
 # Default target.
 all: build check-size

builddefs/common_rules.mk

@@ -176,7 +176,7 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 
 # For a ChibiOS build, ensure that the board files have the hook overrides injected
 define BOARDSRC_INJECT_HOOKS
-$(KEYBOARD_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
 endef
 $(foreach LOBJ, $(BOARDSRC), $(eval $(call BOARDSRC_INJECT_HOOKS,$(LOBJ))))
 

data/mappings/keyboard_aliases.hjson

@@ -868,6 +868,9 @@
  "hecomi/alpha": {
  "target": "takashiski/hecomi/alpha"
  },
+ "hfdkb/keyboard_sw/k83":{
+ "target": "inland/kb83"
+ },
  "hid_liber": {
  "target": "bpiphany/hid_liber"
  },

docs/coding_conventions_c.md

@@ -8,8 +8,8 @@ Most of our style is pretty easy to pick up on, but right now it's not entirely
  * Closing Brace: Lined up with the first character of the statement that opens the block
  * Else If: Place the closing brace at the beginning of the line and the next opening brace at the end of the same line.
  * Optional Braces: Always include optional braces.
- * Good: if (condition) { return false; }
- * Bad: if (condition) return false;
+ * Good: `if (condition) { return false; }`
+ * Bad: `if (condition) return false;`
 * We encourage use of C style comments: `/* */`
  * Think of them as a story describing the feature
  * Use them liberally to explain why particular decisions were made.

docs/data_driven_config.md

@@ -79,8 +79,8 @@ If you are not sure how to edit this file or are not comfortable with Python [op
 
 The final piece of the puzzle is providing your new option to the build system. This is done by generating two files:
 
-* `.build/obj_<keyboard>/src/info_config.h`
-* `.build/obj_<keyboard>/src/rules.mk`
+* `.build/obj_<keyboard>_<keymap>/src/info_config.h`
+* `.build/obj_<keyboard>_<keymap>/src/rules.mk`
 
 These two files are generated by the code here:
 

docs/ja/data_driven_config.md

@@ -109,8 +109,8 @@ QMK が完全な `info.json` を生成するときはいつでも、`config.h` 
 パズルの最後のピースは、ビルドシステムに新しいオプションを提供することです。
 これは、2つのファイルを生成することによって行われます。
 
-* `.build/obj_<keyboard>/src/info_config.h`
-* `.build/obj_<keyboard>/src/rules.mk`
+* `.build/obj_<keyboard>_<keymap>/src/info_config.h`
+* `.build/obj_<keyboard>_<keymap>/src/rules.mk`
 
 この2つのファイルは、次のコードによって生成されます。
 

docs/quantum_keycodes.md

@@ -15,3 +15,5 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are
 |`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory) |
 |`QK_MAKE` | |Sends `qmk compile -kb (keyboard) -km (keymap)`, or `qmk flash` if shift is held. Puts keyboard into bootloader mode if shift & control are held |
 |`QK_REBOOT` |`QK_RBT` |Resets the keyboard. Does not load the bootloader |
+
+!> Note: `QK_MAKE` requires `#define ENABLE_COMPILE_KEYCODE` in your config.h to function.

keyboards/atlantis/ak81_ve/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define ENCODERS_CCW_KEY { { 4, 5 } } // Note: array is { col, row )
-#define ENCODERS_CW_KEY { { 3, 5 } } // Note: array is { col, row )
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/atlantis/ak81_ve/keymaps/via/keymap.c

@@ -16,54 +16,47 @@
 
 #include QMK_KEYBOARD_H
 
-#define LAYOUT_via( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \
- K500, K501, K502, K503, K504, K506, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, KC_NO, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \
- { K500, K501, K502, K503, K504, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \
-}
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
- [0] = LAYOUT_via(
- 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_DEL, 
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
- KC_LCTL, KC_LGUI, KC_LALT, KC_VOLU, KC_VOLD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-
- [1] = LAYOUT_via(
- KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RGB_TOG, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, 
- _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, 
- _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD, 
- _______, _______, _______, RGB_MOD, RGB_RMOD, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI),
-
- [2] = LAYOUT_via(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
- [3] = LAYOUT_via(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-
-};
+ [0] = 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_DEL,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT(
+ KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RGB_TOG,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI,
+ _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,
+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD,
+ _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI),
+
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______)
+
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+ [2] = { ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif

keyboards/atlantis/ak81_ve/keymaps/via/rules.mk

@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
-
-SRC += encoder_actions.c
+ENCODER_MAP_ENABLE = yes