From: Don Armstrong Date: Wed, 25 Dec 2019 21:15:50 +0000 (-0800) Subject: use LAYOUT_ergodox instead of KEYMAP X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=20c9867a23e5c2ccbe5d8821f0fe25be7608aa77;p=qmk_firmware.git use LAYOUT_ergodox instead of KEYMAP --- diff --git a/layouts/community/ergodox/don/Makefile b/layouts/community/ergodox/don/Makefile deleted file mode 100644 index bb0dd5d8f..000000000 --- a/layouts/community/ergodox/don/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = yes # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -ifeq ($(SUBPROJECT_DIR),'infinity') -VISUALIZER_ENABLE = yes -LCD_BACKLIGHT_ENABLE = yes -LCD_ENABLE = yes -else -OPT_DEFS+= -DLEFT_LEDS -RGBLIGHT_ENABLE = no -endif - -dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter - while true; do \ - sudo dfu-util -l | grep -q "DFU"; \ - if [ $$? -eq 0 ]; then \ - break; \ - fi; \ - sleep 0.1; \ - done; - sudo dfu-util --device DFU -D $(BUILD_DIR)/$(TARGET).bin - - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/layouts/community/ergodox/don/keymap.c b/layouts/community/ergodox/don/keymap.c index 640b24f84..d7afc437e 100644 --- a/layouts/community/ergodox/don/keymap.c +++ b/layouts/community/ergodox/don/keymap.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "ergodox.h" +#include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" #include "version.h" @@ -31,7 +31,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = KEYMAP( // layer 0 : default + [BASE] = LAYOUT_ergodox( // layer 0 : default // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, KC_BSLS,KC_Q, KC_W, KC_E, KC_R, KC_T, TG(MOUS), @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN,KC_ENT, KC_SPC ), - [SYMB] = KEYMAP( // layer 1 : function and symbol keys + [SYMB] = LAYOUT_ergodox( // layer 1 : function and symbol keys // left hand TG(PLVR),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_TRNS,KC_LBRC,KC_RBRC,KC_LBRC,KC_RBRC,KC_SCLN,KC_TRNS, @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ), - [MOUS] = KEYMAP( // layer 2 : Mouse + [MOUS] = LAYOUT_ergodox( // layer 2 : Mouse // left hand KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS , @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS ), - [FNXN] = KEYMAP( // layer 3 : keyboard functions + [FNXN] = LAYOUT_ergodox( // layer 3 : keyboard functions // left hand RESET,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_FN0, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_FN0, @@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS ), - [NUMP] = KEYMAP( // layer 4: numpad + [NUMP] = LAYOUT_ergodox( // layer 4: numpad // left hand KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ -[PLVR] = KEYMAP( +[PLVR] = LAYOUT_ergodox( // left hand KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_FN0, KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, diff --git a/layouts/community/ergodox/don/rules.mk b/layouts/community/ergodox/don/rules.mk new file mode 100644 index 000000000..bb0dd5d8f --- /dev/null +++ b/layouts/community/ergodox/don/rules.mk @@ -0,0 +1,40 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = yes # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +ifeq ($(SUBPROJECT_DIR),'infinity') +VISUALIZER_ENABLE = yes +LCD_BACKLIGHT_ENABLE = yes +LCD_ENABLE = yes +else +OPT_DEFS+= -DLEFT_LEDS +RGBLIGHT_ENABLE = no +endif + +dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter + while true; do \ + sudo dfu-util -l | grep -q "DFU"; \ + if [ $$? -eq 0 ]; then \ + break; \ + fi; \ + sleep 0.1; \ + done; + sudo dfu-util --device DFU -D $(BUILD_DIR)/$(TARGET).bin + + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif