X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=layouts%2Fcommunity%2Fergodox%2Fdrashna%2Fkeymap.c;h=763b218f7476fadf2c069e8c253a935bb286e215;hb=d41961c9eddb78591d3b55ea65e6e0baff4bdd69;hp=428706e2d58c438a362cdb1cb3322e862ba7d3fb;hpb=908966bdf36605301d27cdcae82c3201c156a43f;p=qmk_firmware.git
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 428706e2d..763b218f7 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -18,22 +18,20 @@ along with this program. If not, see .
#include "drashna.h"
#ifdef UNICODEMAP_ENABLE
-#include "drashna_unicode.h"
-#endif // UNICODEMAP_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-extern bool g_suspend_state;
-extern rgb_config_t rgb_matrix_config;
+# include "drashna_unicode.h"
+#endif // UNICODEMAP_ENABLE
+#ifndef UNICODE_ENABLE
+# define UC(x) KC_NO
#endif
+
extern userspace_config_t userspace_config;
-enum more_custom_keycodes {
- KC_SWAP_NUM = NEW_SAFE_RANGE
-};
+enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE };
-//define layer change stuff for underglow indicator
+// define layer change stuff for underglow indicator
bool skip_leds = false;
+// clang-format off
#define LAYOUT_ergodox_pretty_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@@ -43,11 +41,11 @@ bool skip_leds = false;
KC_ESC, ________________NUMBER_LEFT________________, UC_FLIP, UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \
KC_TAB, K01, K02, K03, K04, K05, TG(_DIABLO), TG(_DIABLO), K06, K07, K08, K09, K0A, KC_BSLS, \
KC_C1R3, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \
- KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, CTL_T(K2A), KC_MRSF, \
- KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \
- OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \
- KC_HOME, KC_PGUP, \
- LT(_LOWER, KC_SPACE),KC_BSPC, KC_END, KC_PGDN, KC_DEL, LT(_RAISE, KC_ENTER) \
+ KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF, \
+ KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \
+ OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \
+ KC_APP, KC_MENU, \
+ KC_SPC, LT(_LOWER, KC_BSPC), OS_LWR, OS_RSE, LT(_RAISE, KC_DEL), KC_ENT \
)
#define LAYOUT_ergodox_pretty_base_wrapper(...) LAYOUT_ergodox_pretty_base(__VA_ARGS__)
@@ -270,8 +268,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LOWER] = LAYOUT_ergodox_pretty_wrapper(
KC_F12, _________________FUNC_LEFT_________________, _______, _______, _________________FUNC_RIGHT________________, KC_F11,
- KC_TILD, _________________LOWER_L1__________________, _______, _______, _________________LOWER_R1__________________, _______,
- _______, ___________________BLANK___________________, _________________LOWER_R2__________________, KC_PIPE,
+ KC_TILD, _________________LOWER_L1__________________, _______, _______, _________________LOWER_R1__________________, KC_PIPE,
+ _______, ___________________BLANK___________________, _________________LOWER_R2__________________, KC_DQUO,
_______, ___________________BLANK___________________, _______, _______, _________________LOWER_R3__________________, KC_PSCR,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
_______, _______, _______, _______,
@@ -281,8 +279,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_RAISE] = LAYOUT_ergodox_pretty_wrapper(
KC_F12, _________________FUNC_LEFT_________________, _______, _______, _________________FUNC_RIGHT________________, KC_F11,
- KC_GRV, _________________RAISE_L1__________________, _______, _______, _________________RAISE_R1__________________, _______,
- _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
+ KC_GRV, _________________RAISE_L1__________________, _______, _______, _________________RAISE_R1__________________, KC_BSLS,
+ _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_QUOT,
_______, _________________RAISE_L3__________________, _______, _______, _________________RAISE_R3__________________, KC_PSCR,
_______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_SLCK,
_______, _______, _______, _______,
@@ -302,194 +300,167 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
+// clang-format on
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-
- switch (keycode) {
- case KC_1:
- if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
- if (record->event.pressed) {
- register_code(KC_2);
- } else {
- unregister_code(KC_2);
- }
- return false;
- }
- break;
- case KC_2:
- if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
- if (record->event.pressed) {
- register_code(KC_1);
- } else {
- unregister_code(KC_1);
- }
- return false;
- }
- break;
- case KC_SWAP_NUM:
- if (record->event.pressed) {
- userspace_config.swapped_numbers ^= 1;
- eeconfig_update_user(userspace_config.raw);
- }
- }
- //switch (keycode) {
- // case KC_P00:
- // if (!record->event.pressed) {
- // register_code(KC_KP_0);
- // unregister_code(KC_KP_0);
- // register_code(KC_KP_0);
- // unregister_code(KC_KP_0);
- // }
- // return false;
- // break;
- //}
- return true;
+ switch (keycode) {
+ case KC_1:
+ if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+ if (record->event.pressed) {
+ register_code(KC_2);
+ } else {
+ unregister_code(KC_2);
+ }
+ return false;
+ }
+ break;
+ case KC_2:
+ if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+ if (record->event.pressed) {
+ register_code(KC_1);
+ } else {
+ unregister_code(KC_1);
+ }
+ return false;
+ }
+ break;
+ case KC_SWAP_NUM:
+ if (record->event.pressed) {
+ userspace_config.swapped_numbers ^= 1;
+ eeconfig_update_user(userspace_config.raw);
+ }
+ break;
+ }
+ // switch (keycode) {
+ // case KC_P00:
+ // if (!record->event.pressed) {
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // }
+ // return false;
+ // break;
+ //}
+ return true;
}
void matrix_scan_keymap(void) { // runs frequently to update info
- uint8_t modifiers = get_mods();
- uint8_t led_usb_state = host_keyboard_leds();
- uint8_t one_shot = get_oneshot_mods();
-
- if (!skip_leds) {
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
-
- // Since we're not using the LEDs here for layer indication anymore,
- // then lets use them for modifier indicators. Shame we don't have 4...
- // Also, no "else", since we want to know each, independently.
- if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<