added murcielago keyboard (#8920)

* Squashed pull request for murcielago

* removed rotation prior to creating info.json

10 files changed, 483 insertions, 0 deletions

diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json
new file mode 100644
index 000000000..db6d7db75
--- /dev/null
+++ b/keyboards/murcielago/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Murciélago",
+  "url": "",
+  "maintainer": "elagil",
+  "width": 16,
+  "height": 10.025,
+  "layouts": {
+    "LAYOUT": {
+        "layout": [{"label":"0,3", "x":3.5, "y":0.25}, {"label":"6,2", "x":12, "y":0.25}, {"label":"0,2", "x":2.5, "y":0.375}, {"label":"0,4", "x":4.5, "y":0.375}, {"label":"6,1", "x":11, "y":0.375}, {"label":"6,3", "x":13, "y":0.375}, {"label":"0,1", "x":1.5, "y":0.5}, {"label":"0,5", "x":5.5, "y":0.5}, {"label":"6,0", "x":10, "y":0.5}, {"label":"6,4", "x":14, "y":0.5}, {"label":"0,0", "x":0.5, "y":0.675}, {"label":"6,5", "x":15, "y":0.675}, {"label":"1,3", "x":3.5, "y":1.25}, {"label":"7,2", "x":12, "y":1.25}, {"label":"1,2", "x":2.5, "y":1.375}, {"label":"1,4", "x":4.5, "y":1.375}, {"label":"7,1", "x":11, "y":1.375}, {"label":"7,3", "x":13, "y":1.375}, {"label":"1,1", "x":1.5, "y":1.5}, {"label":"1,5", "x":5.5, "y":1.5}, {"label":"7,0", "x":10, "y":1.5}, {"label":"7,4", "x":14, "y":1.5}, {"label":"1,0", "x":0.5, "y":1.675}, {"label":"7,5", "x":15, "y":1.675}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"8,2", "x":12, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.375}, {"label":"2,4", "x":4.5, "y":2.375}, {"label":"8,1", "x":11, "y":2.375}, {"label":"8,3", "x":13, "y":2.375}, {"label":"2,1", "x":1.5, "y":2.5}, {"label":"2,5", "x":5.5, "y":2.5}, {"label":"8,0", "x":10, "y":2.5}, {"label":"8,4", "x":14, "y":2.5}, {"label":"2,0", "x":0.5, "y":2.675}, {"label":"8,5", "x":15, "y":2.675}, {"label":"3,3", "x":3.5, "y":3.25}, {"label":"9,2", "x":12, "y":3.25}, {"label":"3,2", "x":2.5, "y":3.375}, {"label":"3,4", "x":4.5, "y":3.375}, {"label":"9,1", "x":11, "y":3.375}, {"label":"9,3", "x":13, "y":3.375}, {"label":"3,1", "x":1.5, "y":3.5}, {"label":"3,5", "x":5.5, "y":3.5}, {"label":"5,5", "x":6.5, "y":3.5}, {"label":"11,0", "x":9, "y":3.5}, {"label":"9,0", "x":10, "y":3.5}, {"label":"9,4", "x":14, "y":3.5}, {"label":"3,0", "x":0.5, "y":3.675}, {"label":"9,5", "x":15, "y":3.675}, {"label":"4,2", "x":3.2, "y":4.3}, {"label":"10,3", "x":12.3, "y":4.3}, {"label":"4,3", "x":4.2, "y":4.4}, {"label":"10,2", "x":11.3, "y":4.4}, {"label":"4,1", "x":2.2, "y":4.5}, {"label":"4,5", "x":6.3, "y":4.5, "h":1.5}, {"label":"10,0", "x":9.2, "y":4.5, "h":1.5}, {"label":"10,4", "x":13.3, "y":4.5}, {"label":"4,4", "x":5.2, "y":4.6}, {"label":"10,1", "x":10.3, "y":4.6}]
+    }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/murcielago/murcielago.c b/keyboards/murcielago/murcielago.c
new file mode 100644
index 000000000..30215c69c
--- /dev/null
+++ b/keyboards/murcielago/murcielago.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 elagil
+ *
+ * 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/>.
+ */
+
+#include "murcielago.h"
\ No newline at end of file
diff --git a/keyboards/murcielago/murcielago.h b/keyboards/murcielago/murcielago.h
new file mode 100644
index 000000000..458df972f
--- /dev/null
+++ b/keyboards/murcielago/murcielago.h
@@ -0,0 +1,49 @@
+/* Copyright 2020 elagil
+ *
+ * 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
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.k
+ */
+
+#define LAYOUT( \
+      L00, L01, L02, L03, L04, L05,           R01, R02, R03, R04, R05, R06, \
+      L10, L11, L12, L13, L14, L15,           R11, R12, R13, R14, R15, R16, \
+      L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, \
+      L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+           L41, L42, L43, L44, L45,           R41, R42, R43, R44, R45       \
+) { \
+    { L00,   L01,   L02,   L03,   L04,   L05 },\
+    { L10,   L11,   L12,   L13,   L14,   L15 },\
+    { L20,   L21,   L22,   L23,   L24,   L25 },\
+    { L30,   L31,   L32,   L33,   L34,   L35 },\
+    { KC_NO, L41,   L42,   L43,   L44,   L45 },\
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L36 },\
+    { R01,   R02,   R03,   R04,   R05,   R06 },\
+    { R11,   R12,   R13,   R14,   R15,   R16 },\
+    { R21,   R22,   R23,   R24,   R25,   R26 },\
+    { R31,   R32,   R33,   R34,   R35,   R36 },\
+    { R41,   R42,   R43,   R44,   R45,   KC_NO },\
+    { R30,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
diff --git a/keyboards/murcielago/readme.md b/keyboards/murcielago/readme.md
new file mode 100644
index 000000000..f7208c166
--- /dev/null
+++ b/keyboards/murcielago/readme.md
@@ -0,0 +1,12 @@
+# Murciélago (the bat)
+
+The Murciélago is a split ortholinear keyboard with 60 keys in a 6x4 layout + 6 thumb keys (per side). At the upper thumb positions, rotary encoders can be used instead of switches. A single-color backlight may be used as a layer indicator.
+
+* Keyboard Maintainer: [elagil](https://github.com/elagil)
+* Hardware Supported: [murcielago](https://github.com/elagil/murcielago)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make murcielago/rev1:default
+    
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h
new file mode 100644
index 000000000..425c79e6c
--- /dev/null
+++ b/keyboards/murcielago/rev1/config.h
@@ -0,0 +1,97 @@
+/*
+Copyright 2020 elagil
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x6166  // af
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0002
+#define MANUFACTURER elagil
+#define PRODUCT Murciélago
+#define DESCRIPTION A custom keyboard with 60 keys
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 6
+
+/* split options, use EEPROM for side detection */
+#define EE_HANDS
+#define SPLIT_USB_DETECT
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, D5, B3, B2, B1, B0 }
+#define MATRIX_COL_PINS { C6, B6, B5, D7, D6, D4 }
+#define MATRIX_ROW_PINS_RIGHT { B3, B7, D4, B6, C6, C7 }
+#define MATRIX_COL_PINS_RIGHT { D6, D7, D3, B2, B1, B0 }
+
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODERS_PAD_A_RIGHT { F6 }
+#define ENCODERS_PAD_B_RIGHT { F7 }
+
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/murcielago/rev1/keymaps/default/keymap.c b/keyboards/murcielago/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000..b3abed763
--- /dev/null
+++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c
@@ -0,0 +1,130 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    BASE,
+    _RAISE,
+    _LOWER,
+    _POWER
+};
+
+#define PRE_WRD LCTL(KC_LEFT)  // jump to next word
+#define NXT_WRD LCTL(KC_RGHT)  // jump to previous word
+
+#define NXT_WDL LCTL(KC_DEL)   // delete next word
+#define PRE_WDL LCTL(KC_BSPC)  // delete previous word
+
+#define KC_EURO ALGR(KC_5)
+#define LA_CAP MT(MOD_LALT, KC_CAPS) // Left alt on hold, caps lock on tap
+#define RA_ENT MT(MOD_RALT, KC_ENT)  // Right alt on hold, enter on tap
+
+#define RAISE MO(_RAISE) // Raise layer access
+#define LOWER MO(_LOWER) // Lower layer access
+#define POWER MO(_POWER) // Power layer access (raise and lower)
+
+/*
+ * This default keymap is aimed at users of the US international layout
+ */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* BASE
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       |  =+  |  1!  |  2@  |  3#  |  4$  |  5%  |                        |  6^  |  7&  |  8*  |  9(  |  0)  |  -_  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |  [{  |  Q   |  W   |  E   |  R   |  T   |                        |   Y  |   U  |   I  |   O  |   P  |  }]  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       | Del  |  A   |  S   |  D   |  F   |  G   |                        |   H  |   J  |   K  |   L  |  ;:  |  '"  |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       | Sft  |  Z   |  X   |  C   |  V   |  B   | GEsc |          |  Tab |   N  |   M  |  ,<  |  .>  |  /?  |  Sft |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  | LA/CL| LGUI |LOWER | Back | Ctrl |                |RA/Ent|Space |RAISE | RGUI | Play |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [BASE] = LAYOUT( /* qwerty */
+    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+    KC_LBRC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC,
+    KC_DEL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GESC, KC_TAB,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+             LA_CAP,  KC_LGUI, LOWER,   KC_BSPC, KC_LCTL,                   RA_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_MPLY
+  ),
+
+  /* RAISE
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  !   |  @   |  #   |  $   |  %   |                        |      |PRE W |  UP  |NXT W |      | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  |   |  (   |  [   |  {   |  <   |                        |      | LEFT | DOWN |RIGHT |      |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |  ~   |  =   |  +   |  \   |      |      |          |      |      |DEL PW| Ins  |DEL NW|      |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |POWER |      |      |                |      |      |      |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_RAISE] = LAYOUT( /* raise layer */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   XXXXXXX, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX, KC_F12,
+    _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK,                   XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,  
+    _______, KC_TILD, KC_EQL,  KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______,
+             _______, _______, POWER,   _______, _______,                   _______, _______, _______, _______, _______
+  ),
+
+  /* LOWER
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |      |PRE W |  UP  |NXT W |      |                        |   ^  |   &  |   *  |   €  |   ?  | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |      | LEFT | DOWN |RIGHT |      |                        |   >  |   }  |   ]  |   )  |   |  |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |      |DEL PW| Ins  |DEL NW|      |      |          |      |      |   /  |   -  |   _  |   `  |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |      |      |      |                |      |      |POWER |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_LOWER] = LAYOUT( /* lower layer */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, XXXXXXX, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12,
+    _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX,                   KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX,  
+    _______, XXXXXXX, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV,  _______,
+             _______, _______, _______, _______, _______,                   _______, _______, POWER,   _______, _______
+  ),
+
+  /* POWER
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  !   |  @   |  #   |  $   |  %   |                        |   ^  |   &  |   *  |   €  |   ?  | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  |   |  (   |  [   |  {   |  <   |                        |   >  |   }  |   ]  |   )  |   |  |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |  ~   |  =   |  +   |  \   |      |      |          |      |      |   /  |   -  |   _  |   `  |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |      |      |      |                |      |      |      |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_POWER] = LAYOUT( /* lower and raise combined */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12,
+    _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK,                   KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX,  
+    _______, KC_TILD, KC_EQL,  KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV,  _______,
+             _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______
+  )
+
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case _RAISE:
+            if (index == 0 || index == 1) { /* Left or right encoder */
+                // Next/previous track
+                clockwise ? tap_code(KC_MNXT) : tap_code(KC_MPRV);
+            }
+            break;
+
+        default:
+            if (index == 0 || index == 1) { /* Left or right encoder */
+                // Volume up or down
+                clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
+            }
+            break;
+    }
+}
\ No newline at end of file
diff --git a/keyboards/murcielago/rev1/keymaps/via/keymap.c b/keyboards/murcielago/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000..b3abed763
--- /dev/null
+++ b/keyboards/murcielago/rev1/keymaps/via/keymap.c
@@ -0,0 +1,130 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    BASE,
+    _RAISE,
+    _LOWER,
+    _POWER
+};
+
+#define PRE_WRD LCTL(KC_LEFT)  // jump to next word
+#define NXT_WRD LCTL(KC_RGHT)  // jump to previous word
+
+#define NXT_WDL LCTL(KC_DEL)   // delete next word
+#define PRE_WDL LCTL(KC_BSPC)  // delete previous word
+
+#define KC_EURO ALGR(KC_5)
+#define LA_CAP MT(MOD_LALT, KC_CAPS) // Left alt on hold, caps lock on tap
+#define RA_ENT MT(MOD_RALT, KC_ENT)  // Right alt on hold, enter on tap
+
+#define RAISE MO(_RAISE) // Raise layer access
+#define LOWER MO(_LOWER) // Lower layer access
+#define POWER MO(_POWER) // Power layer access (raise and lower)
+
+/*
+ * This default keymap is aimed at users of the US international layout
+ */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* BASE
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       |  =+  |  1!  |  2@  |  3#  |  4$  |  5%  |                        |  6^  |  7&  |  8*  |  9(  |  0)  |  -_  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |  [{  |  Q   |  W   |  E   |  R   |  T   |                        |   Y  |   U  |   I  |   O  |   P  |  }]  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       | Del  |  A   |  S   |  D   |  F   |  G   |                        |   H  |   J  |   K  |   L  |  ;:  |  '"  |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       | Sft  |  Z   |  X   |  C   |  V   |  B   | GEsc |          |  Tab |   N  |   M  |  ,<  |  .>  |  /?  |  Sft |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  | LA/CL| LGUI |LOWER | Back | Ctrl |                |RA/Ent|Space |RAISE | RGUI | Play |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [BASE] = LAYOUT( /* qwerty */
+    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+    KC_LBRC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC,
+    KC_DEL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GESC, KC_TAB,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+             LA_CAP,  KC_LGUI, LOWER,   KC_BSPC, KC_LCTL,                   RA_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_MPLY
+  ),
+
+  /* RAISE
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  !   |  @   |  #   |  $   |  %   |                        |      |PRE W |  UP  |NXT W |      | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  |   |  (   |  [   |  {   |  <   |                        |      | LEFT | DOWN |RIGHT |      |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |  ~   |  =   |  +   |  \   |      |      |          |      |      |DEL PW| Ins  |DEL NW|      |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |POWER |      |      |                |      |      |      |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_RAISE] = LAYOUT( /* raise layer */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   XXXXXXX, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX, KC_F12,
+    _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK,                   XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,  
+    _______, KC_TILD, KC_EQL,  KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______,
+             _______, _______, POWER,   _______, _______,                   _______, _______, _______, _______, _______
+  ),
+
+  /* LOWER
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |      |PRE W |  UP  |NXT W |      |                        |   ^  |   &  |   *  |   €  |   ?  | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |      | LEFT | DOWN |RIGHT |      |                        |   >  |   }  |   ]  |   )  |   |  |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |      |DEL PW| Ins  |DEL NW|      |      |          |      |      |   /  |   -  |   _  |   `  |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |      |      |      |                |      |      |POWER |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_LOWER] = LAYOUT( /* lower layer */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, XXXXXXX, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12,
+    _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX,                   KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX,  
+    _______, XXXXXXX, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV,  _______,
+             _______, _______, _______, _______, _______,                   _______, _______, POWER,   _______, _______
+  ),
+
+  /* POWER
+   *       ,-----------------------------------------.                        ,-----------------------------------------.
+   *       | RST  |  F1  |  F2  |  F3  |  F4  | F5   |                        | F6   |  F7  |  F8  |  F9  | F10  | F11  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  !   |  @   |  #   |  $   |  %   |                        |   ^  |   &  |   *  |   €  |   ?  | F12  |
+   *       |------+------+------+------+------+------|                        |------+------+------+------+------+------|
+   *       |      |  |   |  (   |  [   |  {   |  <   |                        |   >  |   }  |   ]  |   )  |   |  |      |
+   *       |------+------+------+------+------+------+------.          ,------+------+------+------+------+------+------|
+   *       |      |  ~   |  =   |  +   |  \   |      |      |          |      |      |   /  |   -  |   _  |   `  |      |
+   *       `------------------------------------------------'          `------------------------------------------------'
+   *                  |      |      |      |      |      |                |      |      |      |      |      |
+   *                  `----------------------------------'                `----------------------------------'
+   */
+  [_POWER] = LAYOUT( /* lower and raise combined */
+    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12,
+    _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK,                   KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX,  
+    _______, KC_TILD, KC_EQL,  KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV,  _______,
+             _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______
+  )
+
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case _RAISE:
+            if (index == 0 || index == 1) { /* Left or right encoder */
+                // Next/previous track
+                clockwise ? tap_code(KC_MNXT) : tap_code(KC_MPRV);
+            }
+            break;
+
+        default:
+            if (index == 0 || index == 1) { /* Left or right encoder */
+                // Volume up or down
+                clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
+            }
+            break;
+    }
+}
\ No newline at end of file
diff --git a/keyboards/murcielago/rev1/keymaps/via/rules.mk b/keyboards/murcielago/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000..036bd6d1c
--- /dev/null
+++ b/keyboards/murcielago/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk
new file mode 100644
index 000000000..f8faea6c3
--- /dev/null
+++ b/keyboards/murcielago/rev1/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+SPLIT_KEYBOARD = yes        # Enable split keyboard mode
+ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/murcielago/rules.mk b/keyboards/murcielago/rules.mk
new file mode 100644
index 000000000..661563697
--- /dev/null
+++ b/keyboards/murcielago/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = murcielago/rev1
\ No newline at end of file