diff options
| -rw-r--r-- | keyboard/atomic/config.h | 2 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/pvc_atomic.c (renamed from keyboard/atomic/keymaps/pc_atomic.c) | 6 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/pvc_planck.c (renamed from keyboard/planck/keymaps/pc.c) | 71 | 
3 files changed, 54 insertions, 25 deletions
| diff --git a/keyboard/atomic/config.h b/keyboard/atomic/config.h index f30a9e6cc4..1b34decf9c 100644 --- a/keyboard/atomic/config.h +++ b/keyboard/atomic/config.h @@ -130,7 +130,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define MAGIC_KEY_LAYER7         7  //#define MAGIC_KEY_LAYER8         8  //#define MAGIC_KEY_LAYER9         9 -//#define MAGIC_KEY_BOOTLOADER     PAUSE +#define MAGIC_KEY_BOOTLOADER       B  //#define MAGIC_KEY_LOCK           CAPS  //#define MAGIC_KEY_EEPROM         E  //#define MAGIC_KEY_NKRO           N diff --git a/keyboard/atomic/keymaps/pc_atomic.c b/keyboard/atomic/keymaps/pvc_atomic.c index bdf575046b..b18e3a377a 100644 --- a/keyboard/atomic/keymaps/pc_atomic.c +++ b/keyboard/atomic/keymaps/pvc_atomic.c @@ -55,12 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  };  const uint16_t PROGMEM fn_actions[] = { -    [1] = ACTION_LAYER_MOMENTARY(2),  // to RAISE -    [2] = ACTION_LAYER_MOMENTARY(3),  // to LOWER - -    [3] = ACTION_DEFAULT_LAYER_SET(0), -    [4] = ACTION_DEFAULT_LAYER_SET(1), -  };  const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)  diff --git a/keyboard/planck/keymaps/pc.c b/keyboard/planck/keymaps/pvc_planck.c index ed062609f4..20bb5d86d7 100644 --- a/keyboard/planck/keymaps/pc.c +++ b/keyboard/planck/keymaps/pvc_planck.c @@ -2,6 +2,8 @@  // this is the style you want to emulate.  #include "planck.h" +#include "print.h" +#include "action_layer.h"  #ifdef BACKLIGHT_ENABLE    #include "backlight.h"  #endif @@ -38,10 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * `-----------------------------------------------------------------------------------'   */  [_QW] = { -  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC}, +  {RESET,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},    {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},    {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT }, -  {KC_LCTL, KC_LGUI, KC_LALT, KC_DEL,  MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT} +  {KC_LCTL, KC_LGUI, KC_LALT, KC_DEL,  M(_LW),  KC_SPC,  KC_SPC,  M(_RS),  KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT}  },  /* Colemak @@ -95,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},    {_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},    {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX,   RESET, _______}, -  {_______, _______, _______, _______, MO(_FN), _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}  },  /* Lower @@ -113,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},    {_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},    {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX,    MG_B, _______}, -  {_______, _______, _______, _______, _______, _______, _______, MO(_FN), KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}  },  /* Function @@ -139,20 +141,53 @@ const uint16_t PROGMEM fn_actions[] = {  }; + +int tri_layer = 0; +void update_tri_layer(int layer) { +  if (tri_layer > 1) { +    layer_on(layer); +  } else { +    layer_off(layer); +  } +} + +  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: -          if (record->event.pressed) { -            register_code(KC_RSFT); -            #ifdef BACKLIGHT_ENABLE -              backlight_step(); -            #endif -          } else { -            unregister_code(KC_RSFT); -          } -        break; -      } -    return MACRO_NONE; +	// MACRODOWN only works in this function +	switch(id) +	{ +		case _RS: +			if (record->event.pressed) { +				print("RS_DN"); +				layer_on(_RS); +				tri_layer++; +				update_tri_layer(_FN); +			} else { +				print("RS_UP"); +				layer_off(_RS); +				tri_layer--; +				update_tri_layer(_FN); +				phex(layer_state); +			} +			break; + +		case _LW: +			if (record->event.pressed) { +				print("LW_DN"); +				layer_on(_LW); +				tri_layer++; +				update_tri_layer(_FN); +			} else { +				print("LW_UP"); +				layer_off(_LW); +				tri_layer--; +				update_tri_layer(_FN); +			} +			break; + +		default: +			break; +	} +	return MACRO_NONE;  }; | 
