Merge remote-tracking branch 'origin/master' into develop

4 years ago · 96afc7a03a
parent d1e5221bf8 de4f2bf1ff
commit 96afc7a03a
2 changed files with 5 additions and 2 deletions
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@ -24,6 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */

 #define MASTER_LEFT
+
+#define SPLIT_WPM_ENABLE
+
 // #define MASTER_RIGHT
 // #define EE_HANDS

@ -54,4 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define NO_ACTION_ONESHOT
 // Size optimisations END
-*/
+*/
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };


-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 // #include <stdio.h>

 // bongo cat