~ruther/qmk_firmware

f051496f1343259f4da8c5d917b9c9e47b97e38c — IBNobody 9 years ago cf17687
Checkin
3 files changed, 169 insertions(+), 9 deletions(-)

M keyboard/atomic/Makefile
M keyboard/atomic/keymaps/pvc_atomic.c
M tmk_core/common/action_layer.h
M keyboard/atomic/Makefile => keyboard/atomic/Makefile +7 -0
@@ 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

M keyboard/atomic/keymaps/pvc_atomic.c => keyboard/atomic/keymaps/pvc_atomic.c +161 -9
@@ 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) {
      case 0:
        return MACRODOWN(TYPE(KC_T), END);
      break;
    } 
    return MACRO_NONE;
	
	// MACRODOWN only works in this function
	switch(id)
	{
		case _FN:
			if (record->event.pressed) {
				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;
};

M tmk_core/common/action_layer.h => tmk_core/common/action_layer.h +1 -0
@@ 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 */