3 files changed, 169 insertions, 9 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile
index f95b2350c..206b5f119 100644
--- a/keyboard/atomic/Makefile
+++ b/keyboard/atomic/Makefile
@@ -136,4 +136,11 @@ VPATH += $(TARGET_DIR)
 VPATH += $(TOP_DIR)
 VPATH += $(TMK_DIR)
+debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
+debug-on: all
+debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
+debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
+debug-off: all
 include $(TOP_DIR)/quantum/quantum.mk
diff --git a/keyboard/atomic/keymaps/pvc_atomic.c b/keyboard/atomic/keymaps/pvc_atomic.c
index b18e3a377..3ddd3e329 100644
--- a/keyboard/atomic/keymaps/pvc_atomic.c
+++ b/keyboard/atomic/keymaps/pvc_atomic.c
@@ -1,9 +1,12 @@
 #include "atomic.h"
+#include "action_layer.h"
 #define _QW 0
 #define _LW 1
 #define _RS 2
 #define _FN 3
+#define _F1 4
+#define _F2 5
 #define _______ KC_TRNS
 #define ___T___ KC_TRNS
@@ -29,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  { 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_DEL   },
  { 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,  XXXXXXX, KC_PGUP  },
  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX, KC_UP,   KC_PGDN  },
-  { KC_LCTL, KC_LGUI, MO(_FN), KC_LALT, MO(_RS), KC_SPC,  XXXXXXX, MO(_LW), KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
+  { KC_LCTL, KC_LGUI, M(_FN),  KC_LALT, M(_RS),  KC_SPC,  XXXXXXX, M(_LW),  KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
 },
 [_LW] = { /* LOWERED */
  { KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
@@ -52,18 +55,167 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
 },
+ [_F1] = { /* FUNCTION */
+  { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
+  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
+  { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
+  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
+ },
+ [_F2] = { /* FUNCTION */
+  { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
+  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
+  { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
+  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
+ },
 };
+#define IS_LAYER_ON(layer)  ((layer_state) & (1<<(layer)))
+#define IS_LAYER_OFF(layer) ((!layer_state) & (1<<(layer)))
+void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3)
+{
+        if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+        {
+                layer_on(layer3);
+        }
+        else
+        {
+            layer_off(layer3);
+        }
+}
+void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
+{
+        if (order)
+        {
+                if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+                {
+                        layer_on(layer3);
+                }
+                else
+                {
+                    layer_off(layer3);
+                    layer_off(layer4);
+                }
+        }
+        else
+        {
+                if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+                {
+                        layer_on(layer4);
+                }
+                else
+                {
+                        layer_off(layer3);
+                    layer_off(layer4);
+                }
+        }
+}
+/* ignore me
+void change_quad_layer(uint8_t focus_layer, bool desired_focus_layer_state, uint8_t pair_layer, uint8_t layer3, uint8_t layer4)
+{
+        
+        // If desired focus layer state == 1 and current focus layer state == 1 
+        if ((desired_focus_layer_state) && IS_LAYER_ON(layer1))
+        {
+                // Do Nothing
+        }
+        // If desired focus layer state == 0 and current focus layer state == 1 
+        else if ((desired_focus_layer_state) && IS_LAYER_ON(layer1))
+        {
+                // If 
+            layer_off(layer3);
+            layer_off(layer4);
+        }
+        }
+        else
+        {
+                if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+                {
+                        layer_on(layer4);
+                }
+                else
+                {
+                        layer_off(layer3);
+                    layer_off(layer4);
+                }
+        }
+}
+*/
 const uint16_t PROGMEM fn_actions[] = {
 };
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
-  // MACRODOWN only works in this function
+        
-    switch(id) {
+        // MACRODOWN only works in this function
-      case 0:
+        switch(id)
-        return MACRODOWN(TYPE(KC_T), END);
+        {
-      break;
+                case _FN:
-    } 
+                        if (record->event.pressed) {
-    return MACRO_NONE;
+                                print("FN_DN\n");
+                                print_val_bin32(layer_state);
+                                layer_on(_FN);
+                                print_val_bin32(layer_state);
+                        } else {
+                                print("FN_UP\n");
+                                print_val_bin32(layer_state);
+                                layer_off(_FN);
+                                print_val_bin32(layer_state);
+                        }
+                        break;
+                case _RS:
+                        if (record->event.pressed) {
+                                print("RS_DN\n");
+                                print_val_bin32(layer_state);
+                                layer_on(_RS);
+                                //tri_layer++;
+                                print_val_bin32(layer_state);
+                                //update_tri_layer(_RS, _LW, _FN);
+                                update_quad_layer(_RS, _LW, _F1, _F2, 0);
+                                print_val_bin32(layer_state);
+                        } else {
+                                print("RS_UP\n");
+                                print_val_bin32(layer_state);
+                                layer_off(_RS);
+                                //tri_layer--;
+                                print_val_bin32(layer_state);
+                                //update_tri_layer(_RS, _LW, _FN);
+                                update_quad_layer(_RS, _LW, _F1, _F2, 0);
+                                print_val_bin32(layer_state);
+                        }
+                        break;
+                case _LW:
+                        if (record->event.pressed) {
+                                print("LW_DN\n");
+                                print_val_bin32(layer_state);
+                                layer_on(_LW);
+                                //tri_layer++;
+                                print_val_bin32(layer_state);
+                                //update_tri_layer(_RS, _LW, _FN);
+                                update_quad_layer(_RS, _LW, _F1, _F2, 1);
+                                print_val_bin32(layer_state);
+                        } else {
+                                print("LW_UP\n");
+                                print_val_bin32(layer_state);
+                                layer_off(_LW);
+                                //tri_layer--;
+                                print_val_bin32(layer_state);
+                                //update_tri_layer(_RS, _LW, _FN);
+                                update_quad_layer(_RS, _LW, _F1, _F2, 1);
+                                print_val_bin32(layer_state);
+                        }
+                        break;
+                default:
+                        break;
+        }
+        return MACRO_NONE;
 };
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index 3a4b1e334..025cf5420 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -68,6 +68,7 @@ void layer_xor(uint32_t state);
 #define layer_and(state)
 #define layer_xor(state)
 #define layer_debug()
 #endif
 /* pressed actions cache */

diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile index f95b2350c..206b5f119 100644 --- a/keyboard/atomic/Makefile +++ b/keyboard/atomic/Makefile
@@ -136,4 +136,11 @@ VPATH += $(TARGET_DIR)
136	VPATH += $(TOP_DIR)	136	VPATH += $(TOP_DIR)
137	VPATH += $(TMK_DIR)	137	VPATH += $(TMK_DIR)
138		138
		139	debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
		140	debug-on: all
		141
		142	debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
		143	debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
		144	debug-off: all
		145
139	include $(TOP_DIR)/quantum/quantum.mk	146	include $(TOP_DIR)/quantum/quantum.mk


diff --git a/keyboard/atomic/keymaps/pvc_atomic.c b/keyboard/atomic/keymaps/pvc_atomic.c index b18e3a377..3ddd3e329 100644 --- a/keyboard/atomic/keymaps/pvc_atomic.c +++ b/keyboard/atomic/keymaps/pvc_atomic.c
@@ -1,9 +1,12 @@
1	#include "atomic.h"	1	#include "atomic.h"
		2	#include "action_layer.h"
2		3
3	#define _QW 0	4	#define _QW 0
4	#define _LW 1	5	#define _LW 1
5	#define _RS 2	6	#define _RS 2
6	#define _FN 3	7	#define _FN 3
		8	#define _F1 4
		9	#define _F2 5
7		10
8	#define _______ KC_TRNS	11	#define _______ KC_TRNS
9	#define ___T___ KC_TRNS	12	#define ___T___ KC_TRNS
@@ -29,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29	{ 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_DEL },	32	{ 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_DEL },
30	{ 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, XXXXXXX, KC_PGUP },	33	{ 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, XXXXXXX, KC_PGUP },
31	{ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN },	34	{ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN },
32	{ KC_LCTL, KC_LGUI, MO(_FN), KC_LALT, MO(_RS), KC_SPC, XXXXXXX, MO(_LW), KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },	35	{ KC_LCTL, KC_LGUI, M(_FN), KC_LALT, M(_RS), KC_SPC, XXXXXXX, M(_LW), KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
33	},	36	},
34	[_LW] = { /* LOWERED */	37	[_LW] = { /* LOWERED */
35	{ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },	38	{ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
@@ -52,18 +55,167 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },	55	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
53	{ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },	56	{ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
54	},	57	},
		58	[_F1] = { /* FUNCTION */
		59	{ KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
		60	{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR },
		61	{ KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U },
		62	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
		63	{ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
		64	},
		65	[_F2] = { /* FUNCTION */
		66	{ KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
		67	{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR },
		68	{ KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U },
		69	{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
		70	{ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
		71	},
55	};	72	};
56		73
		74	#define IS_LAYER_ON(layer) ((layer_state) & (1<<(layer)))
		75	#define IS_LAYER_OFF(layer) ((!layer_state) & (1<<(layer)))
		76
		77	void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3)
		78	{
		79	if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
		80	{
		81	layer_on(layer3);
		82	}
		83	else
		84	{
		85	layer_off(layer3);
		86	}
		87	}
		88
		89	void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
		90	{
		91	if (order)
		92	{
		93	if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
		94	{
		95	layer_on(layer3);
		96	}
		97	else
		98	{
		99	layer_off(layer3);
		100	layer_off(layer4);
		101	}
		102	}
		103	else
		104	{
		105	if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
		106	{
		107	layer_on(layer4);
		108	}
		109	else
		110	{
		111	layer_off(layer3);
		112	layer_off(layer4);
		113	}
		114	}
		115	}
		116
		117	/* ignore me
		118	void change_quad_layer(uint8_t focus_layer, bool desired_focus_layer_state, uint8_t pair_layer, uint8_t layer3, uint8_t layer4)
		119	{
		120
		121	// If desired focus layer state == 1 and current focus layer state == 1
		122	if ((desired_focus_layer_state) && IS_LAYER_ON(layer1))
		123	{
		124	// Do Nothing
		125	}
		126	// If desired focus layer state == 0 and current focus layer state == 1
		127	else if ((desired_focus_layer_state) && IS_LAYER_ON(layer1))
		128	{
		129	// If
		130	layer_off(layer3);
		131	layer_off(layer4);
		132	}
		133	}
		134	else
		135	{
		136	if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
		137	{
		138	layer_on(layer4);
		139	}
		140	else
		141	{
		142	layer_off(layer3);
		143	layer_off(layer4);
		144	}
		145	}
		146	}
		147	*/
		148
57	const uint16_t PROGMEM fn_actions[] = {	149	const uint16_t PROGMEM fn_actions[] = {
58	};	150	};
59		151
60	const macro_t action_get_macro(keyrecord_t record, uint8_t id, uint8_t opt)	152
		153	const macro_t action_get_macro(keyrecord_t record, uint8_t id, uint8_t opt)
61	{	154	{
62	// MACRODOWN only works in this function	155
63	switch(id) {	156	// MACRODOWN only works in this function
64	case 0:	157	switch(id)
65	return MACRODOWN(TYPE(KC_T), END);	158	{
66	break;	159	case _FN:
67	}	160	if (record->event.pressed) {
68	return MACRO_NONE;	161	print("FN_DN\n");
		162	print_val_bin32(layer_state);
		163	layer_on(_FN);
		164	print_val_bin32(layer_state);
		165	} else {
		166	print("FN_UP\n");
		167	print_val_bin32(layer_state);
		168	layer_off(_FN);
		169	print_val_bin32(layer_state);
		170	}
		171	break;
		172
		173	case _RS:
		174	if (record->event.pressed) {
		175	print("RS_DN\n");
		176	print_val_bin32(layer_state);
		177	layer_on(_RS);
		178	//tri_layer++;
		179	print_val_bin32(layer_state);
		180	//update_tri_layer(_RS, _LW, _FN);
		181	update_quad_layer(_RS, _LW, _F1, _F2, 0);
		182	print_val_bin32(layer_state);
		183	} else {
		184	print("RS_UP\n");
		185	print_val_bin32(layer_state);
		186	layer_off(_RS);
		187	//tri_layer--;
		188	print_val_bin32(layer_state);
		189	//update_tri_layer(_RS, _LW, _FN);
		190	update_quad_layer(_RS, _LW, _F1, _F2, 0);
		191	print_val_bin32(layer_state);
		192	}
		193	break;
		194
		195	case _LW:
		196	if (record->event.pressed) {
		197	print("LW_DN\n");
		198	print_val_bin32(layer_state);
		199	layer_on(_LW);
		200	//tri_layer++;
		201	print_val_bin32(layer_state);
		202	//update_tri_layer(_RS, _LW, _FN);
		203	update_quad_layer(_RS, _LW, _F1, _F2, 1);
		204	print_val_bin32(layer_state);
		205	} else {
		206	print("LW_UP\n");
		207	print_val_bin32(layer_state);
		208	layer_off(_LW);
		209	//tri_layer--;
		210	print_val_bin32(layer_state);
		211	//update_tri_layer(_RS, _LW, _FN);
		212	update_quad_layer(_RS, _LW, _F1, _F2, 1);
		213	print_val_bin32(layer_state);
		214	}
		215	break;
		216
		217	default:
		218	break;
		219	}
		220	return MACRO_NONE;
69	};	221	};


diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h index 3a4b1e334..025cf5420 100644 --- a/tmk_core/common/action_layer.h +++ b/tmk_core/common/action_layer.h
@@ -68,6 +68,7 @@ void layer_xor(uint32_t state);
68	#define layer_and(state)	68	#define layer_and(state)
69	#define layer_xor(state)	69	#define layer_xor(state)
70	#define layer_debug()	70	#define layer_debug()
		71
71	#endif	72	#endif
72		73
73	/* pressed actions cache */	74	/* pressed actions cache */