summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2018-11-28 01:42:09 +0100
committerGitHub <noreply@github.com>2018-11-28 01:42:09 +0100
commita152ad3145096bd54f75dc7747ca9c7a124155ea (patch)
tree0ede317f7e91136e9683dd4417e5b1aeca2cca74 /keyboards
parent19043197459c5c8ed4a7039f1a4c1da180da45e1 (diff)
parent6983c71efd9991e7f6b8290dff24a023bbe4eeb1 (diff)
downloadqmk_firmware-a152ad3145096bd54f75dc7747ca9c7a124155ea.tar.gz
qmk_firmware-a152ad3145096bd54f75dc7747ca9c7a124155ea.tar.xz
Merge pull request #4501 from amayer5125/ergodox-ez-cleanup
Ergodox ez cleanup
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/keymaps/default/keymap.c58
1 files changed, 13 insertions, 45 deletions
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index 49de60773..12d6cf6fa 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -6,8 +6,7 @@
#define MDIA 2 // media keys
enum custom_keycodes {
- PLACEHOLDER = SAFE_RANGE, // can always be here
- EPRM,
+ EPRM = SAFE_RANGE,
VRSN,
RGB_SLD
};
@@ -145,47 +144,21 @@ const uint16_t PROGMEM fn_actions[] = {
[1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols)
};
-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) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
- }
- return MACRO_NONE;
-};
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // dynamically generate these.
- case EPRM:
- if (record->event.pressed) {
+ if (record->event.pressed) {
+ switch (keycode) {
+ case EPRM:
eeconfig_init();
- }
- return false;
- break;
- case VRSN:
- if (record->event.pressed) {
+ return false;
+ case VRSN:
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- return false;
- break;
- case RGB_SLD:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_mode(1);
- #endif
- }
- return false;
- break;
+ return false;
+ #ifdef RGBLIGHT_ENABLE
+ case RGB_SLD:
+ rgblight_mode(1);
+ return false;
+ #endif
+ }
}
return true;
}
@@ -197,11 +170,6 @@ void matrix_init_user(void) {
#endif
};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
-
// Runs whenever there is a layer state change.
uint32_t layer_state_set_user(uint32_t state) {
ergodox_board_led_off();