Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox

8 files changed, 233 insertions, 0 deletions

diff --git a/keyboards/xd75/keymaps/bbaserdem/config.h b/keyboards/xd75/keymaps/bbaserdem/config.h
new file mode 100644
index 000000000..2c24bb767
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+ *
+ * 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/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#endif
diff --git a/keyboards/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xd75/keymaps/bbaserdem/keymap.c
new file mode 100644
index 000000000..0b8ab6235
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/keymap.c
@@ -0,0 +1,80 @@
+#include "xd75.h"
+#include "bbaserdem.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Layout
+ * ,-----------------------------------------------------------.
+ * |Blt|Lck| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |
+ * |---+---+-----------------------------------------------+---|
+ * |Int|Trm|                                               |Cps|
+ * |---+---|                                               |---|
+ * |Clc|Psw|                                               | \ |
+ * |---+---|                    PLANCK                     |---|
+ * |Rev|Ffw|                                               | [ |
+ * |---+---|                                               |---|
+ * |Tog|Mut|                                               | ] |
+ * `-----------------------------------------------------------'
+ */
+[_DV] = KM(
+    BL_STEP, LGUI(KC_ESC), KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,
+    KC_WHOM, LGUI(KC_ENT), DVORAK_1, KC_CAPS,
+    KC_CALC, LGUI(KC_P),   DVORAK_2, KC_BSLS,
+    KC_MPRV, KC_MNXT,      DVORAK_3, KC_LBRC,
+    KC_MPLY, KC_MUTE,      DVORAK_4, KC_RBRC ),
+
+[_AL] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, ALTCHAR_1, _______,
+    _______,_______, ALTCHAR_2, _______,
+    _______,_______, ALTCHAR_3, _______,
+    _______,_______, ALTCHAR_4, _______ ),
+
+[_GA] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, GAME_1, _______,
+    _______,_______, GAME_2, _______,
+    _______,_______, GAME_3, _______,
+    _______,_______, GAME_4, _______ ),
+
+[_NU] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, NUMBERS_1, _______,
+    _______,_______, NUMBERS_2, _______,
+    _______,_______, NUMBERS_3, _______,
+    _______,_______, NUMBERS_4, _______ ),
+
+[_SE] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, SETTINGS_1, _______,
+    _______,_______, SETTINGS_2, _______,
+    _______,_______, SETTINGS_3, _______,
+    _______,_______, SETTINGS_4, _______ ),
+
+[_MO] = KM(
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,
+    _______,_______, MOUSE_1, _______,
+    _______,_______, MOUSE_2, _______,
+    _______,_______, MOUSE_3, _______,
+    _______,_______, MOUSE_4, _______ ),
+
+#ifdef AUDIO_ENABLE
+[_MU] = KM(
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MASK,     XXX,
+    XXX, XXX, MUSIC_4,  XXX ),
+#endif
+
+};
+
diff --git a/keyboards/xd75/keymaps/bbaserdem/readme.md b/keyboards/xd75/keymaps/bbaserdem/readme.md
new file mode 100644
index 000000000..68a05b030
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/readme.md
@@ -0,0 +1,12 @@
+# XD75RE Setup
+
+This layout is the xd75re layout, inspired by my planck keymap.
+Contains some code from the original keymap here, but had to be modded.
+
+# Make
+
+Take the board into reset mode, then
+```
+make xd75:bbaserdem:dfu
+```
+Either sudo it or set permissions in udev.
diff --git a/keyboards/xd75/keymaps/bbaserdem/rules.mk b/keyboards/xd75/keymaps/bbaserdem/rules.mk
new file mode 100644
index 000000000..4839c644f
--- /dev/null
+++ b/keyboards/xd75/keymaps/bbaserdem/rules.mk
@@ -0,0 +1,10 @@
+# Build options
+BACKLIGHT_ENABLE = yes		# Switch LEDs
+MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = no 		# LED strips
+TAP_DANCE_ENABLE = no 		# Use multi-tap features
+AUDIO_ENABLE = no  			# Audio stuff
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/xd75/keymaps/mtdjr/config.h b/keyboards/xd75/keymaps/mtdjr/config.h
new file mode 100644
index 000000000..7e2227c87
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2017 Benjamin Kesselring
+ *
+ * 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/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+#undef MANUFACTURER
+#undef DESCRIPTION
+#define MANUFACTURER    mtdjr
+#define PRODUCT         XD75
+#define DESCRIPTION     XD75Re
+
+#endif
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xd75/keymaps/mtdjr/keymap.c
new file mode 100644
index 000000000..28d4b4961
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/keymap.c
@@ -0,0 +1,57 @@
+#include QMK_KEYBOARD_H
+#include "mtdjr.h"
+
+#define KC_LOCK TD(TD_ENDLOCK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_QWERTY] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+      EXC, 1  , 2  , 3  , 4  , 5  ,PGUP,xxxx,PGDN, 6  , 7  , 8  , 9  , 0  ,BSPC,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+      TAB, Q  , W  ,  E , R  , T  , INS,BSLS, DEL, Y  , U  , I  , O  , P  ,QUOT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LCTL, A  , S  ,  D , F  , G  ,HOME,PLUS,LOCK, H  , J  , K  , L  ,SCLN, ENT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LSFT, Z  , X  ,  C , V  , B  ,LBRC,MINS,RBRC, N  , M  ,COMM, DOT,SLSH,RSFT,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     LOWR,LCTL,LALT,LGUI,xxxx, SPC, SPC,RASE,SPC, SPC,xxxx,LEFT,DOWN,UP  ,RGHT
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+),
+
+ [_LOWER] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+     xxxx,  F1,  F2,  F3,  F4,  F5,  F6,xxxx,  F7,  F8,  F9, F10, F11, F12, DEL,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,MUTE,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+         ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,    ,xxxx,MPLY,xxxx,MPRV,VOLD,VOLU,MNXT
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+),
+
+[_RAISE] = KC_KEYMAP(
+//  .--------------------------------------------------------------------------.
+     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     xxxx,xxxx,xxxx,xxxx, RST,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+     CAPS,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, BLI,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+      RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD, BLD,xxxx,xxxx,xxxx,xxxx,BTN1,BTN2,xxxx,
+//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
+         ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,    ,xxxx,xxxx,xxxx,MS_L,MS_D,MS_U,MS_R
+//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
+)
+};
+
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        capslock_led_on();
+    } else {
+        capslock_led_off();
+    }
+}
diff --git a/keyboards/xd75/keymaps/mtdjr/readme.md b/keyboards/xd75/keymaps/mtdjr/readme.md
new file mode 100644
index 000000000..d53c0f34a
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/readme.md
@@ -0,0 +1 @@
+# The default keymap for xd75
diff --git a/keyboards/xd75/keymaps/mtdjr/rules.mk b/keyboards/xd75/keymaps/mtdjr/rules.mk
new file mode 100644
index 000000000..28462ff16
--- /dev/null
+++ b/keyboards/xd75/keymaps/mtdjr/rules.mk
@@ -0,0 +1,22 @@
+# Copyright 2013 Jun Wako <wakojun@gmail.com>
+#
+# 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/>.
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
+
+BACKLIGHT_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+RGBLIGHT_ENABLE = yes