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

1 files changed, 28 insertions, 0 deletions

diff --git a/keyboards/crkbd/keymaps/oo/config.h b/keyboards/crkbd/keymaps/oo/config.h
new file mode 100644
index 0000000000..8dc71430a1
--- /dev/null
+++ b/keyboards/crkbd/keymaps/oo/config.h
@@ -0,0 +1,28 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define SPLIT_USB_DETECT
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"