change layout and disable NKRO

diff --git a/keyboard/ergodox/Makefile.lufa b/keyboard/ergodox/Makefile.lufa
index 6edba8c0681b13eb6369ea7bdc6f115bc0dec6b5..42cf5478354206f3b8e978d560e4dce88a0fdd23 100644 (file)
--- a/keyboard/ergodox/Makefile.lufa
+++ b/keyboard/ergodox/Makefile.lufa
@@ -108,7 +108,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+600)
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes              # USB Nkey Rollover (+500)
+NKRO_ENABLE = no               # USB Nkey Rollover (+500)
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
 INVERT_NUMLOCK = yes   # invert state of NumLock led
 

diff --git a/keyboard/ergodox/config.h b/keyboard/ergodox/config.h
index 54a114f55b73095727b812bbd298e85df37a330d..68627151a4da773d25db51e3fbc255d8874c087f 100644 (file)
--- a/keyboard/ergodox/config.h
+++ b/keyboard/ergodox/config.h
@@ -59,9 +59,9 @@ Project located at <https://github.com/benblazak/ergodox-firmware>
 #define TAPPING_TERM    230
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+// #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+// #define LOCKING_RESYNC_ENABLE
 
 /* key combination for command */
 #define IS_COMMAND() ( \
@@ -88,6 +88,6 @@ Project located at <https://github.com/benblazak/ergodox-firmware>
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-//#define DEBUG_MATRIX_SCAN_RATE
+#define DEBUG_MATRIX_SCAN_RATE
 
 #endif

diff --git a/keyboard/ergodox/keymap.c b/keyboard/ergodox/keymap.c
index 868d4857af06db9c945925c2caca6d8df9948c2d..7deb7726e336f4c516a1bc263da90dbb9477b89c 100644 (file)
--- a/keyboard/ergodox/keymap.c
+++ b/keyboard/ergodox/keymap.c
@@ -115,16 +115,16 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         TRNS,LBRC,RBRC,LBRC,RBRC,SCLN,FN4,
         TRNS,BSLS,SLSH,9   ,0   ,SCLN,
         TRNS,1   ,2   ,3   ,4   ,5   ,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,
+        FN3 ,TRNS,TRNS,TRNS,TRNS,
                                       TRNS,TRNS,
                                            TRNS,
                                  TRNS,TRNS,TRNS,
         // right hand
              F12, F6,  F7,  F8,  F9,  F10, PWR ,
-             TRNS,TRNS,EQL ,EQL ,MINS,MINS,UP  ,
-                  LEFT,DOWN,UP  ,RGHT,TRNS,DOWN,
+             TRNS,TRNS,EQL ,EQL ,MINS,MINS,VOLU,
+                  LEFT,DOWN,UP  ,RGHT,TRNS,VOLD,
              FN5 ,6   ,7   ,8   ,9   ,0   ,MUTE,
-                       TRNS,TRNS,TRNS,TRNS,TRNS,
+                       TRNS,TRNS,TRNS,MPRV,MNXT,
         TRNS,TRNS,
         TRNS,
         TRNS,TRNS,TRNS
@@ -163,7 +163,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                  TRNS,TRNS,TRNS,
         // right hand
              FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-             TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
+             FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
              FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
                        TRNS,TRNS,TRNS,TRNS,TRNS,