[Keymap] Boy_314's Halfnhalf layout update (#5441)

* added Boy_.314's layout for halfnhalf keyboard

* reset rules.mk to default

* update keymap with qwerty layout, and enable tap dancing

* fixed formatting in layout visualization

* added rules.mk to custom layout

* added mod tap for ctrl/capslock

* fixed typo in config.h, remove excess in rules.mk, revert half_n_half rules.mk

* added Boy_.314's layout for halfnhalf keyboard

* reset rules.mk to default

* update keymap with qwerty layout, and enable tap dancing

* fixed typo in config.h, remove excess in rules.mk, revert half_n_half rules.mk

* added macros to raise layer

* fixed mismatched layout/comments

* fixed layout switching

2 files changed, 83 insertions, 51 deletions

diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
index ae39290bcf..f73fd055cc 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
@@ -19,4 +19,4 @@
 // place overrides here
 #define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
-#define TAPPING_TERM 200
\ No newline at end of file
+#define TAPPING_TERM 200
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index fa12e7ee0c..2eef3dc48b 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -21,10 +21,17 @@ enum {
 };
 
 enum layers {
-	DVORAK,
-	QWERTY,
-	LOWER,
-	RAISE
+	_DVORAK,
+	_QWERTY,
+	_LOWER,
+	_RAISE,
+};
+
+enum halfnhalf_keycodes {
+	NEWTAB = SAFE_RANGE,
+	ALTF4,
+	CLSTAB,
+	PRVWIN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -36,78 +43,78 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
 	 * |LShift|;     |Q     |J     |K     |X     |LAlt  |-     |B     |M     |W     |V     |Z     |RShift|
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |TD Swap Layer|             |Space        |      
-	 *                             `-------------'             `-------------'
+	 *                             |TD Swap Layer|             |Space        |
+	 *                             `-------------'			       `-------------'
 	 */
-	[DVORAK] = LAYOUT(/* Base Dvorak */
-	  KC_TAB,           KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BRIU, KC_EQL,     KC_F, KC_G, KC_C,    KC_R,   KC_L,   KC_BSPC, 
-	  LCTL_T(KC_CAPS),  KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_BRID, LCTL(KC_F), KC_D, KC_H, KC_T,    KC_N,   KC_S,   KC_ENT, 
-	  KC_LSPO,          KC_SCLN, KC_Q,    KC_J,   KC_K, KC_X, KC_LALT, KC_MINS,    KC_B, KC_M, KC_W,    KC_V,   KC_Z,   KC_RSPC, 
-	                                      TD(TD_SWAP_LAYERS),                      KC_SPC
+	[_DVORAK] = LAYOUT(/* Base Dvorak */
+	  KC_TAB,           KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BRIU, KC_EQL,     KC_F, KC_G, KC_C,    KC_R,   KC_L,   KC_BSPC,
+	  LCTL_T(KC_CAPS),  KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_BRID, LCTL(KC_F), KC_D, KC_H, KC_T,    KC_N,   KC_S,   KC_ENT,
+	  KC_LSPO,          KC_SCLN, KC_Q,    KC_J,   KC_K, KC_X, KC_LALT, KC_MINS,    KC_B, KC_M, KC_W,    KC_V,   KC_Z,   KC_RSPC,
+	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
 	),
-	
+
 	/* QWERTY
 	 * ,-------------------------------------------------------------------------------------------------.
 	 * |Tab   |Q     |W     |E     |R     |T     |Brght+|'     |Y     |U     |I     |O     |P     |Bksp  |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |LCtrl |A     |S     |D     |F     |G     |Brght-|Ctrl+F|H     |J     |K     |L     |;     |Enter |
+	 * |CtlCps|A     |S     |D     |F     |G     |Brght-|Ctrl+F|H     |J     |K     |L     |;     |Enter |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
 	 * |LShift|Z     |X     |C     |V     |B     |LAlt  |-     |N     |M     |,     |.     |/     |RShift|
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |TD Swap Layer|             |Space        |      
-	 *                             `-------------'             `-------------'
+	 *                             |TD Swap Layer|             |Space        |
+	 *                             `-------------'			       `-------------'
 	 */
-	[QWERTY] = LAYOUT(/* Base Qwerty */
-	  KC_TAB,   KC_Q,    KC_W,    KC_E,   KC_R, KC_T, KC_BRIU, KC_QUOT,    KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSPC, 
-	  KC_LCTL,  KC_A,    KC_S,    KC_D,   KC_F, KC_G, KC_BRID, LCTL(KC_F), KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_ENT, 
-	  KC_LSPO,  KC_Z,    KC_X,    KC_C,   KC_V, KC_B, KC_LALT, KC_MINS,    KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
-	                                      TD(TD_SWAP_LAYERS),                    KC_SPC
+	[_QWERTY] = LAYOUT(/* Base Qwerty */
+	  KC_TAB,           KC_Q,    KC_W,    KC_E,   KC_R, KC_T, KC_BRIU, KC_QUOT,    KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSPC,
+	  LCTL_T(KC_CAPS),  KC_A,    KC_S,    KC_D,   KC_F, KC_G, KC_BRID, LCTL(KC_F), KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_ENT,
+	  KC_LSPO,          KC_Z,    KC_X,    KC_C,   KC_V, KC_B, KC_LALT, KC_MINS,    KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
 	),
-	
+
 	/* LOWER
 	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Esc   |1     |2     |3     |4     |5     |      |=     |6     |7     |8     |9     |0     |/     |
+	 * |Esc   |1     |2     |3     |4     |5     |      |      |6     |7     |8     |9     |0     |/     |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
 	 * |Caps  |F1    |F2    |F3    |F4    |F5    |F6    |Vol Up|Play  |_     |+     |{     |}     ||     |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
 	 * |      |F7    |F8    |F9    |F10   |F11   |F12   |Vol Dn|Next  |Home  |PgDn  |PgUp  |End   |      |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |             |             |             |      
+	 *                             |             |             |             |
 	 *                             `-------------'             `-------------'
 	 */
-	[LOWER] = LAYOUT(/* Numbers, Function Row, Media Control, Shifted Symbols, Dvorak Slash Key */
-	  KC_GESC, KC_1,  KC_2,  KC_3,  KC_4,   KC_5,   KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH, 
-	  KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,   KC_VOLU, KC_MPLY, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 
+	[_LOWER] = LAYOUT(/* Numbers, Function Row, Media Control, Shifted Symbols, Dvorak Slash Key */
+	  KC_GESC, KC_1,  KC_2,  KC_3,  KC_4,   KC_5,   KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+	  KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,   KC_VOLU, KC_MPLY, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
 	  KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,  KC_VOLD, KC_MNXT, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
-									KC_TRNS,    					           KC_TRNS
+									                KC_TRNS,    					            KC_TRNS
 	),
-	
+
 	/* RAISE
 	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Reset |      |      |Up    |      |      |      |      |      |      |      |      |      |Del   |
+	 * |Reset |      |      |Up    |      |      |      |PRVWIN|CLSTAB|      |      |      |      |Del   |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |`     |      |Left  |Down  |Right |      |      |      |      |-     |=     |[     |]     |\     |
+	 * |`     |      |Left  |Down  |Right |      |      |NEWTAB|ALTF4 |-     |=     |[     |]     |\     |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
 	 * |      |!     |@     |#     |$     |%     |      |      |^     |&     |*     |(     |)     |      |
 	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |             |             |             |      
+	 *                             |             |             |             |
 	 *                             `-------------'             `-------------'
 	 */
-	[RAISE] = LAYOUT(/* Arrows, Shifted Numbers, Symbols, Delete, Reset Key */
-	  RESET,   KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-	  KC_GRV,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, 
-	  KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, 
-										  KC_TRNS, 									   KC_TRNS
+	[_RAISE] = LAYOUT(/* Arrows, Shifted Numbers, Symbols, Delete, Macros */
+	  RESET,   KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, PRVWIN,  CLSTAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+	  KC_GRV,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, NEWTAB,  ALTF4,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+	  KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+										                    KC_TRNS,                            KC_TRNS
 	)
 };
 
 void tap_dance_choose_layer (qk_tap_dance_state_t *state, void *user_data) {
 	switch (state->count) {
 		case 1:
-			layer_on(LOWER);
+			layer_on(_LOWER);
 			break;
 		case 2:
-			layer_on(RAISE);
+			layer_on(_RAISE);
 			break;
 	}
 }
@@ -115,27 +122,52 @@ void tap_dance_choose_layer (qk_tap_dance_state_t *state, void *user_data) {
 void tap_dance_choose_layer_reset (qk_tap_dance_state_t *state, void *user_data) {
 	switch (state->count) {
 		case 1:
-			layer_off(LOWER);
+			layer_off(_LOWER);
 			break;
 		case 2:
-			layer_off(RAISE);
+			layer_off(_RAISE);
 			break;
 		case 3:
-			if (default_layer_state == DVORAK) {
-				default_layer_set(QWERTY);
-				layer_on(QWERTY);
-				layer_off(DVORAK);
+			if (biton32(default_layer_state) == _DVORAK) {
+				set_single_persistent_default_layer(_QWERTY);
 			}
-			else if (default_layer_state == QWERTY) {
-				default_layer_set(DVORAK);
-				layer_on(DVORAK);
-				layer_off(QWERTY);
+			else if (biton32(default_layer_state) == _QWERTY) {
+				set_single_persistent_default_layer(_DVORAK);
 			}
 			break;
 	}
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-	// ACTION_TAP_DANCE_FN_ADVANCED(on_each_tap_fn, on_dance_finished_fn, on_dance_reset_fn)
 	[TD_SWAP_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_choose_layer, tap_dance_choose_layer_reset)
-};
\ No newline at end of file
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		// Control + T
+		case NEWTAB:
+			if (record->event.pressed) {
+				SEND_STRING(SS_LCTRL("t"));
+			}
+			break;
+		// Alt + F4
+		case ALTF4:
+			if (record->event.pressed) {
+				SEND_STRING(SS_DOWN(X_LALT)SS_TAP(X_F4)SS_UP(X_LALT));
+			}
+			break;
+		// Control + W
+		case CLSTAB:
+			if (record->event.pressed) {
+				SEND_STRING(SS_LCTRL("w"));
+			}
+			break;
+		// Control + Shift + N
+		case PRVWIN:
+			if (record->event.pressed) {
+				SEND_STRING(SS_LCTRL(SS_LSFT("n")));
+			}
+			break;
+	}
+	return true;
+}