~ruther/qmk_firmware

c2dd19de514eda3cf00cecdee76b21cfd0d6e2e6 — Ryan 5 years ago 6d88794
Fix error_log complaint about Helix boards (#9528)

M keyboards/helix/helix.h => keyboards/helix/helix.h +2 -2
@@ 1,5 1,7 @@
#pragma once

#include "quantum.h"

#ifdef KEYBOARD_helix_rev1
    #include "rev1.h"
#endif


@@ 9,5 11,3 @@
#ifdef KEYBOARD_helix_pico
    #include "pico.h"
#endif

#include "quantum.h"

D keyboards/helix/info.json => keyboards/helix/info.json +0 -13
@@ 1,13 0,0 @@
{
  "keyboard_name": "Helix",
  "url": "https://github.com/MakotoKurauchi/helix",
  "maintainer": "MakotoKurauchi",
  "width": 15,
  "height": 5,
  "layouts": {
    "LAYOUT": {
      "key_count": 64,
      "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "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":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
    }
  }
}

M keyboards/helix/pico/info.json => keyboards/helix/pico/info.json +67 -10
@@ 1,13 1,70 @@
{
  "keyboard_name": "HelixPico",
  "url": "https://github.com/MakotoKurauchi/helix",
  "maintainer": "MakotoKurauchi",
  "width": 15,
  "height": 4,
  "layouts": {
    "LAYOUT": {
      "key_count": 50,
      "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
    "keyboard_name": "HelixPico",
    "url": "https://github.com/MakotoKurauchi/helix",
    "maintainer": "MakotoKurauchi",
    "width": 15,
    "height": 4,
    "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": 9, "y": 0},
                {"x": 10, "y": 0},
                {"x": 11, "y": 0},
                {"x": 12, "y": 0},
                {"x": 13, "y": 0},
                {"x": 14, "y": 0},

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

                {"x": 9, "y": 1},
                {"x": 10, "y": 1},
                {"x": 11, "y": 1},
                {"x": 12, "y": 1},
                {"x": 13, "y": 1},
                {"x": 14, "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": 9, "y": 2},
                {"x": 10, "y": 2},
                {"x": 11, "y": 2},
                {"x": 12, "y": 2},
                {"x": 13, "y": 2},
                {"x": 14, "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": 6, "y": 3},

                {"x": 8, "y": 3},
                {"x": 9, "y": 3},
                {"x": 10, "y": 3},
                {"x": 11, "y": 3},
                {"x": 12, "y": 3},
                {"x": 13, "y": 3},
                {"x": 14, "y": 3}
            ]
        }
    }
  }
}

M keyboards/helix/pico/pico.h => keyboards/helix/pico/pico.h +41 -46
@@ 1,8 1,6 @@
#pragma once

#include "../helix.h"

#include "quantum.h"
#include "helix.h"

#ifndef SPLIT_KEYBOARD
  extern bool is_helix_master(void);


@@ 16,54 14,51 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to 
#define has_usb() is_keyboard_master()

#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)
  // 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, L36, R36, R30, R31, R32, R33, R34, R35  \
	) \
	{ \
		{ L00, L01, L02, L03, L04, L05, KC_NO }, \
		{ L10, L11, L12, L13, L14, L15, KC_NO }, \
		{ L20, L21, L22, L23, L24, L25, KC_NO }, \
		{ L30, L31, L32, L33, L34, L35, L36 }, \
		{ R05, R04, R03, R02, R01, R00, KC_NO }, \
		{ R15, R14, R13, R12, R11, R10, KC_NO }, \
		{ R25, R24, R23, R22, R21, R20, KC_NO }, \
		{ R35, R34, R33, R32, R31, R30, R36 }, \
	}
    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, L36, R36, R30, R31, R32, R33, R34, R35  \
) { \
    { L00, L01, L02, L03, L04, L05, KC_NO }, \
    { L10, L11, L12, L13, L14, L15, KC_NO }, \
    { L20, L21, L22, L23, L24, L25, KC_NO }, \
    { L30, L31, L32, L33, L34, L35, L36 }, \
    { R05, R04, R03, R02, R01, R00, KC_NO }, \
    { R15, R14, R13, R12, R11, R10, KC_NO }, \
    { R25, R24, R23, R22, R21, R20, KC_NO }, \
    { R35, R34, R33, R32, R31, R30, R36 }, \
}
#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, L36, R36, R30, R31, R32, R33, R34, R35  \
	) \
	{ \
		{ L00, L01, L02, L03, L04, L05, KC_NO }, \
		{ L10, L11, L12, L13, L14, L15, KC_NO }, \
		{ L20, L21, L22, L23, L24, L25, KC_NO }, \
		{ L30, L31, L32, L33, L34, L35, L36 }, \
		{ KC_NO, R00, R01, R02, R03, R04, R05 }, \
		{ KC_NO, R10, R11, R12, R13, R14, R15 }, \
		{ KC_NO, R20, R21, R22, R23, R24, R25 }, \
		{ R36, R30, R31, R32, R33, R34, R35 }, \
	}
    // 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, L36, R36, R30, R31, R32, R33, R34, R35  \
    ) { \
        { L00, L01, L02, L03, L04, L05, KC_NO }, \
        { L10, L11, L12, L13, L14, L15, KC_NO }, \
        { L20, L21, L22, L23, L24, L25, KC_NO }, \
        { L30, L31, L32, L33, L34, L35, L36 }, \
        { KC_NO, R00, R01, R02, R03, R04, R05 }, \
        { KC_NO, R10, R11, R12, R13, R14, R15 }, \
        { KC_NO, R20, R21, R22, R23, R24, R25 }, \
        { R36, R30, R31, R32, R33, R34, R35 }, \
  }
#endif

#define LAYOUT_kc(                                                      \
#define LAYOUT_kc( \
    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, L36, R36, R30, R31, R32, R33, R34, R35 \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
    )
) LAYOUT( \
    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
    KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
)

M keyboards/helix/rev1/info.json => keyboards/helix/rev1/info.json +79 -10
@@ 1,13 1,82 @@
{
  "keyboard_name": "Helix rev. 1",
  "url": "https://github.com/MakotoKurauchi/helix", 
  "maintainer": "MakotoKurauchi",
  "width": 13,
  "height": 5,
  "layouts": {
    "LAYOUT": {
      "key_count": 60,
      "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}]
    "keyboard_name": "Helix rev. 1",
    "url": "https://github.com/MakotoKurauchi/helix",
    "maintainer": "MakotoKurauchi",
    "width": 13,
    "height": 5,
    "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}
            ]
        }
    }
  }
}

M keyboards/helix/rev1/rev1.h => keyboards/helix/rev1/rev1.h +142 -154
@@ 1,180 1,168 @@
#pragma once

#include "../helix.h"

#include "quantum.h"
#include "helix.h"

#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
  #include <avr/io.h>
  #include <avr/interrupt.h>
    #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
    #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
    #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( \
    #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 }, \
      { 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
    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"
    #error "expected HELIX_ROWS 3 or 4 or 5"
#endif

// Used to create a keymap using only KC_ prefixed keys
#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
  #define LAYOUT_kc( \
    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  \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25  \
    #define LAYOUT_kc( \
        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 \
    ) LAYOUT( \
        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 \
    )
#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
  #define LAYOUT_kc( \
    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 \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
    #define LAYOUT_kc( \
        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 \
    ) LAYOUT( \
        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
    )
#else
  #define LAYOUT_kc( \
    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 \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
      KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
#else // HELIX_ROWS == 5
    #define LAYOUT_kc( \
        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 \
    ) LAYOUT( \
        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
    )
#endif


M keyboards/helix/rev2/info.json => keyboards/helix/rev2/info.json +83 -10
@@ 1,13 1,86 @@
{
  "keyboard_name": "Helix rev. 2",
  "url": "https://github.com/MakotoKurauchi/helix",
  "maintainer": "MakotoKurauchi",
  "width": 15,
  "height": 5,
  "layouts": {
    "LAYOUT": {
      "key_count": 64,
      "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "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":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
    "keyboard_name": "Helix rev. 2",
    "url": "https://github.com/MakotoKurauchi/helix",
    "maintainer": "MakotoKurauchi",
    "width": 15,
    "height": 5,
    "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": 9, "y": 0},
                {"x": 10, "y": 0},
                {"x": 11, "y": 0},
                {"x": 12, "y": 0},
                {"x": 13, "y": 0},
                {"x": 14, "y": 0},

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

                {"x": 9, "y": 1},
                {"x": 10, "y": 1},
                {"x": 11, "y": 1},
                {"x": 12, "y": 1},
                {"x": 13, "y": 1},
                {"x": 14, "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": 9, "y": 2},
                {"x": 10, "y": 2},
                {"x": 11, "y": 2},
                {"x": 12, "y": 2},
                {"x": 13, "y": 2},
                {"x": 14, "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": 6, "y": 3},

                {"x": 8, "y": 3},
                {"x": 9, "y": 3},
                {"x": 10, "y": 3},
                {"x": 11, "y": 3},
                {"x": 12, "y": 3},
                {"x": 13, "y": 3},
                {"x": 14, "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": 6, "y": 4},

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

M keyboards/helix/rev2/rev2.h => keyboards/helix/rev2/rev2.h +98 -106
@@ 1,12 1,10 @@
#pragma once

#include "../helix.h"

#include "quantum.h"
#include "helix.h"

#ifndef SPLIT_KEYBOARD
  extern bool is_helix_master(void);
  #define is_keyboard_master() is_helix_master()
    extern bool is_helix_master(void);
    #define is_keyboard_master() is_helix_master()
#endif

// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.


@@ 16,120 14,114 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to 
#define has_usb() is_keyboard_master()

#if 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)
    #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, L36, R36, R30, R31, R32, R33, R34, R35 \
        ) { \
            { L00, L01, L02, L03, L04, L05, KC_NO }, \
            { L10, L11, L12, L13, L14, L15, KC_NO }, \
            { L20, L21, L22, L23, L24, L25, KC_NO }, \
            { L30, L31, L32, L33, L34, L35, L36 }, \
            { R05, R04, R03, R02, R01, R00, KC_NO }, \
            { R15, R14, R13, R12, R11, R10, KC_NO }, \
            { R25, R24, R23, R22, R21, R20, KC_NO }, \
            { R35, R34, R33, R32, R31, R30, R36 } \
        }
    #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, L36, R36, R30, R31, R32, R33, R34, R35 \
        ) { \
            { L00, L01, L02, L03, L04, L05, KC_NO }, \
            { L10, L11, L12, L13, L14, L15, KC_NO }, \
            { L20, L21, L22, L23, L24, L25, KC_NO }, \
            { L30, L31, L32, L33, L34, L35, L36 }, \
            { KC_NO, R00, R01, R02, R03, R04, R05 }, \
            { KC_NO, R10, R11, R12, R13, R14, R15 }, \
            { KC_NO, R20, R21, R22, R23, R24, R25 }, \
            { R36, R30, R31, R32, R33, R34, R35 } \
        }
    #endif
#else // 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, L36, R36, R30, R31, R32, R33, R34, R35  \
  ) \
  { \
    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, L36, R36, R30, R31, R32, R33, R34, R35, \
    L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
) { \
    { L00, L01, L02, L03, L04, L05, KC_NO }, \
    { L10, L11, L12, L13, L14, L15, KC_NO }, \
    { L20, L21, L22, L23, L24, L25, KC_NO }, \
    { L30, L31, L32, L33, L34, L35, L36 }, \
    { L40, L41, L42, L43, L44, L45, L46 }, \
    { R05, R04, R03, R02, R01, R00, KC_NO }, \
    { R15, R14, R13, R12, R11, R10, KC_NO }, \
    { R25, R24, R23, R22, R21, R20, KC_NO }, \
    { R35, R34, R33, R32, R31, R30, R36 }, \
  }
#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, L36, R36, R30, R31, R32, R33, R34, R35  \
  ) \
  { \
    { L00, L01, L02, L03, L04, L05, KC_NO }, \
    { L10, L11, L12, L13, L14, L15, KC_NO }, \
    { L20, L21, L22, L23, L24, L25, KC_NO }, \
    { L30, L31, L32, L33, L34, L35, L36 }, \
    { KC_NO, R00, R01, R02, R03, R04, R05 }, \
    { KC_NO, R10, R11, R12, R13, R14, R15 }, \
    { KC_NO, R20, R21, R22, R23, R24, R25 }, \
    { R36, R30, R31, R32, R33, R34, R35 }, \
  }
#endif
#else
  #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, L36, R36, R30, R31, R32, R33, R34, R35, \
    L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45  \
    ) \
    { \
      { L00, L01, L02, L03, L04, L05, KC_NO }, \
      { L10, L11, L12, L13, L14, L15, KC_NO }, \
      { L20, L21, L22, L23, L24, L25, KC_NO }, \
      { L30, L31, L32, L33, L34, L35, L36 }, \
      { L40, L41, L42, L43, L44, L45, L46 }, \
      { R05, R04, R03, R02, R01, R00, KC_NO }, \
      { R15, R14, R13, R12, R11, R10, KC_NO }, \
      { R25, R24, R23, R22, R21, R20, KC_NO }, \
      { R35, R34, R33, R32, R31, R30, R36 }, \
      { R45, R44, R43, R42, R41, R40, R46 } \
    }
  #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, L36, R36, R30, R31, R32, R33, R34, R35, \
    L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45  \
    ) \
    { \
      { L00, L01, L02, L03, L04, L05, KC_NO }, \
      { L10, L11, L12, L13, L14, L15, KC_NO }, \
      { L20, L21, L22, L23, L24, L25, KC_NO }, \
      { L30, L31, L32, L33, L34, L35, L36 }, \
      { L40, L41, L42, L43, L44, L45, L46 }, \
      { KC_NO, R00, R01, R02, R03, R04, R05 }, \
      { KC_NO, R10, R11, R12, R13, R14, R15 }, \
      { KC_NO, R20, R21, R22, R23, R24, R25 }, \
      { R36, R30, R31, R32, R33, R34, R35 }, \
      { R46, R40, R41, R42, R43, R44, R45 } \
    }
  #endif
    { R45, R44, R43, R42, R41, R40, R46 } \
}
    #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, L36, R36, R30, R31, R32, R33, R34, R35, \
            L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
        ) { \
            { L00, L01, L02, L03, L04, L05, KC_NO }, \
            { L10, L11, L12, L13, L14, L15, KC_NO }, \
            { L20, L21, L22, L23, L24, L25, KC_NO }, \
            { L30, L31, L32, L33, L34, L35, L36 }, \
            { L40, L41, L42, L43, L44, L45, L46 }, \
            { KC_NO, R00, R01, R02, R03, R04, R05 }, \
            { KC_NO, R10, R11, R12, R13, R14, R15 }, \
            { KC_NO, R20, R21, R22, R23, R24, R25 }, \
            { R36, R30, R31, R32, R33, R34, R35 }, \
            { R46, R40, R41, R42, R43, R44, R45 } \
        }
    #endif
#endif

// Used to create a keymap using only KC_ prefixed keys
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
  #define LAYOUT_kc( \
    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, L36, R36, R30, R31, R32, R33, R34, R35 \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
    #define LAYOUT_kc( \
        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, L36, R36, R30, R31, R32, R33, R34, R35 \
    ) LAYOUT( \
        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
    )
#else
  #define LAYOUT_kc( \
    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, L36, R36, R30, R31, R32, R33, R34, R35, \
    L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
    ) \
    LAYOUT( \
      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
      KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
#else // HELIX_ROWS == 5
    #define LAYOUT_kc( \
        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, L36, R36, R30, R31, R32, R33, R34, R35, \
        L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
    ) LAYOUT( \
        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
    )
#endif