[kle2info] Trim the code in kle2xy (#8955)

* [kle2jinfo] use min/max instead of if

This is a slight change.
Before, the key_skel would keep the invalid value for future keys.
I think this is what was actually intended.

* [kle2info] calculate x

x is the current_x * key_size + (key_size/2)
y is the current_y * key_size + (key_size/2)

no reason to track both

Makefile

@@ -29,6 +29,9 @@ $(info QMK Firmware $(QMK_VERSION))
 endif
 endif
 
+# avoid 'Entering|Leaving directory' messages
+MAKEFLAGS += --no-print-directory
+
 ON_ERROR := error_occurred=1
 
 BREAK_ON_ERRORS = no

docs/config_options.md

@@ -192,6 +192,9 @@ If you define these options you will enable the associated feature, which may in
   * run RGB animations
 * `#define RGBLIGHT_LAYERS`
   * Lets you define [lighting layers](feature_rgblight.md?id=lighting-layers) that can be toggled on or off. Great for showing the current keyboard layer or caps lock state.
+* `#define RGBLIGHT_MAX_LAYERS`
+  * Defaults to 8. Can be expanded up to 32 if more [lighting layers](feature_rgblight.md?id=lighting-layers) are needed.
+  * Note: Increasing the maximum will increase the firmware size and slow sync on split keyboards.
 * `#define RGBLIGHT_LAYER_BLINK` 
   * Adds ability to [blink](feature_rgblight.md?id=lighting-layer-blink) a lighting layer for a specified number of milliseconds (e.g. to acknowledge an action).
 * `#define RGBLED_NUM 12`

docs/feature_hd44780.md

@@ -50,7 +50,7 @@ LCD_DISP_ON_CURSOR_BLINK : display on, cursor on flashing
 ````
 This is best done in your keyboards `matrix_init_kb` or your keymaps `matrix_init_user`.  
 It is advised to clear the display before use.  
-To do so call `lcd_clrsrc()`.
+To do so call `lcd_clrscr()`.
 
 To now print something to your Display you first call `lcd_gotoxy(column, line)`. To go to the start of the first line you would call `lcd_gotoxy(0, 0)` and then print a string with `lcd_puts("example string")`.
 

docs/feature_rgblight.md

@@ -186,6 +186,8 @@ it easy to use your underglow LEDs as status indicators to show which keyboard l
 
 ### Defining Lighting Layers :id=defining-lighting-layers
 
+By default, 8 layers are possible. This can be expanded to as many as 32 by overriding the definition of `RGBLIGHT_MAX_LAYERS` in `config.h` (e.g. `#define RGBLIGHT_MAX_LAYERS 32`). Please note, if you use a split keyboard, you will need to flash both sides of the split after changing this. Also, increasing the maximum will increase the firmware size, and will slow sync on split keyboards.
+
 To define a layer, we modify `keymap.c` to list out LED ranges and the colors we want to overlay on them using an array of `rgblight_segment_t` using the `RGBLIGHT_LAYER_SEGMENTS` macro. We can define multiple layers and enable/disable them independently:
 
 ```c

docs/feature_swap_hands.md

@@ -28,3 +28,4 @@ Note that the array indices are reversed same as the matrix and the values are o
 |`SH_MOFF`  |Momentarily turns off swap.                                              |
 |`SH_TG`    |Toggles swap on and off with every key press.                            |
 |`SH_TT`    |Toggles with a tap; momentary when held.                                 |
+|`SH_OS`    |One shot swap hands: toggles while pressed or until next key press.      |

docs/isp_flashing_guide.md

@@ -115,12 +115,18 @@ The simplest and quickest way to get things back to normal is to flash only a bo
 
 You can find the stock bootloaders in the [`util/` folder](https://github.com/qmk/qmk_firmware/tree/master/util). Be sure to flash the correct bootloader for your chip:
 
-* [`atmega32u4`](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_atmega32u4_1_0_0.hex) - Most keyboards, Planck Rev 1-5, Preonic Rev 1-2
-* [`Pro Micro`](https://github.com/sparkfun/Arduino_Boards/blob/master/sparkfun/avr/bootloaders/caterina/Caterina-promicro16.hex) - The default bootloader for Pro Micro controllers
-* [`at90usb1286`](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_at90usb128x_1_0_1.hex) - Planck Light Rev 1
-* [`atmega32a`](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_atmega32a_1_0_0.hex) - jj40, and other V-USB/ps2avrGB keyboards
+* **Atmel DFU**
+  * [ATmega16U4](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_atmega16u4_1.0.1.hex)
+  * [ATmega32U4](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_atmega32u4_1.0.0.hex)
+  * [AT90USB64](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_at90usb64_1.0.0.hex)
+  * [AT90USB128](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_at90usb128_1.0.1.hex)
+* **Caterina**
+  * [Pro Micro (5V/16MHz)](https://github.com/sparkfun/Arduino_Boards/blob/master/sparkfun/avr/bootloaders/caterina/Caterina-promicro16.hex)
+  * [Pro Micro (3.3V/8MHz)](https://github.com/sparkfun/Arduino_Boards/blob/master/sparkfun/avr/bootloaders/caterina/Caterina-promicro8.hex)
+* **BootloadHID (PS2AVRGB)**
+  * [ATmega32A](https://github.com/qmk/qmk_firmware/blob/master/util/bootloader_ps2avrgb_bootloadhid_1.0.1.hex)
 
-If you're not sure what your board uses, look in the `rules.mk` file for the keyboard in QMK. The `MCU =` line will have the value you need. It may differ between different versions of the board.
+If you're not sure what your board uses, look in the `rules.mk` file for the keyboard in QMK. The `MCU` and `BOOTLOADER` lines will have the value you need. It may differ between different versions of the board.
 
 ### Production Techniques
 

docs/ja/feature_hd44780.md

@@ -55,7 +55,7 @@ LCD_DISP_ON_CURSOR_BLINK : ディスプレイオン、点滅カーソル
 ````
 これはキーボードの `matrix_init_kb` またはキーマップの `matrix_init_user` で行うのが最適です。
 使用前にディスプレイをクリアすることをお勧めします。
-そのためには、`lcd_clrsrc()` を呼びます。
+そのためには、`lcd_clrscr()` を呼びます。
 
 ディスプレイに何かを表示するには、最初に `lcd_gotoxy(column, line)` を呼びます。最初の行の先頭に移動するには、`lcd_gotoxy(0, 0)` を呼び出し、その後 `lcd_puts("example string")` を使って文字列を出力します。
 

docs/keycodes.md

@@ -531,6 +531,7 @@ See also: [Swap Hands](feature_swap_hands.md)
 |`SH_MOFF`  |Momentarily turns off swap.                                              |
 |`SH_TG`    |Toggles swap on and off with every key press.                            |
 |`SH_TT`    |Toggles with a tap; momentary when held.                                 |
+|`SH_OS`    |One shot swap hands: toggle while pressed or until next key press.       |
 
 ## Unicode Support :id=unicode-support
 

keyboards/aves65/aves65.c

@@ -0,0 +1 @@
+#include "aves65.h"

keyboards/aves65/aves65.h

@@ -0,0 +1,19 @@
+#pragma once
+#include "quantum.h"
+
+// readability
+#define ___ KC_NO
+#define LAYOUT_65_iso_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d, k4e }  \
+}

keyboards/aves65/config.h

@@ -0,0 +1,61 @@
+/*
+Copyright 2019 I/O Keyboards <hello@iokeyboards.eu>
+
+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       0x9991
+#define PRODUCT_ID      0x9038
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    I/O Keyboards
+#define PRODUCT         Aves65
+#define DESCRIPTION     A 65% keyboard with underglow.
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {D4,D6,D7,B4,E6}
+#define MATRIX_COL_PINS {D0,D1,D2,D3,D5,B5,F0,F1,F4,F5,F6,F7,C7,C6,B6}
+#define UNUSED_PINS {B7,B1,B2,B3}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't 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
+
+/* Backlight configuration
+ */
+#define RGB_DI_PIN B0
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 9
+
+#define QMK_ESC_OUTPUT D0 // usually COL
+#define QMK_ESC_INPUT D4 // usually ROW

keyboards/aves65/info.json

@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Aves65", 
+    "url": "", 
+    "maintainer": "Hund", 
+    "width": 16, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+                {"label":"k0c", "x":12, "y":0},
+                {"label":"k0d", "x":13, "y":0, "w":2},
+                {"label":"k0e", "x":15, "y":0},
+                
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k11", "x":1.5, "y":1},
+                {"label":"k12", "x":2.5, "y":1},
+                {"label":"k13", "x":3.5, "y":1},
+                {"label":"k14", "x":4.5, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":6.5, "y":1},
+                {"label":"k17", "x":7.5, "y":1},
+                {"label":"k18", "x":8.5, "y":1},
+                {"label":"k19", "x":9.5, "y":1},
+                {"label":"k1a", "x":10.5, "y":1},
+                {"label":"k1b", "x":11.5, "y":1},
+                {"label":"k1c", "x":12.5, "y":1},
+                {"label":"k1e", "x":15, "y":1},
+                
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k21", "x":1.75, "y":2},
+                {"label":"k22", "x":2.75, "y":2},
+                {"label":"k23", "x":3.75, "y":2},
+                {"label":"k24", "x":4.75, "y":2},
+                {"label":"k25", "x":5.75, "y":2},
+                {"label":"k26", "x":6.75, "y":2},
+                {"label":"k27", "x":7.75, "y":2},
+                {"label":"k28", "x":8.75, "y":2},
+                {"label":"k29", "x":9.75, "y":2},
+                {"label":"k2a", "x":10.75, "y":2},
+                {"label":"k2b", "x":11.75, "y":2},
+                {"label":"k2c", "x":12.75, "y":2},
+                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"k2e", "x":15, "y":2},
+                
+                {"label":"k30", "x":0, "y":3, "w":1.25},
+                {"label":"k31", "x":1.25, "y":3},
+                {"label":"k32", "x":2.25, "y":3},
+                {"label":"k33", "x":3.25, "y":3},
+                {"label":"k34", "x":4.25, "y":3},
+                {"label":"k35", "x":5.25, "y":3},
+                {"label":"k36", "x":6.25, "y":3},
+                {"label":"k37", "x":7.25, "y":3},
+                {"label":"k38", "x":8.25, "y":3},
+                {"label":"k39", "x":9.25, "y":3},
+                {"label":"k3a", "x":10.25, "y":3},
+                {"label":"k3b", "x":11.25, "y":3},
+                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
+                {"label":"k3d", "x":14, "y":3},
+                {"label":"k3e", "x":15, "y":3},
+                
+                {"label":"k40", "x":0, "y":4, "w":1.25},
+                {"label":"k41", "x":1.25, "y":4, "w":1.25},
+                {"label":"k42", "x":2.5, "y":4, "w":1.25},
+                {"label":"k46", "x":3.75, "y":4, "w":6.25},
+                {"label":"k4a", "x":10, "y":4, "w":1.25},
+                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
+                {"label":"k4c", "x":13, "y":4},
+                {"label":"k4d", "x":14, "y":4},
+                {"label":"k4e", "x":15, "y":4}
+            ]
+        }
+    }
+}

keyboards/aves65/keymaps/default/keymap.c

@@ -0,0 +1,18 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_65_iso_blocker(
+  KC_ESC,  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_BSPC, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_DEL,
+  KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS,  KC_ENT,  KC_PGUP,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,   KC_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                          KC_RALT, KC_RCTRL, KC_LEFT,  KC_DOWN, KC_RGHT)
+  
+};

keyboards/aves65/readme.md

@@ -0,0 +1,15 @@
+# Aves65
+
+![Aves65](https://i.imgur.com/H7x8an7l.jpg)
+
+A 65% hotswap keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Hund](https://github.com/Hund)
+* Hardware Supported: Aves65
+* Hardware Availability: none (yet)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aves65: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).

keyboards/aves65/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 = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # 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 = yes       # 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
+
+LAYOUTS = 65_iso_blocker

keyboards/crkbd/ssd1306.c

@@ -15,6 +15,14 @@
 
 extern const unsigned char font[] PROGMEM;
 
+#ifndef OLED_BLANK_CHAR
+#define OLED_BLANK_CHAR ' '
+#endif
+
+#ifndef OLED_BITS_FILTER
+#define OLED_BITS_FILTER
+#endif
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes
@@ -26,8 +34,11 @@ extern const unsigned char font[] PROGMEM;
 //#define BatteryUpdateInterval 10000 /* milliseconds */
 
 // 'last_flush' is declared as uint16_t,
-// so this must be less than 65535 
+// so this must be less than 65535
+#ifndef ScreenOffInterval
 #define ScreenOffInterval 60000 /* milliseconds */
+#endif
+
 #if DEBUG_TO_SCREEN
 static uint8_t displaying;
 #endif
@@ -61,38 +72,32 @@ done:
   return res;
 }
 
-// Write 2-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  return _send_cmd1(opr);
-}
-
-// Write 3-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  if (!_send_cmd1(opr1)) {
-    return false;
-  }
-  return _send_cmd1(opr2);
-}
-
 #define send_cmd1(c) if (!_send_cmd1(c)) {goto done;}
-#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;}
-#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;}
+#define send_cmds(c) if (!_send_cmds(c,sizeof(c))) {goto done;}
+#define cmd1(X) X
+#define cmd2(X,Y) X,Y
+#define cmd3(X,Y,Z) X,Y,Z
+
+static bool _send_cmds(const uint8_t* p,uint8_t sz) {
+  for(uint8_t i=sz;i;i--) {
+    send_cmd1( pgm_read_byte(p++) );
+  }
+  return true;
+done:
+  return false;
+}
+
+#define SEND_CMDS(...) {static const uint8_t _cmds[] PROGMEM = { __VA_ARGS__,0 };send_cmds(_cmds);}
 
 static void clear_display(void) {
   matrix_clear(&display);
 
   // Clear all of the display bits (there can be random noise
   // in the RAM on startup)
-  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
-  send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
+  SEND_CMDS(
+    cmd3(PageAddr, 0, (DisplayHeight / 8) - 1),
+    cmd3(ColumnAddr, 0, DisplayWidth - 1)
+  );
 
   if (i2c_start_write(SSD1306_ADDRESS)) {
     goto done;
@@ -101,8 +106,8 @@ static void clear_display(void) {
     // Data mode
     goto done;
   }
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < DisplayWidth; ++col) {
+  for (uint8_t row = MatrixRows;row; row--) {
+    for (uint8_t col = DisplayWidth; col; col--) {
       i2c_master_write(0);
     }
   }
@@ -130,38 +135,47 @@ bool iota_gfx_init(bool rotate) {
   bool success = false;
 
   i2c_master_init();
-  send_cmd1(DisplayOff);
-  send_cmd2(SetDisplayClockDiv, 0x80);
-  send_cmd2(SetMultiPlex, DisplayHeight - 1);
-
-  send_cmd2(SetDisplayOffset, 0);
-
-
-  send_cmd1(SetStartLine | 0x0);
-  send_cmd2(SetChargePump, 0x14 /* Enable */);
-  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
+  SEND_CMDS( 
+    cmd1(DisplayOff),
+    cmd2(SetDisplayClockDiv, 0x80),
+    cmd2(SetMultiPlex, DisplayHeight - 1),
+    cmd2(SetDisplayOffset, 0),
+    cmd1(SetStartLine | 0x0),
+    cmd2(SetChargePump, 0x14 /* Enable */),
+    cmd2(SetMemoryMode, 0 /* horizontal addressing */)
+  );
 
   if(rotate){
     // the following Flip the display orientation 180 degrees
-    send_cmd1(SegRemap);
-    send_cmd1(ComScanInc);
+  SEND_CMDS( 
+    cmd1(SegRemap),
+    cmd1(ComScanInc)
+  );
   }else{
     // Flips the display orientation 0 degrees
-    send_cmd1(SegRemap | 0x1);
-    send_cmd1(ComScanDec);
+  SEND_CMDS( 
+      cmd1(SegRemap | 0x1),
+      cmd1(ComScanDec)
+    );
   }
 
-  send_cmd2(SetComPins, 0x2);
-  send_cmd2(SetContrast, 0x8f);
-  send_cmd2(SetPreCharge, 0xf1);
-  send_cmd2(SetVComDetect, 0x40);
-  send_cmd1(DisplayAllOnResume);
-  send_cmd1(NormalDisplay);
-  send_cmd1(DeActivateScroll);
-  send_cmd1(DisplayOn);
-
-  send_cmd2(SetContrast, 0); // Dim
-
+  SEND_CMDS( 
+#ifdef SSD1306_128X64
+	cmd2(SetComPins, 0x12),
+#else
+	cmd2(SetComPins, 0x2),
+#endif
+    cmd2(SetContrast, 0x8f),
+    cmd2(SetPreCharge, 0xf1),
+    cmd2(SetVComDetect, 0x40),
+    cmd1(DisplayAllOnResume),
+    cmd1(NormalDisplay),
+    cmd1(DeActivateScroll),
+    cmd1(DisplayOn),
+  
+    cmd2(SetContrast, 0) // Dim
+  );
+  
   clear_display();
 
   success = true;
@@ -205,7 +219,7 @@ void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
     memmove(&matrix->display[0], &matrix->display[1],
             MatrixCols * (MatrixRows - 1));
     matrix->cursor = &matrix->display[MatrixRows - 1][0];
-    memset(matrix->cursor, ' ', MatrixCols);
+    memset(matrix->cursor, OLED_BLANK_CHAR, MatrixCols);
   }
 }
 
@@ -218,7 +232,7 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
     uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
 
     while (cursor_col++ < MatrixCols) {
-      matrix_write_char_inner(matrix, ' ');
+      matrix_write_char_inner(matrix, OLED_BLANK_CHAR);
     }
     return;
   }
@@ -231,17 +245,15 @@ void iota_gfx_write_char(uint8_t c) {
 }
 
 void matrix_write(struct CharacterMatrix *matrix, const char *data) {
-  const char *end = data + strlen(data);
-  while (data < end) {
+  while (*data) {
     matrix_write_char(matrix, *data);
     ++data;
   }
 }
 
 void matrix_write_ln(struct CharacterMatrix *matrix, const char *data) {
-  char data_ln[strlen(data)+2];
-  snprintf(data_ln, sizeof(data_ln), "%s\n", data);
-  matrix_write(matrix, data_ln);
+  matrix_write(matrix, data);
+  matrix_write(matrix, "\n");
 }
 
 void iota_gfx_write(const char *data) {
@@ -264,7 +276,7 @@ void iota_gfx_write_P(const char *data) {
 }
 
 void matrix_clear(struct CharacterMatrix *matrix) {
-  memset(matrix->display, ' ', sizeof(matrix->display));
+  memset(matrix->display, OLED_BLANK_CHAR, sizeof(matrix->display));
   matrix->cursor = &matrix->display[0][0];
   matrix->dirty = true;
 }
@@ -281,8 +293,10 @@ void matrix_render(struct CharacterMatrix *matrix) {
 #endif
 
   // Move to the home position
-  send_cmd3(PageAddr, 0, MatrixRows - 1);
-  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
+  SEND_CMDS(
+    cmd3(PageAddr, 0, MatrixRows - 1),
+    cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1)
+  );
 
   if (i2c_start_write(SSD1306_ADDRESS)) {
     goto done;
@@ -298,7 +312,7 @@ void matrix_render(struct CharacterMatrix *matrix) {
 
       for (uint8_t glyphCol = 0; glyphCol < FontWidth; ++glyphCol) {
         uint8_t colBits = pgm_read_byte(glyph + glyphCol);
-        i2c_master_write(colBits);
+        i2c_master_write(colBits OLED_BITS_FILTER);
       }
 
       // 1 column of space between chars (it's not included in the glyph)
@@ -331,7 +345,7 @@ void iota_gfx_task(void) {
     force_dirty = false;
   }
 
-  if (timer_elapsed(last_flush) > ScreenOffInterval) {
+  if (ScreenOffInterval !=0 && timer_elapsed(last_flush) > ScreenOffInterval) {
     iota_gfx_off();
   }
 }

keyboards/eniigmakeyboards/ek87/rules.mk

@@ -16,7 +16,7 @@ BOOTLOADER = atmel-dfu
 #
 BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+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

keyboards/exclusive/e6v2/le_bmc/info.json

@@ -6,7 +6,7 @@
     "height": 5, 
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.26}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
@@ -21,4 +21,4 @@
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
         }
     }
-}
+}

keyboards/exclusive/e6v2/oe_bmc/info.json

@@ -6,7 +6,7 @@
     "height": 5, 
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.26}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
@@ -21,4 +21,4 @@
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
         }
     }
-}
+}

keyboards/flx/lodestone/info.json

@@ -68,7 +68,7 @@
                 {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (F1,C6)", "x":14, "y":3},
                 {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.225},
+                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
@@ -139,7 +139,7 @@
                 {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (F1,C6)", "x":14, "y":3},
                 {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.225},
+                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
@@ -211,7 +211,7 @@
                 {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (F1,C6)", "x":14, "y":3},
                 {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.225},
+                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
@@ -283,7 +283,7 @@
                 {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (F1,C6)", "x":14, "y":3},
                 {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.225},
+                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
@@ -356,7 +356,7 @@
                 {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3E (F1,C6)", "x":14, "y":3},
                 {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.225},
+                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},

keyboards/handwired/prime_exl/info.json

@@ -6,7 +6,7 @@
   "height": 6,
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.26,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}]
+          "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.25,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}]
       }
   }
 }

keyboards/massdrop/ctrl/info.json

@@ -83,9 +83,9 @@
               {"label":"FORWARD SLASH", "x":11.25, "y":4.5},
               {"label":"RIGHT SHIFT", "x":12.25, "y":4.5, "w":2.75},
               {"label":"UP ARROW", "x":16.5, "y":4.5},
-              {"label":"LEFT CTRL", "x":0.005, "y":5.5, "w":1.24},
-              {"label":"LEFT WIN", "x":1.255, "y":5.5, "w":1.24},
-              {"label":"LEFT ALT", "x":2.505, "y":5.5, "w":1.24},
+              {"label":"LEFT CTRL", "x":0.005, "y":5.5, "w":1.25},
+              {"label":"LEFT WIN", "x":1.255, "y":5.5, "w":1.25},
+              {"label":"LEFT ALT", "x":2.505, "y":5.5, "w":1.25},
               {"label":"SPACEBAR", "x":3.75, "y":5.5, "w":6.25},
               {"label":"RIGHT ALT", "x":10, "y":5.5, "w":1.25},
               {"label":"FN", "x":11.25, "y":5.5, "w":1.25},

keyboards/murcielago/info.json

@@ -0,0 +1,73 @@
+{
+  "keyboard_name": "Murciélago",
+  "url": "",
+  "maintainer": "elagil",
+  "width": 15,
+  "height": 5.75,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [ 
+        {"label":"0,0", "x":0, "y":0.425},
+        {"label":"0,1", "x":1, "y":0.25},
+        {"label":"0,2", "x":2, "y":0.125},
+        {"label":"0,3", "x":3, "y":0.0},
+        {"label":"0,4", "x":4, "y":0.125},
+        {"label":"0,5", "x":5, "y":0.25},
+        {"label":"6,0", "x":9, "y":0.25},
+        {"label":"6,1", "x":10, "y":0.125},
+        {"label":"6,2", "x":11, "y":0.0},
+        {"label":"6,3", "x":12, "y":0.125},
+        {"label":"6,4", "x":13, "y":0.25},
+        {"label":"6,5", "x":14, "y":0.425},
+        {"label":"1,0", "x":0, "y":1.425},
+        {"label":"1,1", "x":1, "y":1.25},
+        {"label":"1,2", "x":2, "y":1.125},
+        {"label":"1,3", "x":3, "y":1.0},
+        {"label":"1,4", "x":4, "y":1.125},
+        {"label":"1,5", "x":5, "y":1.25},
+        {"label":"7,0", "x":9, "y":1.25},
+        {"label":"7,1", "x":10, "y":1.125},
+        {"label":"7,2", "x":11, "y":1.0},
+        {"label":"7,3", "x":12, "y":1.125},
+        {"label":"7,4", "x":13, "y":1.25},
+        {"label":"7,5", "x":14, "y":1.425},
+        {"label":"2,0", "x":0, "y":2.425},
+        {"label":"2,1", "x":1, "y":2.25},
+        {"label":"2,2", "x":2, "y":2.125},
+        {"label":"2,3", "x":3, "y":2.0},
+        {"label":"2,4", "x":4, "y":2.125},
+        {"label":"2,5", "x":5, "y":2.25},
+        {"label":"8,0", "x":9, "y":2.25},
+        {"label":"8,1", "x":10, "y":2.125},
+        {"label":"8,2", "x":11, "y":2.0},
+        {"label":"8,3", "x":12, "y":2.125},
+        {"label":"8,4", "x":13, "y":2.25},
+        {"label":"8,5", "x":14, "y":2.425},
+        {"label":"3,0", "x":0, "y":3.425},
+        {"label":"3,1", "x":1, "y":3.25},
+        {"label":"3,2", "x":2, "y":3.125},
+        {"label":"3,3", "x":3, "y":3.0},
+        {"label":"3,4", "x":4, "y":3.125},
+        {"label":"3,5", "x":5, "y":3.25},
+        {"label":"5,5", "x":6, "y":3.25},
+        {"label":"11,0", "x":8, "y":3.25},
+        {"label":"9,0", "x":9, "y":3.25},
+        {"label":"9,1", "x":10, "y":3.125},
+        {"label":"9,2", "x":11, "y":3.0},
+        {"label":"9,3", "x":12, "y":3.125},
+        {"label":"9,4", "x":13, "y":3.25},
+        {"label":"9,5", "x":14, "y":3.425},
+        {"label":"4,1", "x":1.7, "y":4.25},
+        {"label":"4,2", "x":2.7, "y":4.05},
+        {"label":"4,3", "x":3.7, "y":4.15},
+        {"label":"4,4", "x":4.7, "y":4.35},
+        {"label":"4,5", "x":5.8, "y":4.25, "h":1.5},
+        {"label":"10,0", "x":8.2, "y":4.25, "h":1.5},
+        {"label":"10,1", "x":9.3, "y":4.35},
+        {"label":"10,2", "x":10.3, "y":4.15},
+        {"label":"10,3", "x":11.3, "y":4.05},
+        {"label":"10,4", "x":12.3, "y":4.25}
+      ]
+    }
+  }
+}

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"

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 } \
+}

keyboards/murcielago/readme.md

@@ -0,0 +1,16 @@
+# 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.
+
+* 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
+    
+For compiling a via-compatible keymap, use:
+
+    make murcielago/rev1:via
+    
+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).

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

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;
+    }
+}

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;
+    }
+}

keyboards/murcielago/rev1/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes