Patched some keyboards that won't compile (#2453)
This commit is contained in:
		
							parent
							
								
									0e6e059ef3
								
							
						
					
					
						commit
						8d6eadf261
					
				
					 11 changed files with 26 additions and 24 deletions
				
			
		| 
						 | 
				
			
			@ -359,7 +359,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
        case MACRO_BREATH_DEFAULT:
 | 
			
		||||
            if (record->event.pressed)
 | 
			
		||||
            {
 | 
			
		||||
                breathing_defaults();
 | 
			
		||||
                breathing_period_default();
 | 
			
		||||
            }
 | 
			
		||||
            break;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
#include "clueboard.h"
 | 
			
		||||
#include "66.h"
 | 
			
		||||
 | 
			
		||||
// Each layer gets a name for readability, which is then used in the keymap matrix below.
 | 
			
		||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -64,7 +64,7 @@
 | 
			
		|||
    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
 | 
			
		||||
    { k30, KC_NO, k32, k33, k34, k35, k36, k37 }, \
 | 
			
		||||
    { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO }, \
 | 
			
		||||
    { k50, k51, k52, k53, k54, k55, KC_NO, k57 }, \
 | 
			
		||||
    { k50, k51, k52, k53, k54, KC_NO, KC_NO, k57 }, \
 | 
			
		||||
    { k60, k61, k62, k63, k64, k65, KC_NO, k67 }, \
 | 
			
		||||
    { k70, k71, k72, k73, KC_NO, k75, KC_NO, KC_NO }, \
 | 
			
		||||
    { k80, k81, k82, k83, KC_NO, k85, k86, KC_NO }, \
 | 
			
		||||
| 
						 | 
				
			
			@ -73,7 +73,7 @@
 | 
			
		|||
 | 
			
		||||
/* LAYOUT_66_iso, standard 67 key ISO layout 
 | 
			
		||||
 */
 | 
			
		||||
#define LAYOUT_ISO( \
 | 
			
		||||
#define LAYOUT_66_iso( \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54,    k56,   k57, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64,           k67, \
 | 
			
		||||
    k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73, k74, k75, \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,14 +1,16 @@
 | 
			
		|||
#include "xd60.h"
 | 
			
		||||
#include "dz60.h"
 | 
			
		||||
#include "action_layer.h"
 | 
			
		||||
 | 
			
		||||
#Define _L0 0
 | 
			
		||||
#Define _L1 1
 | 
			
		||||
#Define _L2 2
 | 
			
		||||
#Define _L3 3
 | 
			
		||||
#Define _L4 4
 | 
			
		||||
#define _L0 0
 | 
			
		||||
#define _L1 1
 | 
			
		||||
#define _L2 2
 | 
			
		||||
#define _L3 3
 | 
			
		||||
#define _L4 4
 | 
			
		||||
 | 
			
		||||
#define _______ KC_TRNS
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * template
 | 
			
		||||
 * [_L1] = KEYMAP( 
 | 
			
		||||
| 
						 | 
				
			
			@ -22,7 +24,7 @@
 | 
			
		|||
 *\
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
/* Keymap _L0: (Layer 0 - Base Layer) This is the default layer
 | 
			
		||||
 * Keymap _L0: (Layer 0 - Base Layer) This is the default layer
 | 
			
		||||
 * This layer has a key set to MO(_L1) which means when held down Layer 1 will become active, If Layer 1 does not have anything set for tat key is will revert to uing the key set at layer 0.
 | 
			
		||||
 * LT(_L1, KC_1) means that when the "1" key is long touched then it will activate the layer _L1 key(F1) but if the key is just tapped it will activate the "1" key.
 | 
			
		||||
 * KC_GESC = Escape when tapped, ` when pressed with Shift or GUI
 | 
			
		||||
| 
						 | 
				
			
			@ -45,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
[_L0] = KEYMAP(
 | 
			
		||||
      KC_GESC,              LT(_L1, KC_1),LT(_L1, KC_2),LT(_L1, KC_3),LT(_L1, KC_4),LT(_L1, KC_5),LT(_L1, KC_6),LT(_L1, KC_7),LT(_L1, KC_8),LT(_L1, KC_9),LT(_L1, KC_0),LT(_L1, KC_MINS),LT(_L1, KC_EQL),KC_BSPC,  KC_DEL,    \
 | 
			
		||||
      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_CAPS,             KC_A,    KC_S,    KC_D,     KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,    \
 | 
			
		||||
      KC_LSPO, KC_NO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPO, KC_UP,    M0(_L1), \
 | 
			
		||||
      KC_LCTL,             KC_LGUI, KC_LALT, TD(LT(_L3,KC_SPACE)),BL_TOGG,TD(TD_SPC_ENT),     KC_RGUI, M0(_L2), KC_LEFT,  KC_DOWN,  KC_RIGHT),
 | 
			
		||||
      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,    \
 | 
			
		||||
      KC_LSPO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    TO(_L1), \
 | 
			
		||||
      KC_LCTL,             KC_LGUI, KC_LALT, TD(LT(_L3,KC_SPACE)),BL_TOGG,TD(TD_SPC_ENT),     KC_RGUI, TO(_L2), KC_LEFT,  KC_DOWN,  KC_RIGHT),
 | 
			
		||||
 | 
			
		||||
/* Keymap _L1: (Layer 1) This is function layer 1
 | 
			
		||||
 * This layer is activated while the Fn key is being held down.
 | 
			
		||||
| 
						 | 
				
			
			@ -66,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
[_L1] = KEYMAP( 
 | 
			
		||||
      RESET,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,  KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,  KC_F13,   KC_F14,              \
 | 
			
		||||
      _______, KC_WH_U, KC_UP,   KC_WH_D,  _______, _______,_______,  _______,  _______,  _______,   KC_PSCR, _______,  _______,                      _______,   \
 | 
			
		||||
      _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_HOME, _______,  _______,  _______,   KC_HOME, _______,  _______,                      _______,   \
 | 
			
		||||
      _______,          _______, _______,  KC_APP,  BL_STEP,_______,  KC_END,   KC_VOLD,  KC_VOLU,   KC_MUTE, _______,  _______,  _______, KC_PGUP,   _______,   \
 | 
			
		||||
      _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_HOME, _______,  _______,  _______,   KC_HOME, _______,                        _______,   \
 | 
			
		||||
      _______,           _______,  KC_APP,  BL_STEP,_______,  KC_END,   KC_VOLD,  KC_VOLU,   KC_MUTE, _______,  _______,  _______, KC_PGUP,   _______,   \
 | 
			
		||||
      _______, _______, _______,                                _______,_______,_______,                _______, _______,         KC_HOME, KC_PGDOWN, KC_END),
 | 
			
		||||
 | 
			
		||||
/* Keymap _L2: (Layer 2) This is function layer 2
 | 
			
		||||
| 
						 | 
				
			
			@ -89,9 +91,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
[_L2] = KEYMAP( 
 | 
			
		||||
      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LCA(KC_TAB),    \
 | 
			
		||||
      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        MEH(KC_TAB),        \
 | 
			
		||||
      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        \
 | 
			
		||||
      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                \
 | 
			
		||||
      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MS_BTN1,KC_MS_UP,KC_MS_BTN2,   \
 | 
			
		||||
      _______,_______,_______,        _______,_______,_______,                _______,_______,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,
 | 
			
		||||
      _______,_______,_______,        _______,_______,_______,                _______,_______,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT)
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,7 @@
 | 
			
		|||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define BACKLIGHT_BREATHING
 | 
			
		||||
#define BREATHING_PERIOD 3
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
    #define STARTUP_SONG SONG(PLANCK_SOUND)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -134,7 +134,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		|||
      if (record->event.pressed) {
 | 
			
		||||
        set_single_persistent_default_layer(_DATA);
 | 
			
		||||
        #ifdef BACKLIGHT_ENABLE
 | 
			
		||||
          breathing_speed_set(3);
 | 
			
		||||
          breathing_enable();
 | 
			
		||||
        #endif
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			@ -146,7 +145,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		|||
        uint8_t default_layer = biton32(default_layer_state);
 | 
			
		||||
        if (default_layer == _QWERTY) {
 | 
			
		||||
          #ifdef BACKLIGHT_ENABLE
 | 
			
		||||
            breathing_speed_set(3);
 | 
			
		||||
            breathing_enable();
 | 
			
		||||
          #endif
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -167,7 +165,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		|||
        uint8_t default_layer = biton32(default_layer_state);
 | 
			
		||||
        if (default_layer == _QWERTY) {
 | 
			
		||||
          #ifdef BACKLIGHT_ENABLE
 | 
			
		||||
            breathing_speed_set(3);
 | 
			
		||||
            breathing_enable();
 | 
			
		||||
          #endif
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -138,7 +138,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
 | 
			
		|||
      break;
 | 
			
		||||
    case MACRO_BREATH_DEFAULT:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        breathing_defaults();
 | 
			
		||||
        breathing_period_default();
 | 
			
		||||
      }
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -337,7 +337,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
        case MACRO_BREATH_DEFAULT:
 | 
			
		||||
            if (record->event.pressed)
 | 
			
		||||
            {
 | 
			
		||||
                breathing_defaults();
 | 
			
		||||
                breathing_period_default();
 | 
			
		||||
            }
 | 
			
		||||
            break;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,6 +2,7 @@ ifndef QUANTUM_DIR
 | 
			
		|||
	include ../../../../Makefile
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
EXTRAKEY_ENABLE = no
 | 
			
		||||
MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 | 
			
		||||
STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output on port C6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -346,7 +346,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
        case MACRO_BREATH_DEFAULT:
 | 
			
		||||
            if (record->event.pressed)
 | 
			
		||||
            {
 | 
			
		||||
                breathing_defaults();
 | 
			
		||||
                breathing_period_default();
 | 
			
		||||
            }
 | 
			
		||||
            break;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1,2 @@
 | 
			
		|||
TAP_DANCE_ENABLE = yes
 | 
			
		||||
SRC += gordon.c
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue