aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/chimera_ortho/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/chimera_ortho/keymaps')
-rw-r--r--keyboards/chimera_ortho/keymaps/dcompact/keymap.c12
-rw-r--r--keyboards/chimera_ortho/keymaps/default/config.h5
-rw-r--r--keyboards/chimera_ortho/keymaps/default/keymap.c218
-rw-r--r--keyboards/chimera_ortho/keymaps/gordon/keymap.c58
4 files changed, 140 insertions, 153 deletions
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c b/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
index 74c3a25cd..1c6ef7d6f 100644
--- a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
@@ -1,4 +1,4 @@
-#include "chimera_ortho.h"
+#include QMK_KEYBOARD_H
enum chimera_ortho_layers
{
@@ -34,7 +34,7 @@ enum chimera_ortho_layers
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = KC_KEYMAP(
+ [_BASE] = LAYOUT_kc(
//,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
LALT ,TAB ,QUOT ,COMM ,DOT ,P ,Y ,F ,G ,C ,R ,L ,SLSH ,FUNC
//|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
),
- [_NAV] = KC_KEYMAP(
+ [_NAV] = LAYOUT_kc(
//,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
, , , , , , , ,HOME ,PGDOWN ,PGUP ,END , ,
//|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
),
- [_SYM] = KC_KEYMAP(
+ [_SYM] = LAYOUT_kc(
//,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
,QUAKE ,GRAVE ,TILDE ,BSLASH ,PIPE ,LPRN ,RPRN ,7 ,8 ,9 ,SLSH ,EQUAL ,
//|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
),
- [_FUNC] = KC_KEYMAP(
+ [_FUNC] = LAYOUT_kc(
//,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
,RESET ,SLEP ,MRWD ,MPLY ,MFFD , , ,F9 ,F10 ,F11 ,F12 , ,
//|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
),
- [_MOUSE] = KC_KEYMAP(
+ [_MOUSE] = LAYOUT_kc(
//,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
, , , , , , , , , , , , ,
//|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/chimera_ortho/keymaps/default/config.h b/keyboards/chimera_ortho/keymaps/default/config.h
new file mode 100644
index 000000000..bdfd4db80
--- /dev/null
+++ b/keyboards/chimera_ortho/keymaps/default/config.h
@@ -0,0 +1,5 @@
+#pragma once
+
+// place overrides here
+#define LONGPRESS_DELAY 150
+//#define LAYER_TOGGLE_DELAY 300
diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/chimera_ortho/keymaps/default/keymap.c
index 6201eebac..6a676493d 100644
--- a/keyboards/chimera_ortho/keymaps/default/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/default/keymap.c
@@ -1,20 +1,19 @@
// this is the style you want to emulate.
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-#include "chimera_ortho.h"
+#include QMK_KEYBOARD_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.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
-enum chimera_ortho_layers
-{
- _QWERTY,
- _CAPS,
- _NUMPAD,
- _SYMBOLS,
- _MACROS,
- _NAV
+enum chimera_ortho_layers {
+ _QWERTY,
+ _CAPS,
+ _NUMPAD,
+ _SYMBOLS,
+ _MACROS,
+ _NAV
};
#define KC_NMPD TG(_NUMPAD)
@@ -27,153 +26,140 @@ enum chimera_ortho_layers
#define KC_GBRC MT(MOD_RGUI, KC_8)
#define KC_GQOT MT(MOD_LGUI, KC_QUOT)
#define KC_MESC LT(_MACROS, KC_ESC)
-#define KC_INCL M(0)
-#define KC_PULL M(1)
-#define KC_PUSH M(2)
-#define KC_SCAP M(3)
-#define KC_SCOF M(4)
#define KC_CAD LALT(LCTL(KC_DEL))
-#define LONGPRESS_DELAY 150
-//#define LAYER_TOGGLE_DELAY 300
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-#define KC_ KC_TRNS
+enum custom_keycodes {
+ KC_INCL = SAFE_RANGE,
+ KC_PULL,
+ KC_PUSH,
+ KC_SCAP,
+ KC_SCOF
+};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- MESC, Q , W , E , R , T ,SCTL, SCTR, Y , U , I , O , P ,QUOT,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- TAB , A , S , D , F , G ,SPLT, SPRT, H , J , K , L ,SCLN,ENT ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LSPO, Z , X , C , V , B ,SPFN, GBRC, N , M ,COMM,DOT ,SLSH,RSPC,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- NMPD,BSPC, SPC ,SYMB
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_QWERTY] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ KC_MESC, KC_Q , KC_W , KC_E , KC_R , KC_T ,KC_SCTL, KC_SCTR, KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_QUOT,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G ,KC_SPLT, KC_SPRT, 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_SPFN, KC_GBRC, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ KC_NMPD,KC_BSPC, KC_SPC ,KC_SYMB
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
),
- [_CAPS] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- , , , , , , , , , , , , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , ,UNDS, , , , , ,COLN, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- SCOF, , , , , , , , , , , , ,SCOF,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_CAPS] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,_______,_______,_______,KC_UNDS, _______,_______,_______,_______,_______,KC_COLN,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ KC_SCOF,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,KC_SCOF,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______, _______,_______
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
),
- [_NUMPAD] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- , ,COLN , , , , , , , 7 , 8 , 9 ,ASTR,MINS,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , ,DOT , , , , , , , 4 , 5 , 6 ,PLUS, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , , , 1 , 2 , 3 ,SLSH, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , 0
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_NUMPAD] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ _______,_______,KC_COLN,_______,_______,_______,_______, _______,_______, KC_7 , KC_8 , KC_9 ,KC_ASTR,KC_MINS,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,KC_DOT ,_______,_______,_______,_______, _______,_______, KC_4 , KC_5 , KC_6 ,KC_PLUS,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,_______,_______,_______,_______, _______,_______, KC_1 , KC_2 , KC_3 ,KC_SLSH,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______, _______, KC_0
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
),
- [_SYMBOLS] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- ,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR,LPRN,RPRN,BSLS,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , F1 , F2 , F3 , F4 , F5 , , ,TILD,COLN,UNDS,LCBR,RCBR, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , F6 , F7 , F8 , F9 ,F10 , , ,GRV ,SCLN,MINS,LBRC,RBRC, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- PIPE, , ,
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_SYMBOLS] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,_______, _______,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSLS,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,_______, _______,KC_TILD,KC_COLN,KC_UNDS,KC_LCBR,KC_RCBR,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,_______, _______,KC_GRV ,KC_SCLN,KC_MINS,KC_LBRC,KC_RBRC,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ KC_PIPE,_______, _______,_______
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
),
- [_NAV] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- , , , , , , , , , , UP , ,PSCR, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , , ,LEFT,DOWN,RGHT, , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , , ,PGUP,PGDN, , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- ,DEL , ,
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_NAV] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ _______,_______,_______,_______,_______,_______,_______, _______,_______,_______, KC_UP ,_______,KC_PSCR,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_PGUP,KC_PGDN,_______,_______,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,KC_DEL , _______,_______
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
),
- [_MACROS] = KC_KEYMAP(
- //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
- , , , , , , , , , ,INCL, , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,CAD , , , , , , , , , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- SCAP, , , , , , , , , ,PULL,PUSH, ,SCAP,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,
- // \------------------+----+----+---/ \---+----+----+-------------------/
+ [_MACROS] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
+ _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_INCL,_______,_______,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,KC_CAD ,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ KC_SCAP,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_PULL,KC_PUSH,_______,KC_SCAP,
+ //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
+ _______,_______, _______,_______
+ // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
)
};
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch(keycode) {
/* include some kind of library or header */
- case 0:
+ case KC_INCL:
if (record->event.pressed) {
- SEND_STRING("#include <>");
- return MACRO( T(LEFT), END);
+ SEND_STRING("#include <>" SS_TAP(X_LEFT));
}
- break;
- case 1:
+ return false;
+ case KC_PULL:
if (record->event.pressed) {
- SEND_STRING("git pull");
- return MACRO( T(ENT), END );
+ SEND_STRING("git pull" SS_TAP(X_ENTER));
}
- break;
- case 2:
+ return false;
+ case KC_PUSH:
if (record->event.pressed){
- SEND_STRING("git push");
- return MACRO( T(ENT), END );
+ SEND_STRING("git push" SS_TAP(X_ENTER));
}
- break;
- case 3:
+ return false;
+ case KC_SCAP:
if (record->event.pressed){
layer_on(_CAPS);
register_code(KC_CAPSLOCK);
unregister_code(KC_CAPSLOCK);
}
- break;
- case 4:
+ return false;
+ case KC_SCOF:
if (record->event.pressed){
layer_off(_CAPS);
register_code(KC_CAPSLOCK);
unregister_code(KC_CAPSLOCK);
}
- break;
+ return false;
}
- return MACRO_NONE;
+ return true;
};
-
+
void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state);
-
+
switch (layer) {
- case _QWERTY:
- set_led_green;
- break;
+ case _QWERTY:
+ set_led_green;
+ break;
case _CAPS:
- set_led_white;
- break;
+ set_led_white;
+ break;
case _NUMPAD:
set_led_blue;
break;
@@ -181,11 +167,11 @@ void matrix_scan_user(void) {
set_led_red;
break;
case _NAV:
- set_led_magenta;
- break;
+ set_led_magenta;
+ break;
case _MACROS:
- set_led_cyan;
- break;
+ set_led_cyan;
+ break;
default:
set_led_green;
break;
diff --git a/keyboards/chimera_ortho/keymaps/gordon/keymap.c b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
index c6d668f8f..c6766bed3 100644
--- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
@@ -1,10 +1,8 @@
// this is the style you want to emulate.
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-#include "chimera_ortho.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
#include "version.h"
-#include "process_keycode/process_tap_dance.h"
#include "gordon.h"
// Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -83,11 +81,9 @@
//#define LAYER_TOGGLE_DELAY 300
// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-#define KC_ KC_TRNS
+#define KC_ KC_TRNS
-/* TODO:
+/* TODO:
*
* DONE: RESET and CAD into macro layer.
* DONE: WINUP AND WINDOWN in NAV layer
@@ -113,7 +109,7 @@
* Russain layer
* Hebrew layer
* Get rid of stupid git pull and push macros.
- *
+ *
*/
//Tap dance enums
@@ -127,14 +123,14 @@ enum {
CALC_PRINTSCREEN
};
-static xtap ttt_state = {
+static xtap ttt_state = {
.is_press_action = true,
.state = 0
};
//Already exists in gordon.c, shouldn't need this anymore
-/*// To activate SINGLE_HOLD, you will need to hold for 200ms first.
+/*// To activate SINGLE_HOLD, you will need to hold for 200ms first.
// This tap dance favors keys that are used frequently in typing like 'f'
int cur_dance (qk_tap_dance_state_t *state) {
if (state->count == 1) {
@@ -151,8 +147,8 @@ int cur_dance (qk_tap_dance_state_t *state) {
else if (state->count == 2) {
if (state->interrupted) return DOUBLE_SINGLE_TAP;
else if (state->pressed) return DOUBLE_HOLD;
- else return DOUBLE_TAP;
- }
+ else return DOUBLE_TAP;
+ }
else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
else if (state->count == 3) return TRIPLE_HOLD;
else return 8; //magic number. At some point this method will expand to work for more presses
@@ -194,7 +190,7 @@ void TTT_reset (qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_action_t tap_dance_actions[] = {
// simple tap dance
- [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
+ [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
[CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
[CALC_PRINTSCREEN] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_PSCR),
[ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
@@ -206,7 +202,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = KC_KEYMAP(
+ [_QWERTY] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
MESC, Q ,CSHW,ENAV, R , T ,SPC , CLPS, Y , U ,INAV, O , P ,TTT,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -218,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// \------------------+----+----+---/ \---+----+----+-------------------/
),
- [_NUMPAD] = KC_KEYMAP(
+ [_NUMPAD] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
, , , ,ASTR, , , , , 7 , 8 , 9 ,ASTR,/**/,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -226,11 +222,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , ,SLSH, , , , , 1 , 2 , 3 ,SLSH, ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , 0
+ , , , 0
// \------------------+----+----+---/ \---+----+----+-------------------/
),
- [_SYMBOLS] = KC_KEYMAP(
+ [_SYMBOLS] = LAYOUT_kc(
//,----+----+-----+----+----+----+----. ,----+----+----+----+----+----+----.
,EXLM, AT ,LCBR,RCBR,HASH, , ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/,
//|----+----+-----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -242,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// \-------------------+----+----+---/ \---+----+----+-------------------/
),
- [_FUNCTION] = KC_KEYMAP(
+ [_FUNCTION] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
F6F7 ,F1 ,F2 ,F3 ,ALF4,F5 ,F6 , F7 ,F8 ,F9 ,F10 ,F11 ,F12 ,/**/,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -250,11 +246,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , , , , , , , , , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,
+ , , ,
// \------------------+----+----+---/ \---+----+----+-------------------/
),
- [_NAV] = KC_KEYMAP(
+ [_NAV] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
, ,SNAPLEFT,/**/,SNAPRIGHT,, , , , , UP , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -262,11 +258,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, ,WORKLEFT, ,WORKRIGHT,, , , ,PGUP,PGDN, , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- CDEL ,DEL, ,
+ CDEL ,DEL, ,
// \------------------+----+----+---/ \---+----+----+-------------------/
),
- [_TEXTNAV] = KC_KEYMAP(
+ [_TEXTNAV] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
, , , , , , , , , ,/**/, , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -274,11 +270,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , , , , , , , , , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,
+ , , ,
// \------------------+----+----+---/ \---+----+----+-------------------/
),
- [_MOUSE] = KC_KEYMAP(
+ [_MOUSE] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
, , ,MS_UP, , , , , , , UP , , , ,/**/
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -286,12 +282,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , , , , , , , , , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- ,MS_BTN1 ,MS_BTN2 ,
+ ,MS_BTN1 ,MS_BTN2 ,
// \------------------+----+----+---/ \---+----+----+-------------------/
- ),
+ ),
- [_MACROS] = KC_KEYMAP(
+ [_MACROS] = LAYOUT_kc(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
/**/,RESET,SECRET_2,SECRET_3, , , ,SYSTEM_SLEEP, , ,INCL, , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -299,7 +295,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
SCAP, , , , , , , , , , , , ,SCAP,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,
+ , , ,
// \------------------+----+----+---/ \---+----+----+-------------------/
)
@@ -349,11 +345,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
return MACRO_NONE;
};
-
+
void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state);
-
+
switch (layer) {
case _QWERTY:
set_led_green;
@@ -381,7 +377,7 @@ void matrix_scan_user(void) {
_delay_ms(45);
set_led_blue;
_delay_ms(45);
- break;
+ break;
default:
set_led_green;
break;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-29 02:52:21 +0000