~ruther/qmk_firmware

da280739efa1d23346f9540044b8689a31ca8689 — Drashna Jael're 3 years ago 0d9a0d5 + 548a463 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
23 files changed, 532 insertions(+), 1980 deletions(-)

D keyboards/helix/rev1/.noci
D keyboards/helix/rev1/config.h
D keyboards/helix/rev1/info.json
D keyboards/helix/rev1/keymaps/OLED_sample/config.h
D keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
D keyboards/helix/rev1/keymaps/OLED_sample/readme.md
D keyboards/helix/rev1/keymaps/OLED_sample/rules.mk
D keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h
D keyboards/helix/rev1/keymaps/default/config.h
D keyboards/helix/rev1/keymaps/default/keymap.c
D keyboards/helix/rev1/matrix.c
D keyboards/helix/rev1/rev1.c
D keyboards/helix/rev1/rev1.h
D keyboards/helix/rev1/rules.mk
D keyboards/helix/rev1/serial_config.h
D keyboards/helix/rev1/split_util.c
D keyboards/helix/rev1/split_util.h
M keyboards/mokey/xox70/info.json
M keyboards/mokey/xox70/keymaps/default/keymap.c
M keyboards/mokey/xox70/keymaps/via/keymap.c
M keyboards/mokey/xox70/rules.mk
M keyboards/mokey/xox70/xox70.h
M quantum/quantum.c

D keyboards/helix/rev1/.noci => keyboards/helix/rev1/.noci +0 -0
D keyboards/helix/rev1/config.h => keyboards/helix/rev1/config.h +0 -86
@@ 1,86 0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID       0x3265
#define PRODUCT_ID      0x8000
#define DEVICE_VER      0x0001
#define MANUFACTURER    Yushakobo
#define PRODUCT         Helix Alpha

#include "serial_config.h"

#define HELIX_ROWS 5

/* key matrix size */
// Rows are doubled-up
#if HELIX_ROWS == 3
  #define MATRIX_ROWS 6
  #define MATRIX_ROW_PINS { D7, E6, B4 }
#elif HELIX_ROWS == 4
  #define MATRIX_ROWS 8
  #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
#elif HELIX_ROWS == 5
  #define MATRIX_ROWS 10
  #define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
#else
  #error "expected HELIX_ROWS 3 or 4 or 5"
#endif
#define MATRIX_COLS 6

// wiring of each half
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order

/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST

/* number of backlight levels */
// #define BACKLIGHT_LEVELS 3

/* 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

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

#define RGBLED_NUM 12    // Number of LEDs
/*
 * 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
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION


D keyboards/helix/rev1/info.json => keyboards/helix/rev1/info.json +0 -80
@@ 1,80 0,0 @@
{
    "keyboard_name": "Helix rev. 1",
    "url": "https://github.com/MakotoKurauchi/helix",
    "maintainer": "MakotoKurauchi",
    "layouts": {
        "LAYOUT": {
            "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": 7, "y": 0},
                {"x": 8, "y": 0},
                {"x": 9, "y": 0},
                {"x": 10, "y": 0},
                {"x": 11, "y": 0},
                {"x": 12, "y": 0},

                {"x": 0, "y": 1},
                {"x": 1, "y": 1},
                {"x": 2, "y": 1},
                {"x": 3, "y": 1},
                {"x": 4, "y": 1},
                {"x": 5, "y": 1},

                {"x": 7, "y": 1},
                {"x": 8, "y": 1},
                {"x": 9, "y": 1},
                {"x": 10, "y": 1},
                {"x": 11, "y": 1},
                {"x": 12, "y": 1},

                {"x": 0, "y": 2},
                {"x": 1, "y": 2},
                {"x": 2, "y": 2},
                {"x": 3, "y": 2},
                {"x": 4, "y": 2},
                {"x": 5, "y": 2},

                {"x": 7, "y": 2},
                {"x": 8, "y": 2},
                {"x": 9, "y": 2},
                {"x": 10, "y": 2},
                {"x": 11, "y": 2},
                {"x": 12, "y": 2},

                {"x": 0, "y": 3},
                {"x": 1, "y": 3},
                {"x": 2, "y": 3},
                {"x": 3, "y": 3},
                {"x": 4, "y": 3},
                {"x": 5, "y": 3},

                {"x": 7, "y": 3},
                {"x": 8, "y": 3},
                {"x": 9, "y": 3},
                {"x": 10, "y": 3},
                {"x": 11, "y": 3},
                {"x": 12, "y": 3},

                {"x": 0, "y": 4},
                {"x": 1, "y": 4},
                {"x": 2, "y": 4},
                {"x": 3, "y": 4},
                {"x": 4, "y": 4},
                {"x": 5, "y": 4},

                {"x": 7, "y": 4},
                {"x": 8, "y": 4},
                {"x": 9, "y": 4},
                {"x": 10, "y": 4},
                {"x": 11, "y": 4},
                {"x": 12, "y": 4}
            ]
        }
    }
}


D keyboards/helix/rev1/keymaps/OLED_sample/config.h => keyboards/helix/rev1/keymaps/OLED_sample/config.h +0 -51
@@ 1,51 0,0 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef CONFIG_USER_H
#define CONFIG_USER_H

/* Use I2C or Serial */

#define USE_I2C
#define USE_SERIAL
//#define USE_MATRIX_I2C

/* Select hand configuration */

#define MASTER_LEFT
// #define _MASTER_RIGHT
// #define EE_HANDS

#define SSD1306OLED

#define USE_SERIAL_PD2

#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100


#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

#endif


D keyboards/helix/rev1/keymaps/OLED_sample/keymap.c => keyboards/helix/rev1/keymaps/OLED_sample/keymap.c +0 -471
@@ 1,471 0,0 @@
#include QMK_KEYBOARD_H
#include "bootloader.h"
#include <LUFA/Drivers/Peripheral/TWI.h>
#ifdef AUDIO_ENABLE
  #include "audio.h"
#endif
#ifdef SSD1306OLED
  #include "ssd1306.h"
#endif

extern keymap_config_t keymap_config;

//Following line allows macro to read current RGB settings
extern rgblight_config_t rgblight_config;


// 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 _QWERTY 0
#define _COLEMAK 1
#define _DVORAK 2
#define _LOWER 3
#define _RAISE 4
#define _ADJUST 16

enum custom_keycodes {
  QWERTY = SAFE_RANGE,
  COLEMAK,
  DVORAK,
  LOWER,
  RAISE,
  ADJUST,
  BACKLIT,
  RGBLED_TOGGLE,
  RGBLED_STEP_MODE,
  RGBLED_INCREASE_HUE,
  RGBLED_DECREASE_HUE,
  RGBLED_INCREASE_SAT,
  RGBLED_DECREASE_SAT,
  RGBLED_INCREASE_VAL,
  RGBLED_DECREASE_VAL,
  M_SAMPLE
};

#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Qwerty
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_QWERTY] = LAYOUT( \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
      KC_ESC,  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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Colemak
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_COLEMAK] = LAYOUT( \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL, \
      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Dvorak
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_DVORAK] = LAYOUT( \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL, \
      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Lower
   * ,-----------------------------------------------------------------------------------.
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_LOWER] = LAYOUT( \
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
      ),

  /* Raise
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_RAISE] = LAYOUT( \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, \
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
      ),

  /* Adjust (Lower + Raise)
   * ,-----------------------------------------------------------------------------------.
   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |      |      |      |      |      |      |      |      |      |      |      |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      |      |      |      |      |
   * `-----------------------------------------------------------------------------------'
   */
  [_ADJUST] =  LAYOUT( \
      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
      _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
      )
};

#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Qwerty
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */

  [_QWERTY] = LAYOUT( \
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
      KC_ESC,  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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Colemak
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_COLEMAK] = LAYOUT( \
      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Dvorak
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_DVORAK] = LAYOUT( \
      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
      ),

  /* Lower
   * ,-----------------------------------------------------------------------------------.
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_LOWER] = LAYOUT( \
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
      ),

  /* Raise
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_RAISE] = LAYOUT( \
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
      ),

  /* Adjust (Lower + Raise)
   * ,-----------------------------------------------------------------------------------.
   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |      |      |      |      |      |      |      |      |      |      |      |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      |      |      |      |      |
   * `-----------------------------------------------------------------------------------'
   */
  [_ADJUST] =  LAYOUT( \
      _______, RESET,   _______, M_SAMPLE, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
      )
};

#else
#error "undefined keymaps"
#endif


#ifdef AUDIO_ENABLE

float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
float tone_plover[][2]     = SONG(PLOVER_SOUND);
float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
#endif

// define variables for reactive RGB
bool TOG_STATUS = false;
int RGB_current_mode;

void persistent_default_layer_set(uint16_t default_layer) {
  eeconfig_update_default_layer(default_layer);
  default_layer_set(default_layer);
}

// Setting ADJUST layer RGB back to default
void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
    rgblight_mode(RGB_current_mode);
    layer_on(layer3);
  } else {
    layer_off(layer3);
  }
}

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case QWERTY:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_qwerty);
        #endif
        persistent_default_layer_set(1UL<<_QWERTY);
      }
      return false;
      break;
    case COLEMAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_colemak);
        #endif
        persistent_default_layer_set(1UL<<_COLEMAK);
      }
      return false;
      break;
    case DVORAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_dvorak);
        #endif
        persistent_default_layer_set(1UL<<_DVORAK);
      }
      return false;
      break;
    case LOWER:
      if (record->event.pressed) {
          //not sure how to have keyboard check mode and set it to a variable, so my work around
          //uses another variable that would be set to true after the first time a reactive key is pressed.
        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
        } else {
          TOG_STATUS = !TOG_STATUS;
          rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
        }
        layer_on(_LOWER);
        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
      } else {
        rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
        TOG_STATUS = false;
        layer_off(_LOWER);
        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case RAISE:
      if (record->event.pressed) {
        //not sure how to have keyboard check mode and set it to a variable, so my work around
        //uses another variable that would be set to true after the first time a reactive key is pressed.
        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
        } else {
          TOG_STATUS = !TOG_STATUS;
          rgblight_mode(RGBLIGHT_MODE_SNAKE);
        }
        layer_on(_RAISE);
        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
      } else {
        rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
        layer_off(_RAISE);
        TOG_STATUS = false;
        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case ADJUST:
        if (record->event.pressed) {
          layer_on(_ADJUST);
        } else {
          layer_off(_ADJUST);
        }
        return false;
        break;
    case BACKLIT:
      if (record->event.pressed) {
        register_code(KC_RSFT);
        #ifdef BACKLIGHT_ENABLE
          backlight_step();
        #endif
      } else {
        unregister_code(KC_RSFT);
      }
      return false;
      break;
      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
    case RGB_MOD:
      if (record->event.pressed) {
        rgblight_mode(RGB_current_mode);
        rgblight_step();
        RGB_current_mode = rgblight_config.mode;
      }
      return false;
      break;
    case M_SAMPLE:
      if (record->event.pressed) {
        SEND_STRING("hello world");
      }
      return false;
  }
  return true;
}

void matrix_init_user(void) {
    #ifdef AUDIO_ENABLE
        startup_user();
    #endif
    RGB_current_mode = rgblight_config.mode;
}

//SSD1306 OLED init and update loop, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
void matrix_master_OLED_init (void) {
    TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
    iota_gfx_init(0);   // turns on the display
}

void matrix_scan_user(void) {
     iota_gfx_task();  // this is what updates the display continuously
}
#endif

#ifdef AUDIO_ENABLE

void startup_user()
{
    _delay_ms(20); // gets rid of tick
}

void shutdown_user()
{
    _delay_ms(150);
    stop_all_notes();
}

void music_on_user(void)
{
    music_scale_user();
}

void music_scale_user(void)
{
    PLAY_SONG(music_scale);
}

#endif


D keyboards/helix/rev1/keymaps/OLED_sample/readme.md => keyboards/helix/rev1/keymaps/OLED_sample/readme.md +0 -25
@@ 1,25 0,0 @@
SSD1306 OLED Display via I2C
======

Features
--------

Some features supported by the firmware:


* I2C connection between the two halves is required as the OLED display will use this connection as well. Note this
  requires pull-up resistors on the data and clock lines.
* OLED display will connect from either side


Wiring
------


Work in progress...


OLED Configuration
-------------------------------

Work in progress...


D keyboards/helix/rev1/keymaps/OLED_sample/rules.mk => keyboards/helix/rev1/keymaps/OLED_sample/rules.mk +0 -4
@@ 1,4 0,0 @@
EXTRAKEY_ENABLE = yes
NKRO_ENABLE = yes
RGBLIGHT_ENABLE = yes
SWAP_HANDS_ENABLE = no


D keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h => keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h +0 -9
@@ 1,9 0,0 @@
//// #error rev1/keymaps/OLED_sample serial config

#ifndef SOFT_SERIAL_PIN
/* Soft Serial defines */
#define SOFT_SERIAL_PIN D2

#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
#define SERIAL_MASTER_BUFFER_LENGTH 0
#endif


D keyboards/helix/rev1/keymaps/default/config.h => keyboards/helix/rev1/keymaps/default/config.h +0 -34
@@ 1,34 0,0 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

// place overrides here

/* Use I2C or Serial, not both */

#define USE_SERIAL
// #define USE_I2C

/* Select hand configuration */

#define MASTER_LEFT
// #define _MASTER_RIGHT
// #define EE_HANDS


D keyboards/helix/rev1/keymaps/default/keymap.c => keyboards/helix/rev1/keymaps/default/keymap.c +0 -342
@@ 1,342 0,0 @@
#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 _QWERTY 0
#define _COLEMAK 1
#define _DVORAK 2
#define _LOWER 3
#define _RAISE 4
#define _ADJUST 16

enum custom_keycodes {
  QWERTY = SAFE_RANGE,
  COLEMAK,
  DVORAK,
  LOWER,
  RAISE,
  ADJUST,
};

#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Qwerty
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_QWERTY] = LAYOUT(
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
      KC_ESC,  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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Colemak
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_COLEMAK] = LAYOUT(
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Dvorak
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_DVORAK] = LAYOUT(
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Lower
   * ,-----------------------------------------------------------------------------------.
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_LOWER] = LAYOUT(
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
      ),

  /* Raise
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_RAISE] = LAYOUT(
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
      ),

  /* Adjust (Lower + Raise)
   * ,-----------------------------------------------------------------------------------.
   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |      |      |      |      |      |      |      |      |      |      |      |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      |      |      |      |      |
   * `-----------------------------------------------------------------------------------'
   */
  [_ADJUST] =  LAYOUT(
      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
      _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
      )
};

#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Qwerty
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */

  [_QWERTY] = LAYOUT(
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
      KC_ESC,  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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Colemak
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_COLEMAK] = LAYOUT(
      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Dvorak
   * ,-----------------------------------------------------------------------------------.
   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
   * `-----------------------------------------------------------------------------------'
   */
  [_DVORAK] = LAYOUT(
      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),

  /* Lower
   * ,-----------------------------------------------------------------------------------.
   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_LOWER] = LAYOUT(
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
      ),

  /* Raise
   * ,-----------------------------------------------------------------------------------.
   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
   * `-----------------------------------------------------------------------------------'
   */
  [_RAISE] = LAYOUT(
      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
      ),

  /* Adjust (Lower + Raise)
   * ,-----------------------------------------------------------------------------------.
   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
   * |------+------+------+------+------+-------------+------+------+------+------+------|
   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
   * |------+------+------+------+------+------|------+------+------+------+------+------|
   * |      |      |      |      |      |      |      |      |      |      |      |      |
   * |------+------+------+------+------+------+------+------+------+------+------+------|
   * |      |      |      |      |      |             |      |      |      |      |      |
   * `-----------------------------------------------------------------------------------'
   */
  [_ADJUST] =  LAYOUT(
      _______, RESET,   _______, M_SAMPLE, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
      )
};

#else
#error "undefined keymaps"
#endif

#ifdef AUDIO_ENABLE
float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
#endif

void persistent_default_layer_set(uint16_t default_layer) {
  eeconfig_update_default_layer(default_layer);
  default_layer_set(default_layer);
}

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case QWERTY:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_qwerty);
        #endif
        persistent_default_layer_set(1UL<<_QWERTY);
      }
      return false;
      break;
    case COLEMAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_colemak);
        #endif
        persistent_default_layer_set(1UL<<_COLEMAK);
      }
      return false;
      break;
    case DVORAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_SONG(tone_dvorak);
        #endif
        persistent_default_layer_set(1UL<<_DVORAK);
      }
      return false;
      break;
    case LOWER:
      if (record->event.pressed) {
        layer_on(_LOWER);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      } else {
        layer_off(_LOWER);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case RAISE:
      if (record->event.pressed) {
        layer_on(_RAISE);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      } else {
        layer_off(_RAISE);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case ADJUST:
      if (record->event.pressed) {
        layer_on(_ADJUST);
      } else {
        layer_off(_ADJUST);
      }
      return false;
      break;
  }
  return true;
}


D keyboards/helix/rev1/matrix.c => keyboards/helix/rev1/matrix.c +0 -302
@@ 1,302 0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/

/*
 * scan matrix
 */
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <util/delay.h>
#include "print.h"
#include "debug.h"
#include "util.h"
#include "matrix.h"
#include "split_util.h"
#include "config.h"
#include "quantum.h"

#ifdef USE_MATRIX_I2C
#  include "i2c.h"
#else // USE_SERIAL
#  include "serial.h"
#endif

#ifndef DEBOUNCE
#  define DEBOUNCE	5
#endif

#define ERROR_DISCONNECT_COUNT 5

static uint8_t debouncing = DEBOUNCE;
static const int ROWS_PER_HAND = MATRIX_ROWS/2;
static uint8_t error_count = 0;

static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;

/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
static matrix_row_t matrix_debouncing[MATRIX_ROWS];

static matrix_row_t read_cols(void);
static void init_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);


__attribute__ ((weak))
void matrix_init_kb(void) {
    matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
    matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

inline
uint8_t matrix_rows(void)
{
    return MATRIX_ROWS;
}

inline
uint8_t matrix_cols(void)
{
    return MATRIX_COLS;
}

void matrix_init(void)
{
    debug_enable = true;
    debug_matrix = true;
    debug_mouse = true;
    // initialize row and col
    unselect_rows();
    init_cols();

    setPinOutput(B0);
    setPinOutput(D5);

    // initialize matrix state: all keys off
    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
        matrix[i] = 0;
        matrix_debouncing[i] = 0;
    }

    matrix_init_quantum();
}

uint8_t _matrix_scan(void)
{
    // Right hand is stored after the left in the matirx so, we need to offset it
    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);

    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
        select_row(i);
        _delay_us(30);  // without this wait read unstable value.
        matrix_row_t cols = read_cols();
        if (matrix_debouncing[i+offset] != cols) {
            matrix_debouncing[i+offset] = cols;
            debouncing = DEBOUNCE;
        }
        unselect_rows();
    }

    if (debouncing) {
        if (--debouncing) {
            _delay_ms(1);
        } else {
            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
                matrix[i+offset] = matrix_debouncing[i+offset];
            }
        }
    }

    return 1;
}

#ifdef USE_MATRIX_I2C

// Get rows from other half over i2c
int i2c_transaction(void) {
    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;

    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
    if (err) goto i2c_error;

    // start of matrix stored at 0x00
    err = i2c_master_write(0x00);
    if (err) goto i2c_error;

    // Start read
    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
    if (err) goto i2c_error;

    if (!err) {
        int i;
        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
        }
        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
        i2c_master_stop();
    } else {
i2c_error: // the cable is disconnceted, or something else went wrong
        i2c_reset_state();
        return err;
    }

    return 0;
}

#else // USE_SERIAL

int serial_transaction(void) {
    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;

    if (serial_update_buffers()) {
        return 1;
    }

    for (int i = 0; i < ROWS_PER_HAND; ++i) {
        matrix[slaveOffset+i] = serial_slave_buffer[i];
    }
    return 0;
}
#endif

uint8_t matrix_scan(void)
{
    int ret = _matrix_scan();



#ifdef USE_MATRIX_I2C
    if( i2c_transaction() ) {
#else // USE_SERIAL
    if( serial_transaction() ) {
#endif
        // turn on the indicator led when halves are disconnected
        writePinLow(D5);

        error_count++;

        if (error_count > ERROR_DISCONNECT_COUNT) {
            // reset other half if disconnected
            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
            for (int i = 0; i < ROWS_PER_HAND; ++i) {
                matrix[slaveOffset+i] = 0;
            }
        }
    } else {
        // turn off the indicator led on no error
        writePinHigh(D5);
        error_count = 0;
    }
    matrix_scan_quantum();
    return ret;
}

void matrix_slave_scan(void) {
    _matrix_scan();

    int offset = (isLeftHand) ? 0 : (MATRIX_ROWS / 2);

#ifdef USE_MATRIX_I2C
    for (int i = 0; i < ROWS_PER_HAND; ++i) {
        /* i2c_slave_buffer[i] = matrix[offset+i]; */
        i2c_slave_buffer[i] = matrix[offset+i];
    }
#else // USE_SERIAL
    for (int i = 0; i < ROWS_PER_HAND; ++i) {
        serial_slave_buffer[i] = matrix[offset+i];
    }
#endif
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
    return (matrix[row] & ((matrix_row_t)1<<col));
}

inline
matrix_row_t matrix_get_row(uint8_t row)
{
    return matrix[row];
}

void matrix_print(void)
{
    print("\nr/c 0123456789ABCDEF\n");
    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
        print_hex8(row); print(": ");
        print_bin_reverse16(matrix_get_row(row));
        print("\n");
    }
}

uint8_t matrix_key_count(void)
{
    uint8_t count = 0;
    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
        count += bitpop16(matrix[i]);
    }
    return count;
}

static void  init_cols(void)
{
    for(int x = 0; x < MATRIX_COLS; x++) {
        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
    }
}

static matrix_row_t read_cols(void)
{
    matrix_row_t result = 0;
    for(int x = 0; x < MATRIX_COLS; x++) {
        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
    }
    return result;
}

static void unselect_rows(void)
{
    for(int x = 0; x < ROWS_PER_HAND; x++) {
        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
    }
}

static void select_row(uint8_t row)
{
    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
}


D keyboards/helix/rev1/rev1.c => keyboards/helix/rev1/rev1.c +0 -10
@@ 1,10 0,0 @@
#include "helix.h"


#ifdef SSD1306OLED
#include "ssd1306.h"

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
	return process_record_gfx(keycode,record) && process_record_user(keycode, record);
}
#endif


D keyboards/helix/rev1/rev1.h => keyboards/helix/rev1/rev1.h +0 -129
@@ 1,129 0,0 @@
#pragma once

#include "helix.h"

#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
    #include <avr/io.h>
    #include <avr/interrupt.h>
#endif
#endif

#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
    #ifndef FLIP_HALF
        // Standard Keymap
        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
        #define LAYOUT( \
            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
        ) { \
            { L00, L01, L02, L03, L04, L05 }, \
            { L10, L11, L12, L13, L14, L15 }, \
            { L20, L21, L22, L23, L24, L25 }, \
            { R05, R04, R03, R02, R01, R00 }, \
            { R15, R14, R13, R12, R11, R10 }, \
            { R25, R24, R23, R22, R21, R20 } \
        }
    #else
        // Keymap with right side flipped
        // (TRRS jack on both halves are to the right)
        #define LAYOUT( \
            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
        ) { \
            { L00, L01, L02, L03, L04, L05 }, \
            { L10, L11, L12, L13, L14, L15 }, \
            { L20, L21, L22, L23, L24, L25 }, \
            { R00, R01, R02, R03, R04, R05 }, \
            { R10, R11, R12, R13, R14, R15 }, \
            { R20, R21, R22, R23, R24, R25 } \
        }
    #endif
#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
    #ifndef FLIP_HALF
        // Standard Keymap
        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
        #define LAYOUT( \
            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
        ) { \
            { L00, L01, L02, L03, L04, L05 }, \
            { L10, L11, L12, L13, L14, L15 }, \
            { L20, L21, L22, L23, L24, L25 }, \
            { L30, L31, L32, L33, L34, L35 }, \
            { R05, R04, R03, R02, R01, R00 }, \
            { R15, R14, R13, R12, R11, R10 }, \
            { R25, R24, R23, R22, R21, R20 }, \
            { R35, R34, R33, R32, R31, R30 } \
        }
    #else
        // Keymap with right side flipped
        // (TRRS jack on both halves are to the right)
        #define LAYOUT( \
            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
        ) { \
            { L00, L01, L02, L03, L04, L05 }, \
            { L10, L11, L12, L13, L14, L15 }, \
            { L20, L21, L22, L23, L24, L25 }, \
            { L30, L31, L32, L33, L34, L35 }, \
            { R00, R01, R02, R03, R04, R05 }, \
            { R10, R11, R12, R13, R14, R15 }, \
            { R20, R21, R22, R23, R24, R25 }, \
            { R30, R31, R32, R33, R34, R35 } \
        }
    #endif
#elif MATRIX_ROWS == 10 // HELIX_ROWS == 5
    #ifndef FLIP_HALF
        // Standard Keymap
        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
#define LAYOUT( \
    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
    L40, L41, L42, L43, L44, L45, R40, 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 }, \
    { L40, L41, L42, L43, L44, L45 }, \
    { R05, R04, R03, R02, R01, R00 }, \
    { R15, R14, R13, R12, R11, R10 }, \
    { R25, R24, R23, R22, R21, R20 }, \
    { R35, R34, R33, R32, R31, R30 }, \
    { R45, R44, R43, R42, R41, R40 } \
}
    #else
        // Keymap with right side flipped
        // (TRRS jack on both halves are to the right)
        #define LAYOUT( \
            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
            L40, L41, L42, L43, L44, L45, R40, 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 }, \
            { L40, L41, L42, L43, L44, L45 }, \
            { R00, R01, R02, R03, R04, R05 }, \
            { R10, R11, R12, R13, R14, R15 }, \
            { R20, R21, R22, R23, R24, R25 }, \
            { R30, R31, R32, R33, R34, R35 }, \
            { R40, R41, R42, R43, R44, R45 } \
        }
    #endif
#else
    #error "expected HELIX_ROWS 3 or 4 or 5"
#endif


D keyboards/helix/rev1/rules.mk => keyboards/helix/rev1/rules.mk +0 -11
@@ 1,11 0,0 @@
SRC += local_drivers/i2c.c
SRC += local_drivers/serial.c
SRC += local_drivers/ssd1306.c
KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers

CUSTOM_MATRIX = yes

SRC += rev1/matrix.c
SRC += rev1/split_util.c

BACKLIGHT_ENABLE = no


D keyboards/helix/rev1/serial_config.h => keyboards/helix/rev1/serial_config.h +0 -9
@@ 1,9 0,0 @@
/// #error rev1 serial config

#ifndef SOFT_SERIAL_PIN
/* Soft Serial defines */
#define SOFT_SERIAL_PIN D0

#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
#define SERIAL_MASTER_BUFFER_LENGTH 0
#endif


D keyboards/helix/rev1/split_util.c => keyboards/helix/rev1/split_util.c +0 -86
@@ 1,86 0,0 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <util/delay.h>
#include <avr/eeprom.h>
#include "split_util.h"
#include "matrix.h"
#include "keyboard.h"
#include "config.h"

#ifdef USE_MATRIX_I2C
#  include "i2c.h"
#else
#  include "serial.h"
#endif

volatile bool isLeftHand = true;

static void setup_handedness(void) {
  #ifdef EE_HANDS
    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
  #else
    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
      isLeftHand = !has_usb();
    #else
      isLeftHand = has_usb();
    #endif
  #endif
}

static void keyboard_master_setup(void) {
#ifdef USE_I2C
#ifdef SSD1306OLED
    matrix_master_OLED_init ();
#endif
#endif
#ifdef USE_MATRIX_I2C
    i2c_master_init();
#else
    serial_master_init();
#endif
}

static void keyboard_slave_setup(void) {
#ifdef USE_MATRIX_I2C
    i2c_slave_init(SLAVE_I2C_ADDRESS);
#else
    serial_slave_init();
#endif
}

bool has_usb(void) {
   USBCON |= (1 << OTGPADE); //enables VBUS pad
   _delay_us(5);
   return (USBSTA & (1<<VBUS));  //checks state of VBUS
}

void split_keyboard_setup(void) {
   setup_handedness();

   if (has_usb()) {
      keyboard_master_setup();
   } else {
      keyboard_slave_setup();
   }
   sei();
}

void keyboard_slave_loop(void) {
   matrix_init();

   while (1) {
      matrix_slave_scan();
   }
}

// this code runs before the usb and keyboard is initialized
void matrix_setup(void) {
    split_keyboard_setup();

    if (!has_usb()) {
        keyboard_slave_loop();
    }
}


D keyboards/helix/rev1/split_util.h => keyboards/helix/rev1/split_util.h +0 -21
@@ 1,21 0,0 @@
#pragma once

#include <stdbool.h>
#include "eeconfig.h"

#define SLAVE_I2C_ADDRESS           0x32

extern volatile bool isLeftHand;

// slave version of matix scan, defined in matrix.c
void matrix_slave_scan(void);

void split_keyboard_setup(void);
bool has_usb(void);
void keyboard_slave_loop(void);

void matrix_master_OLED_init (void);

// stubs as this is handled by legacy code
static inline void split_pre_init(void){}
static inline void split_post_init(void){}


M keyboards/mokey/xox70/info.json => keyboards/mokey/xox70/info.json +415 -232
@@ 3,245 3,428 @@
    "url": "",
    "maintainer": "Mokey",
    "layouts": {
        "LAYOUT": {
        "LAYOUT_all": {
            "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":"k0e", "x":13, "y":0, "w":2},
                {"label":"k0f", "x":15.25, "y":0},
                {"label":"k0g", "x":16.25, "y":0},
                {"label":"k0h", "x":17.25, "y":0},
                
                {"label":"k10", "x":0, "y":1, "w":1.5},
                {"label":"k12", "x":1.5, "y":1},
                {"label":"k13", "x":2.5, "y":1},
                {"label":"k14", "x":3.5, "y":1},
                {"label":"k15", "x":4.5, "y":1},
                {"label":"k16", "x":5.5, "y":1},
                {"label":"k17", "x":6.5, "y":1},
                {"label":"k18", "x":7.5, "y":1},
                {"label":"k19", "x":8.5, "y":1},
                {"label":"k1a", "x":9.5, "y":1},
                {"label":"k1b", "x":10.5, "y":1},
                {"label":"k1c", "x":11.5, "y":1},
                {"label":"k1d", "x":12.5, "y":1},
                {"label":"k1e", "x":13.5, "y":1, "w":1.5},
                {"label":"k1f", "x":15.25, "y":1},
                {"label":"k1g", "x":16.25, "y":1},
                {"label":"k1h", "x":17.25, "y":1},
                
                {"label":"k20", "x":0, "y":2, "w":1.75},
                {"label":"k22", "x":1.75, "y":2},
                {"label":"k23", "x":2.75, "y":2},
                {"label":"k24", "x":3.75, "y":2},
                {"label":"k25", "x":4.75, "y":2},
                {"label":"k26", "x":5.75, "y":2},
                {"label":"k27", "x":6.75, "y":2},
                {"label":"k28", "x":7.75, "y":2},
                {"label":"k29", "x":8.75, "y":2},
                {"label":"k2a", "x":9.75, "y":2},
                {"label":"k2b", "x":10.75, "y":2},
                {"label":"k2c", "x":11.75, "y":2},
                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
                
                {"label":"k30", "x":0, "y":3, "w":2.25},
                {"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":"k3d", "x":12.25, "y":3, "w":2.75},
                {"label":"k3g", "x":16.25, "y":3},

                {"label":"k40", "x":0, "y":4, "w":1.25},
                {"label":"k41", "x":1.25, "y":4, "w":1.25},
                {"label":"k43", "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":"k4d", "x":12.5, "y":4, "w":1.25},
                {"label":"k4e", "x":13.75, "y":4, "w":1.25},
                {"label":"k4f", "x":15.25, "y":4},
                {"label":"k4g", "x":16.25, "y":4},
                {"label":"k4h", "x":17.25, "y":4}
                {"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},
                {"label":"k0E", "x": 14, "y": 0},

                {"label":"k0F", "x": 15.25, "y": 0},
                {"label":"k0G", "x": 16.25, "y": 0},
                {"label":"k0H", "x": 17.25, "y": 0},

                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
                {"label":"k12", "x": 1.5, "y": 1},
                {"label":"k13", "x": 2.5, "y": 1},
                {"label":"k14", "x": 3.5, "y": 1},
                {"label":"k15", "x": 4.5, "y": 1},
                {"label":"k16", "x": 5.5, "y": 1},
                {"label":"k17", "x": 6.5, "y": 1},
                {"label":"k18", "x": 7.5, "y": 1},
                {"label":"k19", "x": 8.5, "y": 1},
                {"label":"k1A", "x": 9.5, "y": 1},
                {"label":"k1B", "x": 10.5, "y": 1},
                {"label":"k1C", "x": 11.5, "y": 1},
                {"label":"k1D", "x": 12.5, "y": 1},
                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},

                {"label":"k1F", "x": 15.25, "y": 1},
                {"label":"k1G", "x": 16.25, "y": 1},
                {"label":"k1H", "x": 17.25, "y": 1},

                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
                {"label":"k22", "x": 1.75, "y": 2},
                {"label":"k23", "x": 2.75, "y": 2},
                {"label":"k24", "x": 3.75, "y": 2},
                {"label":"k25", "x": 4.75, "y": 2},
                {"label":"k26", "x": 5.75, "y": 2},
                {"label":"k27", "x": 6.75, "y": 2},
                {"label":"k28", "x": 7.75, "y": 2},
                {"label":"k29", "x": 8.75, "y": 2},
                {"label":"k2A", "x": 9.75, "y": 2},
                {"label":"k2B", "x": 10.75, "y": 2},
                {"label":"k2C", "x": 11.75, "y": 2},
                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},

                {"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":"k3D", "x": 12.25, "y": 3, "w": 1.75},
                {"label":"k3E", "x": 14, "y": 3},

                {"label":"k3G", "x": 16.25, "y": 3},

                {"label":"k40", "x": 0, "y": 4, "w": 1.5},
                {"label":"k41", "x": 1.5, "y": 4},
                {"label":"k43", "x": 2.5, "y": 4, "w": 1.5},
                {"label":"k44", "x": 4, "y": 4, "w": 2.5},
                {"label":"k46", "x": 6.5, "y": 4},
                {"label":"k48", "x": 7.5, "y": 4, "w": 2.5},
                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},

                {"label":"k4F", "x": 15.25, "y": 4},
                {"label":"k4G", "x": 16.25, "y": 4},
                {"label":"k4H", "x": 17.25, "y": 4}
            ]
        },
        "LAYOUT_tkl_nofrow_ansi": {
            "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":"k0E", "x": 13, "y": 0, "w": 2},

                {"label":"k0F", "x": 15.25, "y": 0},
                {"label":"k0G", "x": 16.25, "y": 0},
                {"label":"k0H", "x": 17.25, "y": 0},

                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
                {"label":"k12", "x": 1.5, "y": 1},
                {"label":"k13", "x": 2.5, "y": 1},
                {"label":"k14", "x": 3.5, "y": 1},
                {"label":"k15", "x": 4.5, "y": 1},
                {"label":"k16", "x": 5.5, "y": 1},
                {"label":"k17", "x": 6.5, "y": 1},
                {"label":"k18", "x": 7.5, "y": 1},
                {"label":"k19", "x": 8.5, "y": 1},
                {"label":"k1A", "x": 9.5, "y": 1},
                {"label":"k1B", "x": 10.5, "y": 1},
                {"label":"k1C", "x": 11.5, "y": 1},
                {"label":"k1D", "x": 12.5, "y": 1},
                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},

                {"label":"k1F", "x": 15.25, "y": 1},
                {"label":"k1G", "x": 16.25, "y": 1},
                {"label":"k1H", "x": 17.25, "y": 1},

                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
                {"label":"k22", "x": 1.75, "y": 2},
                {"label":"k23", "x": 2.75, "y": 2},
                {"label":"k24", "x": 3.75, "y": 2},
                {"label":"k25", "x": 4.75, "y": 2},
                {"label":"k26", "x": 5.75, "y": 2},
                {"label":"k27", "x": 6.75, "y": 2},
                {"label":"k28", "x": 7.75, "y": 2},
                {"label":"k29", "x": 8.75, "y": 2},
                {"label":"k2A", "x": 9.75, "y": 2},
                {"label":"k2B", "x": 10.75, "y": 2},
                {"label":"k2C", "x": 11.75, "y": 2},
                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},

                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
                {"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":"k3D", "x": 12.25, "y": 3, "w": 2.75},

                {"label":"k3G", "x": 16.25, "y": 3},

                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
                {"label":"k43", "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":"k4D", "x": 12.5, "y": 4, "w": 1.25},
                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},

                {"label":"k4F", "x": 15.25, "y": 4},
                {"label":"k4G", "x": 16.25, "y": 4},
                {"label":"k4H", "x": 17.25, "y": 4}
            ]
        },
        "LAYOUT_tkl_nofrow_iso": {
            "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":"k0E", "x": 13, "y": 0, "w": 2},

                {"label":"k0F", "x": 15.25, "y": 0},
                {"label":"k0G", "x": 16.25, "y": 0},
                {"label":"k0H", "x": 17.25, "y": 0},

                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
                {"label":"k12", "x": 1.5, "y": 1},
                {"label":"k13", "x": 2.5, "y": 1},
                {"label":"k14", "x": 3.5, "y": 1},
                {"label":"k15", "x": 4.5, "y": 1},
                {"label":"k16", "x": 5.5, "y": 1},
                {"label":"k17", "x": 6.5, "y": 1},
                {"label":"k18", "x": 7.5, "y": 1},
                {"label":"k19", "x": 8.5, "y": 1},
                {"label":"k1A", "x": 9.5, "y": 1},
                {"label":"k1B", "x": 10.5, "y": 1},
                {"label":"k1C", "x": 11.5, "y": 1},
                {"label":"k1D", "x": 12.5, "y": 1},

                {"label":"k1F", "x": 15.25, "y": 1},
                {"label":"k1G", "x": 16.25, "y": 1},
                {"label":"k1H", "x": 17.25, "y": 1},

                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
                {"label":"k22", "x": 1.75, "y": 2},
                {"label":"k23", "x": 2.75, "y": 2},
                {"label":"k24", "x": 3.75, "y": 2},
                {"label":"k25", "x": 4.75, "y": 2},
                {"label":"k26", "x": 5.75, "y": 2},
                {"label":"k27", "x": 6.75, "y": 2},
                {"label":"k28", "x": 7.75, "y": 2},
                {"label":"k29", "x": 8.75, "y": 2},
                {"label":"k2A", "x": 9.75, "y": 2},
                {"label":"k2B", "x": 10.75, "y": 2},
                {"label":"k2C", "x": 11.75, "y": 2},
                {"label":"k1E", "x": 12.75, "y": 2},
                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 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":"k3D", "x": 12.25, "y": 3, "w": 2.75},

                {"label":"k3G", "x": 16.25, "y": 3},

                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
                {"label":"k43", "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":"k4D", "x": 12.5, "y": 4, "w": 1.25},
                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},

                {"label":"k4F", "x": 15.25, "y": 4},
                {"label":"k4G", "x": 16.25, "y": 4},
                {"label":"k4H", "x": 17.25, "y": 4}
            ]
        },
        "LAYOUT_division_backspace":{
        "LAYOUT_tkl_nofrow_ansi_split_bs": {
            "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},
                {"label":"k0e", "x":14, "y":0},
                {"label":"k0f", "x":15.25, "y":0},
                {"label":"k0g", "x":16.25, "y":0},
                {"label":"k0h", "x":17.25, "y":0},
                
                {"label":"k10", "x":0, "y":1, "w":1.5},
                {"label":"k12", "x":1.5, "y":1},
                {"label":"k13", "x":2.5, "y":1},
                {"label":"k14", "x":3.5, "y":1},
                {"label":"k15", "x":4.5, "y":1},
                {"label":"k16", "x":5.5, "y":1},
                {"label":"k17", "x":6.5, "y":1},
                {"label":"k18", "x":7.5, "y":1},
                {"label":"k19", "x":8.5, "y":1},
                {"label":"k1a", "x":9.5, "y":1},
                {"label":"k1b", "x":10.5, "y":1},
                {"label":"k1c", "x":11.5, "y":1},
                {"label":"k1d", "x":12.5, "y":1},
                {"label":"k1f", "x":15.25, "y":1},
                {"label":"k1g", "x":16.25, "y":1},
                {"label":"k1h", "x":17.25, "y":1},
                
                {"label":"k20", "x":0, "y":2, "w":1.75},
                {"label":"k22", "x":1.75, "y":2},
                {"label":"k23", "x":2.75, "y":2},
                {"label":"k24", "x":3.75, "y":2},
                {"label":"k25", "x":4.75, "y":2},
                {"label":"k26", "x":5.75, "y":2},
                {"label":"k27", "x":6.75, "y":2},
                {"label":"k28", "x":7.75, "y":2},
                {"label":"k29", "x":8.75, "y":2},
                {"label":"k2a", "x":9.75, "y":2},
                {"label":"k2b", "x":10.75, "y":2},
                {"label":"k2c", "x":11.75, "y":2},
                {"label":"k1e", "x":12.75, "y":2},
                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 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":"k3d", "x":12.25, "y":3, "w":1.75},
                {"label":"k3e", "x":14, "y":3},
                {"label":"k3g", "x":16.25, "y":3},

                {"label":"k40", "x":0, "y":4, "w":1.5},
                {"label":"k41", "x":1.25, "y":4},
                {"label":"k43", "x":2.5, "y":4, "w":1.5},
                {"label":"k46", "x":4, "y":4, "w":7},
                {"label":"k4b", "x":11, "y":4, "w":1.5},
                {"label":"k4d", "x":12.5, "y":4},
                {"label":"k4e", "x":13.75, "y":4, "w":1.5},
                {"label":"k4f", "x":15.25, "y":4},
                {"label":"k4g", "x":16.25, "y":4},
                {"label":"k4h", "x":17.25, "y":4}
                {"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},
                {"label":"k0E", "x": 14, "y": 0},

                {"label":"k0F", "x": 15.25, "y": 0},
                {"label":"k0G", "x": 16.25, "y": 0},
                {"label":"k0H", "x": 17.25, "y": 0},

                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
                {"label":"k12", "x": 1.5, "y": 1},
                {"label":"k13", "x": 2.5, "y": 1},
                {"label":"k14", "x": 3.5, "y": 1},
                {"label":"k15", "x": 4.5, "y": 1},
                {"label":"k16", "x": 5.5, "y": 1},
                {"label":"k17", "x": 6.5, "y": 1},
                {"label":"k18", "x": 7.5, "y": 1},
                {"label":"k19", "x": 8.5, "y": 1},
                {"label":"k1A", "x": 9.5, "y": 1},
                {"label":"k1B", "x": 10.5, "y": 1},
                {"label":"k1C", "x": 11.5, "y": 1},
                {"label":"k1D", "x": 12.5, "y": 1},
                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},

                {"label":"k1F", "x": 15.25, "y": 1},
                {"label":"k1G", "x": 16.25, "y": 1},
                {"label":"k1H", "x": 17.25, "y": 1},

                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
                {"label":"k22", "x": 1.75, "y": 2},
                {"label":"k23", "x": 2.75, "y": 2},
                {"label":"k24", "x": 3.75, "y": 2},
                {"label":"k25", "x": 4.75, "y": 2},
                {"label":"k26", "x": 5.75, "y": 2},
                {"label":"k27", "x": 6.75, "y": 2},
                {"label":"k28", "x": 7.75, "y": 2},
                {"label":"k29", "x": 8.75, "y": 2},
                {"label":"k2A", "x": 9.75, "y": 2},
                {"label":"k2B", "x": 10.75, "y": 2},
                {"label":"k2C", "x": 11.75, "y": 2},
                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},

                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
                {"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":"k3D", "x": 12.25, "y": 3, "w": 2.75},

                {"label":"k3G", "x": 16.25, "y": 3},

                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
                {"label":"k43", "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":"k4D", "x": 12.5, "y": 4, "w": 1.25},
                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},

                {"label":"k4F", "x": 15.25, "y": 4},
                {"label":"k4G", "x": 16.25, "y": 4},
                {"label":"k4H", "x": 17.25, "y": 4}
            ]
        },
        "LAYOUT_iso":{
        "LAYOUT_tkl_nofrow_iso_split_bs": {
            "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},
                {"label":"k0e", "x":14, "y":0},
                {"label":"k0f", "x":15.25, "y":0},
                {"label":"k0g", "x":16.25, "y":0},
                {"label":"k0h", "x":17.25, "y":0},
                
                {"label":"k10", "x":0, "y":1, "w":1.5},
                {"label":"k12", "x":1.5, "y":1},
                {"label":"k13", "x":2.5, "y":1},
                {"label":"k14", "x":3.5, "y":1},
                {"label":"k15", "x":4.5, "y":1},
                {"label":"k16", "x":5.5, "y":1},
                {"label":"k17", "x":6.5, "y":1},
                {"label":"k18", "x":7.5, "y":1},
                {"label":"k19", "x":8.5, "y":1},
                {"label":"k1a", "x":9.5, "y":1},
                {"label":"k1b", "x":10.5, "y":1},
                {"label":"k1c", "x":11.5, "y":1},
                {"label":"k1d", "x":12.5, "y":1},
                {"label":"k1f", "x":15.25, "y":1},
                {"label":"k1g", "x":16.25, "y":1},
                {"label":"k1h", "x":17.25, "y":1},
                
                {"label":"k20", "x":0, "y":2, "w":1.75},
                {"label":"k22", "x":1.75, "y":2},
                {"label":"k23", "x":2.75, "y":2},
                {"label":"k24", "x":3.75, "y":2},
                {"label":"k25", "x":4.75, "y":2},
                {"label":"k26", "x":5.75, "y":2},
                {"label":"k27", "x":6.75, "y":2},
                {"label":"k28", "x":7.75, "y":2},
                {"label":"k29", "x":8.75, "y":2},
                {"label":"k2a", "x":9.75, "y":2},
                {"label":"k2b", "x":10.75, "y":2},
                {"label":"k2c", "x":11.75, "y":2},
                {"label":"k1e", "x":12.75, "y":2},
                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 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":"k3d", "x":12.25, "y":3, "w":1.75},
                {"label":"k3e", "x":14, "y":3},
                {"label":"k3g", "x":16.25, "y":3},
                
                {"label":"k40", "x":0, "y":4, "w":1.5},
                {"label":"k43", "x":2.5, "y":4, "w":1.5},
                {"label":"k44", "x":4, "y":4, "w":3},
                {"label":"k46", "x":7, "y":4},
                {"label":"k48", "x":8, "y":4, "w":3},
                {"label":"k4b", "x":11, "y":4, "w":1.5},
                {"label":"k4e", "x":13.5, "y":4, "w":1.5},
                {"label":"k4f", "x":15.25, "y":4},
                {"label":"k4g", "x":16.25, "y":4},
                {"label":"k4h", "x":17.25, "y":4}
                {"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},
                {"label":"k0E", "x": 14, "y": 0},

                {"label":"k0F", "x": 15.25, "y": 0},
                {"label":"k0G", "x": 16.25, "y": 0},
                {"label":"k0H", "x": 17.25, "y": 0},

                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
                {"label":"k12", "x": 1.5, "y": 1},
                {"label":"k13", "x": 2.5, "y": 1},
                {"label":"k14", "x": 3.5, "y": 1},
                {"label":"k15", "x": 4.5, "y": 1},
                {"label":"k16", "x": 5.5, "y": 1},
                {"label":"k17", "x": 6.5, "y": 1},
                {"label":"k18", "x": 7.5, "y": 1},
                {"label":"k19", "x": 8.5, "y": 1},
                {"label":"k1A", "x": 9.5, "y": 1},
                {"label":"k1B", "x": 10.5, "y": 1},
                {"label":"k1C", "x": 11.5, "y": 1},
                {"label":"k1D", "x": 12.5, "y": 1},

                {"label":"k1F", "x": 15.25, "y": 1},
                {"label":"k1G", "x": 16.25, "y": 1},
                {"label":"k1H", "x": 17.25, "y": 1},

                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
                {"label":"k22", "x": 1.75, "y": 2},
                {"label":"k23", "x": 2.75, "y": 2},
                {"label":"k24", "x": 3.75, "y": 2},
                {"label":"k25", "x": 4.75, "y": 2},
                {"label":"k26", "x": 5.75, "y": 2},
                {"label":"k27", "x": 6.75, "y": 2},
                {"label":"k28", "x": 7.75, "y": 2},
                {"label":"k29", "x": 8.75, "y": 2},
                {"label":"k2A", "x": 9.75, "y": 2},
                {"label":"k2B", "x": 10.75, "y": 2},
                {"label":"k2C", "x": 11.75, "y": 2},
                {"label":"k1E", "x": 12.75, "y": 2},
                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 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":"k3D", "x": 12.25, "y": 3, "w": 2.75},

                {"label":"k3G", "x": 16.25, "y": 3},

                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
                {"label":"k43", "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":"k4D", "x": 12.5, "y": 4, "w": 1.25},
                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},

                {"label":"k4F", "x": 15.25, "y": 4},
                {"label":"k4G", "x": 16.25, "y": 4},
                {"label":"k4H", "x": 17.25, "y": 4}
            ]
        }
    }


M keyboards/mokey/xox70/keymaps/default/keymap.c => keyboards/mokey/xox70/keymaps/default/keymap.c +5 -14
@@ 15,21 15,12 @@

#include QMK_KEYBOARD_H


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LAYOUT(
        KC_GESC, 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_INSERT, KC_HOME, KC_PGUP,
        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_BSLS,      KC_DELETE, KC_END,  KC_PGDOWN,
    LAYOUT_tkl_nofrow_ansi(
        KC_GESC, 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_INS,  KC_HOME, KC_PGUP,
        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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
        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_ENT,
        KC_LSFT, 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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,               KC_RALT, KC_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
    ),

    LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
        KC_LSFT,          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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
    )
};


M keyboards/mokey/xox70/keymaps/via/keymap.c => keyboards/mokey/xox70/keymaps/via/keymap.c +20 -24
@@ 16,36 16,32 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    LAYOUT(
        KC_GESC, 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_INSERT, KC_HOME, KC_PGUP,
        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_BSLS,      KC_DELETE, KC_END,  KC_PGDOWN,
    LAYOUT_all(
        KC_GESC, 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_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
        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_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
        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_ENT,
        KC_LSFT, 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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,               KC_RALT, KC_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
        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, MO(1),                        KC_UP,
        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
    ),

    LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
    LAYOUT_all(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
    ),

    LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
    LAYOUT_all(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
    ),

    LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
    LAYOUT_all(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
    )
};


M keyboards/mokey/xox70/rules.mk => keyboards/mokey/xox70/rules.mk +2 -0
@@ 16,3 16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output

LAYOUTS = tkl_nofrow_ansi tkl_nofrow_iso


M keyboards/mokey/xox70/xox70.h => keyboards/mokey/xox70/xox70.h +89 -40
@@ 13,53 13,102 @@
 * 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"

#define xxx KC_NO
#define XXX KC_NO

/*
 *                                                                ┌───────┐
 *                                                                │0E     │ 2u Backspace
 *                                                                └───────┘
 *            ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
 *            │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │
 *            ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤    ┌─────┐
 *            │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │ │1F │1G │1H │    │2D   │
 *            ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐    │ ISO Enter
 *            │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │               │1E │    │
 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐     ├───┴────┴─┐
 * │30      │ │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │     │3G │     │3D        │
 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘
 *            │40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ │4F │4G │4H │
 *            └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
 *            ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
 *            │40   │41 │43   │46                         │4B   │4D │4E   │
 *            └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 *            ┌─────┐   ┌─────┬───────────┬───┬───────────┬─────┐   ┌─────┐
 *            │40   │   │43   │44         │46 │48         │4B   │   │4E   │
 *            └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘
 */

#define LAYOUT_all( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E,             k3G, \
    k40, k41, k43,           k44, k46, k48,           k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
) { \
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \
    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
}

#define LAYOUT_tkl_nofrow_ansi( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, k1G, k1H, \
    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
) { \
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
}

#define LAYOUT(\
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,           k3g, \
    k40, k41,      k43,           k46,                k4a, k4b,      k4d, k4e, k4f, k4g, k4h \
) \
{ \
    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  KC_NO, k0e,     k0f,   k0g,   k0h }, \
    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e,     k1f,   k1g,   k1h }, \
    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k2d,  KC_NO,   KC_NO, KC_NO,KC_NO }, \
    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  KC_NO,   KC_NO,  k3g, KC_NO }, \
    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,  k4e,      k4f,   k4g,   k4h }  \
#define LAYOUT_tkl_nofrow_iso( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,        k1F, k1G, k1H, \
    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
) { \
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
}

#define LAYOUT_division_backspace(\
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e,      k3g, \
    k40, k41,      k43,           k46,                     k4b,      k4d, k4e, k4f, k4g, k4h \
) \
{ \
    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d, k0e,   k0f,   k0g,   k0h }, \
    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d, k1f,   k1g,   k1h,   KC_NO }, \
    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k1e,  k2d, KC_NO, KC_NO, KC_NO }, \
    { k30,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  k3e, KC_NO,  k3g,  KC_NO }, \
    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO,k4b, KC_NO,  k4d, k4e, k4f, k4g, k4h }  \
#define LAYOUT_tkl_nofrow_ansi_split_bs( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
) { \
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
}

#define LAYOUT_iso(\
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e,       k3g, \
    k40,           k43, k44,      k46,      k48,           k4b,           k4e, k4f, k4g, k4h \
) \
{ \
    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d,  k0e,     k0f,   k0g,   k0h }, \
    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1f,   k1g,   k1h,   KC_NO }, \
    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k1e,  k2d,  KC_NO, KC_NO, KC_NO }, \
    { k30,  k31, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO,   k3d,  k3e,   KC_NO,  k3g, KC_NO }, \
    { k40,  KC_NO,  KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4a,  KC_NO,   k4d,  k4e,    k4f,   k4g,   k4h }  \
#define LAYOUT_tkl_nofrow_iso_split_bs( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,             k1F, k1G, k1H, \
    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
) { \
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
}


M quantum/quantum.c => quantum/quantum.c +1 -0
@@ 399,6 399,7 @@ __attribute__((weak)) void startup_user() {}
__attribute__((weak)) void shutdown_user() {}

void suspend_power_down_quantum(void) {
    suspend_power_down_kb();
#ifndef NO_SUSPEND_POWER_DOWN
// Turn off backlight
#    ifdef BACKLIGHT_ENABLE