From d8183c52492557fdc8f35cec67c70170bae55efa Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Thu, 27 Oct 2022 23:50:32 +1100
Subject: [Keymap] Update Miryoku (#18773)

* [miryoku] Revert "[Keymap] manna-harbour_miryoku RESET to QK_BOOT (#18755)"

This reverts commit 89dbc181617e69a5b4d91d9d772724daa2d387bb.

* [miryoku] Add keyboardio/model01

* [miryoku] Add handwired/dactyl_manuform/4x6

* [miryoku] Update BT keycodes

- Update BT keycodes on Media inner index:
  - Move OUT_AUTO to bottom row
- Move RGB_TOG in vi to pinkie column to match other TOG keycodes, and rotate row

* [miryoku] Add Extra and Tap layers

* [miryoku] Rename config workflow option to custom_config

* [miryoku] Update custom_config.h and custom_rules.mk behaviour

* [miryoku] Make mapping macro customisable globally and per layer

* [miryoku] Add layer lock

* [miryoku] Update RGB order in media-l-invertedt

* [miryoku] Change mouse button order

* [miryoku] Change to X macros for layer list

- Supports adding and removing layers from custom_config.h
- Add "U_" prefix to layer names
- Add layer name strings
- Populate keymaps array from X macro
- Populate layers enum from X macro
- Move layers enum to manna-harbour_miryoku.h
- Rename miryoku_alternatives.h to miryoku_layer_alternatives.h
- Rename miryoku_layer.h to miryoku_layer_selection.h
- Remove miryoku_layer_names.h
- Add miryoku_layer_list.h

* [miryoku] Reformat split_3x6_3 mapping

* [miryoku] Add merge field to workflows

* [miryoku] Update thumb combos with new layer names

* [miryoku] Update cover image

* [miryoku] Add satt/vision

* [miryoku] Update Branches and Building docs

* [miryoku] Update reset keycode

* [miryoku] Add xmk

* [miryoku] Add boardsource/lulu

* [miryoku] Fix keyboardio/model01
---
 users/manna-harbour_miryoku/post_rules.mk | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'users/manna-harbour_miryoku/post_rules.mk')

diff --git a/users/manna-harbour_miryoku/post_rules.mk b/users/manna-harbour_miryoku/post_rules.mk
index 8fece85e66..e4f1806bf5 100644
--- a/users/manna-harbour_miryoku/post_rules.mk
+++ b/users/manna-harbour_miryoku/post_rules.mk
@@ -1,34 +1,39 @@
-# Copyright 2019 Manna Harbour
+# Copyright 2022 Manna Harbour
 # https://github.com/manna-harbour/miryoku
 
-# alternative layouts:
+# alternative layout options
 
-# alphas
 ifneq ($(strip $(MIRYOKU_ALPHAS)),)
   OPT_DEFS += -DMIRYOKU_ALPHAS_$(MIRYOKU_ALPHAS)
 endif
 
-# nav
+ifneq ($(strip $(MIRYOKU_EXTRA)),)
+  OPT_DEFS += -DMIRYOKU_EXTRA_$(MIRYOKU_EXTRA)
+endif
+
+ifneq ($(strip $(MIRYOKU_TAP)),)
+  OPT_DEFS += -DMIRYOKU_TAP_$(MIRYOKU_TAP)
+endif
+
 ifneq ($(strip $(MIRYOKU_NAV)),)
   OPT_DEFS += -DMIRYOKU_NAV_$(MIRYOKU_NAV)
 endif
 
-# clipboard
 ifneq ($(strip $(MIRYOKU_CLIPBOARD)),)
   OPT_DEFS += -DMIRYOKU_CLIPBOARD_$(MIRYOKU_CLIPBOARD)
 endif
 
-# layers
 ifneq ($(strip $(MIRYOKU_LAYERS)),)
   OPT_DEFS += -DMIRYOKU_LAYERS_$(MIRYOKU_LAYERS)
 endif
 
 # subset mappings
+
 ifneq ($(strip $(MIRYOKU_MAPPING)),)
   OPT_DEFS += -DMIRYOKU_MAPPING_$(MIRYOKU_MAPPING)
 endif
 
-# kludges:
+# kludges
 
 # thumb combos
 ifeq ($(strip $(MIRYOKU_KLUDGE_THUMBCOMBOS)),yes)
-- 
cgit v1.2.3