|
@@ -1,117 +1,117 @@
|
|
#include "satan.h"
|
|
#include "satan.h"
|
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
|
|
|
|
- #define norm 0
|
|
+#define norm 0
|
|
- #define elev 1
|
|
+#define elev 1
|
|
- #define supr 2
|
|
+#define supr 2
|
|
- #define spac 3
|
|
+#define spac 3
|
|
- #define FNO1 4
|
|
+#define FNO1 4
|
|
- #define FNO2 5
|
|
+#define FNO2 5
|
|
- #define FNO3 6
|
|
+#define FNO3 6
|
|
- #define MAC0 M(0)
|
|
+#define MAC0 M(0)
|
|
- #define MAC1 M(1)
|
|
+#define MAC1 M(1)
|
|
- #define MAC2 M(2)
|
|
+#define MAC2 M(2)
|
|
- #define MAC3 M(3)
|
|
+#define MAC3 M(3)
|
|
- #define MAC4 M(4)
|
|
+#define MAC4 M(4)
|
|
- #define MAC5 M(5)
|
|
+#define MAC5 M(5)
|
|
- #define MAC6 M(6)
|
|
+#define MAC6 M(6)
|
|
- #define MAC7 M(7)
|
|
+#define MAC7 M(7)
|
|
- #define MAC8 M(8)
|
|
+#define MAC8 M(8)
|
|
- #define MAC9 M(9)
|
|
+#define MAC9 M(9)
|
|
- #define GRAV KC_GRV
|
|
+#define GRAV KC_GRV
|
|
- #define MEDI F(FNO1)
|
|
+#define MEDI F(FNO1)
|
|
|
|
|
|
|
|
|
|
- #define ESCA KC_ESC
|
|
+#define ESCA KC_ESC
|
|
- #define MINS KC_MINS
|
|
+#define MINS KC_MINS
|
|
- #define EQUL KC_EQL
|
|
+#define EQUL KC_EQL
|
|
- #define BSPC KC_BSPC
|
|
+#define BSPC KC_BSPC
|
|
- #define DELE KC_DEL
|
|
+#define DELE KC_DEL
|
|
- #define LBRC KC_LBRC
|
|
+#define LBRC KC_LBRC
|
|
- #define RBRC KC_RBRC
|
|
+#define RBRC KC_RBRC
|
|
- #define ALTR KC_RALT
|
|
+#define ALTR KC_RALT
|
|
- #define SCLN KC_SCLN
|
|
+#define SCLN KC_SCLN
|
|
- #define QUOT KC_QUOT
|
|
+#define QUOT KC_QUOT
|
|
- #define NUHS KC_NUHS
|
|
+#define NUHS KC_NUHS
|
|
- #define ENTE KC_ENT
|
|
+#define ENTE KC_ENT
|
|
- #define NUBS KC_NUBS
|
|
+#define NUBS KC_NUBS
|
|
- #define COMM KC_COMM
|
|
+#define COMM KC_COMM
|
|
- #define FSTO KC_DOT
|
|
+#define FSTO KC_DOT
|
|
- #define SLSH KC_SLSH
|
|
+#define SLSH KC_SLSH
|
|
- #define ALTL KC_LALT
|
|
+#define ALTL KC_LALT
|
|
- #define GUIL KC_LGUI
|
|
+#define GUIL KC_LGUI
|
|
- #define GUIR KC_RGUI
|
|
+#define GUIR KC_RGUI
|
|
- #define MENO KC_MENU
|
|
+#define MENO KC_MENU
|
|
|
|
|
|
- #define FK01 KC_F1
|
|
+#define FK01 KC_F1
|
|
- #define FK02 KC_F2
|
|
+#define FK02 KC_F2
|
|
- #define FK03 KC_F3
|
|
+#define FK03 KC_F3
|
|
- #define FK04 KC_F4
|
|
+#define FK04 KC_F4
|
|
- #define FK05 KC_F5
|
|
+#define FK05 KC_F5
|
|
- #define FK06 KC_F6
|
|
+#define FK06 KC_F6
|
|
- #define FK07 KC_F7
|
|
+#define FK07 KC_F7
|
|
- #define FK08 KC_F8
|
|
+#define FK08 KC_F8
|
|
- #define FK09 KC_F9
|
|
+#define FK09 KC_F9
|
|
- #define FK10 KC_F10
|
|
+#define FK10 KC_F10
|
|
- #define FK11 KC_F11
|
|
+#define FK11 KC_F11
|
|
- #define FK12 KC_F12
|
|
+#define FK12 KC_F12
|
|
- #define FK13 KC_F13
|
|
+#define FK13 KC_F13
|
|
- #define FK14 KC_F14
|
|
+#define FK14 KC_F14
|
|
|
|
|
|
- #define INSE KC_INS
|
|
+#define INSE KC_INS
|
|
- #define HOME KC_HOME
|
|
+#define HOME KC_HOME
|
|
- #define ENDI KC_END
|
|
+#define ENDI KC_END
|
|
- #define PSCR KC_PSCR
|
|
+#define PSCR KC_PSCR
|
|
- #define SLCK KC_SLCK
|
|
+#define SLCK KC_SLCK
|
|
- #define PGDN KC_PGDN
|
|
+#define PGDN KC_PGDN
|
|
- #define PGUP KC_PGUP
|
|
+#define PGUP KC_PGUP
|
|
- #define PLPS KC_MPLY
|
|
+#define PLPS KC_MPLY
|
|
- #define PAUS KC_PAUS
|
|
+#define PAUS KC_PAUS
|
|
- #define MUTE KC_MUTE
|
|
+#define MUTE KC_MUTE
|
|
- #define VOLU KC_VOLU
|
|
+#define VOLU KC_VOLU
|
|
- #define VOLD KC_VOLD
|
|
+#define VOLD KC_VOLD
|
|
- #define MNXT KC_MNXT
|
|
+#define MNXT KC_MNXT
|
|
- #define MPRV KC_MPRV
|
|
+#define MPRV KC_MPRV
|
|
- #define MSTP KC_MSTP
|
|
+#define MSTP KC_MSTP
|
|
- #define MSEL KC_MSEL
|
|
+#define MSEL KC_MSEL
|
|
- #define MAIL KC_MAIL
|
|
+#define MAIL KC_MAIL
|
|
- #define CALC KC_CALC
|
|
+#define CALC KC_CALC
|
|
- #define MYCM KC_MYCM
|
|
+#define MYCM KC_MYCM
|
|
-
|
|
+
|
|
-
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- #define DUTB LT(elev, KC_TAB)
|
|
+#define DUTB LT(elev, KC_TAB)
|
|
- #define DUSP LT(spac, KC_SPACE)
|
|
+#define DUSP LT(spac, KC_SPACE)
|
|
- #define LOCK LGUI(KC_L)
|
|
+#define LOCK LGUI(KC_L)
|
|
|
|
|
|
|
|
|
|
- #define SADL MAC0
|
|
+#define SADL MAC0
|
|
- #define SADR MAC1
|
|
+#define SADR MAC1
|
|
- #define CADL MAC2
|
|
+#define CADL MAC2
|
|
- #define CADR MAC3
|
|
+#define CADR MAC3
|
|
|
|
|
|
|
|
|
|
- #define ARLF ALT_T(KC_LEFT)
|
|
+#define ARLF ALT_T(KC_LEFT)
|
|
- #define ARRT CTL_T(KC_RIGHT)
|
|
+#define ARRT CTL_T(KC_RIGHT)
|
|
- #define ARUP SFT_T(KC_UP)
|
|
+#define ARUP SFT_T(KC_UP)
|
|
- #define ARDN GUI_T(KC_DOWN)
|
|
+#define ARDN GUI_T(KC_DOWN)
|
|
|
|
|
|
|
|
|
|
- #define NOCL RALT(KC_7)
|
|
+#define NOCL RALT(KC_7)
|
|
- #define NOCR RALT(KC_0)
|
|
+#define NOCR RALT(KC_0)
|
|
- #define NOPL LSFT(KC_8)
|
|
+#define NOPL LSFT(KC_8)
|
|
- #define NOPR LSFT(KC_9)
|
|
+#define NOPR LSFT(KC_9)
|
|
- #define NOAL KC_NUBS
|
|
+#define NOAL KC_NUBS
|
|
- #define NOAR LSFT(KC_NUBS)
|
|
+#define NOAR LSFT(KC_NUBS)
|
|
- #define NOBL RALT(KC_8)
|
|
+#define NOBL RALT(KC_8)
|
|
- #define NOBR RALT(KC_9)
|
|
+#define NOBR RALT(KC_9)
|
|
|
|
|
|
|
|
|
|
- #define XXXX KC_TRNS
|
|
+#define XXXX KC_TRNS
|
|
- #define DEAD KC_NO
|
|
+#define DEAD KC_NO
|
|
- #define SCAN KC_TRNS
|
|
+#define SCAN KC_TRNS
|
|
|
|
|
|
[ norm ] = KEYMAP(
|
|
[ norm ] = KEYMAP(
|
|
GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
|
|
GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
|
|
@@ -143,40 +143,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
};
|
|
};
|
|
|
|
|
|
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) {
|
|
- static uint16_t key_timer;
|
|
+ static uint16_t key_timer;
|
|
|
|
+ bool checkTime(){
|
|
|
|
+ return (timer_elapsed(key_timer) < 150) ? true : false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
switch(id) {
|
|
switch(id) {
|
|
case 0:
|
|
case 0:
|
|
if (record->event.pressed) {
|
|
if (record->event.pressed) {
|
|
key_timer = timer_read();
|
|
key_timer = timer_read();
|
|
return MACRO(D(LSFT), END );
|
|
return MACRO(D(LSFT), END );
|
|
} else {
|
|
} else {
|
|
- return (timer_elapsed(key_timer) < 150) ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
|
|
+ return checktime() ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
|
|
}; break;
|
|
}; break;
|
|
case 1:
|
|
case 1:
|
|
if (record->event.pressed) {
|
|
if (record->event.pressed) {
|
|
key_timer = timer_read();
|
|
key_timer = timer_read();
|
|
return MACRO(D(RSFT), END );
|
|
return MACRO(D(RSFT), END );
|
|
} else {
|
|
} else {
|
|
- return (timer_elapsed(key_timer) < 150) ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
|
|
+ return checktime() ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
|
|
}; break;
|
|
}; break;
|
|
case 2:
|
|
case 2:
|
|
if (record->event.pressed) {
|
|
if (record->event.pressed) {
|
|
key_timer = timer_read();
|
|
key_timer = timer_read();
|
|
return MACRO(D(LCTL), END );
|
|
return MACRO(D(LCTL), END );
|
|
- } else {return (timer_elapsed(key_timer) < 150) ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
|
|
+ } else {return checktime() ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
|
|
}; break;
|
|
}; break;
|
|
case 3:
|
|
case 3:
|
|
if (record->event.pressed) {
|
|
if (record->event.pressed) {
|
|
key_timer = timer_read();
|
|
key_timer = timer_read();
|
|
return MACRO(D(RCTL), END );
|
|
return MACRO(D(RCTL), END );
|
|
} else {
|
|
} else {
|
|
- return (timer_elapsed(key_timer) < 150) ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
|
|
+ return checktime() ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
|
|
}; break;
|
|
}; break;
|
|
- case 4:
|
|
+ case 4:
|
|
if (record->event.pressed) { } else { }; break;
|
|
if (record->event.pressed) { } else { }; break;
|
|
- case 5:
|
|
+ case 5:
|
|
if (record->event.pressed) { } else { }; break;
|
|
if (record->event.pressed) { } else { }; break;
|
|
- case 6:
|
|
+ case 6:
|
|
if (record->event.pressed) { } else { }; break;
|
|
if (record->event.pressed) { } else { }; break;
|
|
} return MACRO_NONE;
|
|
} return MACRO_NONE;
|
|
};
|
|
};
|