diff options
| -rw-r--r-- | keyboards/zen/config.h | 29 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/default/config.h | 41 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/default/keymap.c | 103 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/default/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/zen/matrix.c | 466 | ||||
| -rw-r--r-- | keyboards/zen/readme.md | 12 | ||||
| -rw-r--r-- | keyboards/zen/rev1/config.h | 91 | ||||
| -rw-r--r-- | keyboards/zen/rev1/rev1.c | 22 | ||||
| -rw-r--r-- | keyboards/zen/rev1/rev1.h | 40 | ||||
| -rw-r--r-- | keyboards/zen/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/zen/rules.mk | 73 | ||||
| -rw-r--r-- | keyboards/zen/serial.c | 228 | ||||
| -rw-r--r-- | keyboards/zen/serial.h | 26 | ||||
| -rw-r--r-- | keyboards/zen/split_rgb.c | 41 | ||||
| -rw-r--r-- | keyboards/zen/split_rgb.h | 6 | ||||
| -rw-r--r-- | keyboards/zen/split_util.c | 86 | ||||
| -rw-r--r-- | keyboards/zen/split_util.h | 20 | ||||
| -rw-r--r-- | keyboards/zen/zen.c | 1 | ||||
| -rw-r--r-- | keyboards/zen/zen.h | 23 | 
19 files changed, 1316 insertions, 0 deletions
diff --git a/keyboards/zen/config.h b/keyboards/zen/config.h new file mode 100644 index 0000000000..f8f8bbf332 --- /dev/null +++ b/keyboards/zen/config.h @@ -0,0 +1,29 @@ +/* +Copyright 2017 Danny Nguyen <danny@hexwire.com> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +#endif  // CONFIG_H + +#undef  RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 16 + +#define TAPPING_TERM 100
\ No newline at end of file diff --git a/keyboards/zen/keymaps/default/config.h b/keyboards/zen/keymaps/default/config.h new file mode 100644 index 0000000000..38e4d73f0d --- /dev/null +++ b/keyboards/zen/keymaps/default/config.h @@ -0,0 +1,41 @@ +/* +Copyright 2017 Danny Nguyen <danny@hexwire.com> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 16 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 + +#endif diff --git a/keyboards/zen/keymaps/default/keymap.c b/keyboards/zen/keymaps/default/keymap.c new file mode 100644 index 0000000000..a955e892f4 --- /dev/null +++ b/keyboards/zen/keymaps/default/keymap.c @@ -0,0 +1,103 @@ +#include "zen.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_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 _NAV 2 + + +enum custom_keycodes { +  QWERTY = SAFE_RANGE, +  NAV, + +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------.             .-----------------------------------------. + * | GESC |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |   \  | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * |CAPS(NAV)|A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  "   | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Enter | + * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| + * | Ctrl | GUI  | Alt  |RGBTOG| NAV  |Space |Delete||Enter|Space |  NAV |   -  |   =  | PGUP | PGDN | + * `------------------------------------------------''-----------------------------------------------' + */ +[_QWERTY] = KEYMAP( \ +  KC_GESC,          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_BSLS, \ +  LT(_NAV, 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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                       KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \ +  KC_LCTL,          KC_LGUI, KC_LALT, RGB_TOG, MO(_NAV), KC_SPC,  KC_DEL,  KC_ENT,   KC_SPACE, MO(_NAV), KC_MINS, KC_EQL,  KC_PGUP, KC_PGDN \ +), + +/* NAV + * ,-----------------------------------------.             .-----------------------------------------. + * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 | F12  | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * |      |RGBSAI|RGBVAI|RGBSAD| RESET|  [   |             |   ]  | Pgup |  Up  | Pgdn |Insert| Home | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * |      |RGBHUD|RGBVAD|RGBHUI|      |      |             |      | Left | Down | Right|Delete| End  | + * |------+------+------+------+------+------|             |------+------+------+------+------+------| + * |Shift |      |      |      |      |      |             | NKRO |      |      | Pause| Back | Next | + * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| + * | Ctrl | GUI  | Alt  |RGBMOD|      |      |      ||     |      |      |      | Mute | VOLUP| VOLDN| + * `------------------------------------------------''-----------------------------------------------' + */ +[_NAV] = KEYMAP( \ +  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,             KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12 ,  \ +  KC_TRNS, RGB_SAI, RGB_VAI, RGB_SAD, RESET,   KC_LBRC,                   KC_RBRC,           KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME , \ +  KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI, KC_TRNS, KC_TRNS,                   KC_TRNS,           KC_LEFT,  KC_DOWN, KC_RGHT, KC_DEL,  KC_END , \ +  KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   MAGIC_TOGGLE_NKRO, KC_TRNS,  KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT , \ +  KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS, KC_MUTE, KC_VOLU, KC_VOLD \ +), + +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2]     = SONG(QWERTY_SOUND); +float tone_colemak[][2]    = SONG(COLEMAK_SOUND); +#endif + +void persistant_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_NOTE_ARRAY(tone_qwerty, false, 0); +        #endif +        persistant_default_layer_set(1UL<<_QWERTY); +      } +      return false; +      break; +    //case COLEMAK: +      //if (record->event.pressed) { +        //#ifdef AUDIO_ENABLE +          //PLAY_NOTE_ARRAY(tone_colemak, false, 0); +        //#endif +        //persistant_default_layer_set(1UL<<_COLEMAK); +      //} +      //return false; +      //break; +  } +  return true; +}
\ No newline at end of file diff --git a/keyboards/zen/keymaps/default/rules.mk b/keyboards/zen/keymaps/default/rules.mk new file mode 100644 index 0000000000..22b6ec4766 --- /dev/null +++ b/keyboards/zen/keymaps/default/rules.mk @@ -0,0 +1,6 @@ +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes + +ifndef QUANTUM_DIR +	include ../../../../Makefile +endif diff --git a/keyboards/zen/matrix.c b/keyboards/zen/matrix.c new file mode 100644 index 0000000000..12f22214e1 --- /dev/null +++ b/keyboards/zen/matrix.c @@ -0,0 +1,466 @@ +/* +Copyright 2017 Danny Nguyen <danny@keeb.io> + +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 "wait.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "matrix.h" +#include "split_util.h" +#include "pro_micro.h" +#include "config.h" +#include "timer.h" +#include "backlight.h" + +#ifdef USE_I2C +#  include "i2c.h" +#else // USE_SERIAL +#  include "serial.h" +#endif + +#ifndef DEBOUNCING_DELAY +#   define DEBOUNCING_DELAY 5 +#endif + +#if (DEBOUNCING_DELAY > 0) +    static uint16_t debouncing_time; +    static bool debouncing = false; +#endif + +#if (MATRIX_COLS <= 8) +#    define print_matrix_header()  print("\nr/c 01234567\n") +#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop(matrix[i]) +#    define ROW_SHIFTER ((uint8_t)1) +#else +#    error "Currently only supports 8 COLS" +#endif +static matrix_row_t matrix_debouncing[MATRIX_ROWS]; + +#define ERROR_DISCONNECT_COUNT 5 + +#define SERIAL_LED_ADDR 0x00 + +#define 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]; + +#if (DIODE_DIRECTION == COL2ROW) +    static void init_cols(void); +    static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); +    static void unselect_rows(void); +    static void select_row(uint8_t row); +    static void unselect_row(uint8_t row); +#elif (DIODE_DIRECTION == ROW2COL) +    static void init_rows(void); +    static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); +    static void unselect_cols(void); +    static void unselect_col(uint8_t col); +    static void select_col(uint8_t col); +#endif + +__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(); + +    TX_RX_LED_INIT; + +    // initialize matrix state: all keys off +    for (uint8_t i=0; i < MATRIX_ROWS; i++) { +        matrix[i] = 0; +        matrix_debouncing[i] = 0; +    } + + +} + +uint8_t _matrix_scan(void) +{ +    int offset = isLeftHand ? 0 : (ROWS_PER_HAND); +#if (DIODE_DIRECTION == COL2ROW) +    // Set row, read cols +    for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) { +#       if (DEBOUNCING_DELAY > 0) +            bool matrix_changed = read_cols_on_row(matrix_debouncing+offset, current_row); + +            if (matrix_changed) { +                debouncing = true; +                debouncing_time = timer_read(); +                PORTD ^= (1 << 2); +            } + +#       else +            read_cols_on_row(matrix+offset, current_row); +#       endif + +    } + +#elif (DIODE_DIRECTION == ROW2COL) +    // Set col, read rows +    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { +#       if (DEBOUNCING_DELAY > 0) +            bool matrix_changed = read_rows_on_col(matrix_debouncing+offset, current_col); +            if (matrix_changed) { +                debouncing = true; +                debouncing_time = timer_read(); +            } +#       else +             read_rows_on_col(matrix+offset, current_col); +#       endif + +    } +#endif + +#   if (DEBOUNCING_DELAY > 0) +        if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) { +            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { +                matrix[i+offset] = matrix_debouncing[i+offset]; +            } +            debouncing = false; +        } +#   endif + +    return 1; +} + +#ifdef USE_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]; +    } + +#ifdef BACKLIGHT_ENABLE +    // Write backlight level for slave to read +    serial_master_buffer[SERIAL_LED_ADDR] = get_backlight_level(); +#endif +    return 0; +} +#endif + +uint8_t matrix_scan(void) +{ +    uint8_t ret = _matrix_scan(); + +#ifdef USE_I2C +    if( i2c_transaction() ) { +#else // USE_SERIAL +    if( serial_transaction() ) { +#endif +        // turn on the indicator led when halves are disconnected +        TXLED1; + +        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 +        TXLED0; +        error_count = 0; +    } +    return ret; +} + +void matrix_slave_scan(void) { +    _matrix_scan(); + +    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND; + +#ifdef USE_I2C +    for (int i = 0; i < ROWS_PER_HAND; ++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]; +    } + +#ifdef BACKLIGHT_ENABLE +    // Read backlight level sent from master and update level on slave +    backlight_set(serial_master_buffer[SERIAL_LED_ADDR]); +#endif +#endif +} + +bool matrix_is_modified(void) +{ +    if (debouncing) return false; +    return true; +} + +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++) { +        phex(row); print(": "); +        pbin_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; +} + +#if (DIODE_DIRECTION == COL2ROW) + +static void init_cols(void) +{ +    for(uint8_t x = 0; x < MATRIX_COLS; x++) { +        uint8_t pin = col_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} + +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) +{ +    // Store last value of row prior to reading +    matrix_row_t last_row_value = current_matrix[current_row]; + +    // Clear data in matrix row +    current_matrix[current_row] = 0; + +    // Select row and wait for row selecton to stabilize +    select_row(current_row); +    wait_us(30); + +    // For each col... +    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + +        // Select the col pin to read (active low) +        uint8_t pin = col_pins[col_index]; +        uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); + +        // Populate the matrix row with the state of the col pin +        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index); +    } + +    // Unselect row +    unselect_row(current_row); + +    return (last_row_value != current_matrix[current_row]); +} + +static void select_row(uint8_t row) +{ +    uint8_t pin = row_pins[row]; +    _SFR_IO8((pin >> 4) + 1) |=  _BV(pin & 0xF); // OUT +    _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_row(uint8_t row) +{ +    uint8_t pin = row_pins[row]; +    _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +    _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +} + +static void unselect_rows(void) +{ +    for(uint8_t x = 0; x < ROWS_PER_HAND; x++) { +        uint8_t pin = row_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} + +#elif (DIODE_DIRECTION == ROW2COL) + +static void init_rows(void) +{ +    for(uint8_t x = 0; x < ROWS_PER_HAND; x++) { +        uint8_t pin = row_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} + +static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) +{ +    bool matrix_changed = false; + +    // Select col and wait for col selecton to stabilize +    select_col(current_col); +    wait_us(30); + +    // For each row... +    for(uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) +    { + +        // Store last value of row prior to reading +        matrix_row_t last_row_value = current_matrix[row_index]; + +        // Check row pin state +        if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0) +        { +            // Pin LO, set col bit +            current_matrix[row_index] |= (ROW_SHIFTER << current_col); +        } +        else +        { +            // Pin HI, clear col bit +            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); +        } + +        // Determine if the matrix changed state +        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) +        { +            matrix_changed = true; +        } +    } + +    // Unselect col +    unselect_col(current_col); + +    return matrix_changed; +} + +static void select_col(uint8_t col) +{ +    uint8_t pin = col_pins[col]; +    _SFR_IO8((pin >> 4) + 1) |=  _BV(pin & 0xF); // OUT +    _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_col(uint8_t col) +{ +    uint8_t pin = col_pins[col]; +    _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +    _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +} + +static void unselect_cols(void) +{ +    for(uint8_t x = 0; x < MATRIX_COLS; x++) { +        uint8_t pin = col_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} + +#endif diff --git a/keyboards/zen/readme.md b/keyboards/zen/readme.md new file mode 100644 index 0000000000..36c63d2933 --- /dev/null +++ b/keyboards/zen/readme.md @@ -0,0 +1,12 @@ +Zen Keyboard +==== + +A split ergo keyboard with a few goals in mind: + - Be as thin as possible. Other split KBs (Let's Split, Nyquist, Iris) are 15.2mm thick. The Zen is only 8.0mm thick. + - Layout designed for gaming. 1.5u pinky keys, ortho alphas, and angled thumb keys. After trying Ortholiniear, Atreus62, and Ergodox, this is the best layout for gaming and typing. + - RGB backlighting. 16 WS2812b LEDs shine through the perimeter switches. The SK6812 variant are cheap and easy to solder. + - Price. Using Arduino Pro Micro, SK6812 LEDs, and PCB FR4 for the case, the cost of each half without switches or caps can be reduced to under $20 when purchased at volume. + +A build guide and more info for this keyboard can be found here: [Zen Build Guide](https://legonut.gitbooks.io/zen-keyboard/content/) + +Maintained by u/legonut3
\ No newline at end of file diff --git a/keyboards/zen/rev1/config.h b/keyboards/zen/rev1/config.h new file mode 100644 index 0000000000..efae558927 --- /dev/null +++ b/keyboards/zen/rev1/config.h @@ -0,0 +1,91 @@ +/* +Copyright 2017 Danny Nguyen <danny@hexwire.com> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef REV1_CONFIG_H +#define REV1_CONFIG_H + +#include QMK_KEYBOARD_CONFIG_H + +/* USB Device descriptor parameter */ +#define VENDOR_ID       0xCEEB +#define PRODUCT_ID      0x1256 +#define DEVICE_VER      0x0200 +#define MANUFACTURER    Legonut +#define PRODUCT         Project Zen +#define DESCRIPTION     Split gaming keyboard + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 7 + +// wiring of each half +#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, D4, B6 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* 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 DEBOUNCING_DELAY 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ +    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +#define BACKLIGHT_PIN F4 +#define BACKLIGHT_LEVELS 5 + + +/* ws2812 RGB LED */ +#define RGB_DI_PIN D1 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 16    // Number of LEDs +#define ws2812_PORTREG  PORTD +#define ws2812_DDRREG   DDRD + +/* + * 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 + +#endif diff --git a/keyboards/zen/rev1/rev1.c b/keyboards/zen/rev1/rev1.c new file mode 100644 index 0000000000..5f4cd32f69 --- /dev/null +++ b/keyboards/zen/rev1/rev1.c @@ -0,0 +1,22 @@ +#include "rev1.h" + +#ifdef SSD1306OLED +void led_set_kb(uint8_t usb_led) { +    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here +    led_set_user(usb_led); +} +#endif + +void matrix_init_kb(void) { + +    // // green led on +    // DDRD |= (1<<5); +    // PORTD &= ~(1<<5); + +    // // orange led on +    // DDRB |= (1<<0); +    // PORTB &= ~(1<<0); + +	matrix_init_user(); +}; + diff --git a/keyboards/zen/rev1/rev1.h b/keyboards/zen/rev1/rev1.h new file mode 100644 index 0000000000..4983bb2a30 --- /dev/null +++ b/keyboards/zen/rev1/rev1.h @@ -0,0 +1,40 @@ +#ifndef REV1_H +#define REV1_H + +#include "zen.h" + +//void promicro_bootloader_jmp(bool program); +#include "quantum.h" + + +#ifdef USE_I2C +#include <stddef.h> +#ifdef __AVR__ +    #include <avr/io.h> +    #include <avr/interrupt.h> +#endif +#endif + +//void promicro_bootloader_jmp(bool program); + +#define KEYMAP( \ +    k00, k01, k02, k03, k04, k05,               k55, k54, k53, k52, k51, k50, \ +    k10, k11, k12, k13, k14, k15,               k65, k64, k63, k62, k61, k60, \ +    k20, k21, k22, k23, k24, k25,               k75, k74, k73, k72, k71, k70, \ +    k30, k31, k32, k33, k34, k35,               k85, k84, k83, k82, k81, k80, \ +    k40, k41, k42, k43, k44, k45, k46,   k96,   k95, k94, k93, k92, k91, k90 \ +    ) \ +    { \ +        { k00, k01, k02, k03, k04, k05, KC_NO }, \ +        { k10, k11, k12, k13, k14, k15, KC_NO }, \ +        { k20, k21, k22, k23, k24, k25, KC_NO }, \ +        { k30, k31, k32, k33, k34, k35, KC_NO }, \ +        { k40, k41, k42, k43, k44, k45, k46 }, \ +        { k50, k51, k52, k53, k54, k55, KC_NO }, \ +        { k60, k61, k62, k63, k64, k65, KC_NO }, \ +        { k70, k71, k72, k73, k74, k75, KC_NO }, \ +        { k80, k81, k82, k83, k84, k85, KC_NO }, \ +        { k90, k91, k92, k93, k94, k95, k96 } \ +    } + +#endif diff --git a/keyboards/zen/rev1/rules.mk b/keyboards/zen/rev1/rules.mk new file mode 100644 index 0000000000..d7463419b4 --- /dev/null +++ b/keyboards/zen/rev1/rules.mk @@ -0,0 +1,2 @@ +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes diff --git a/keyboards/zen/rules.mk b/keyboards/zen/rules.mk new file mode 100644 index 0000000000..32d3dc51c8 --- /dev/null +++ b/keyboards/zen/rules.mk @@ -0,0 +1,73 @@ +SRC += matrix.c \ +	   split_util.c \ +	   serial.c + +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +#     This will define a symbol, F_CPU, in all source code files equal to the +#     processor frequency in Hz. You can then use this symbol in your source code to +#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done +#     automatically to create a 32-bit value in your source code. +# +#     This will be an integer division of F_USB below, as it is sourced by +#     F_USB after it has run through any CPU prescalers. Note that this value +#     does not *change* the processor frequency - it should merely be updated to +#     reflect the processor speed set externally so that the code can use accurate +#     software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +#     This will define a symbol, F_USB, in all source code files equal to the +#     input clock frequency (before any prescaling is performed) in Hz. This value may +#     differ from F_CPU if prescaling is used on the latter, and is required as the +#     raw input clock is fed directly to the PLL sections of the AVR for high speed +#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +#     at the end, this will be done automatically to create a 32-bit value in your +#     source code. +# +#     If no clock division is performed on the input clock inside the AVR (via the +#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Bootloader +#     This definition is optional, and if your keyboard supports multiple bootloaders of +#     different sizes, comment this out, and the correct address will be loaded  +#     automatically (+60). See bootloader.mk for all options. +BOOTLOADER = caterina + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + +# Build Options +#   change to "no" to disable the options, or define them in the Makefile in +#   the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes       # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes       # Audio control and System control(+450) +CONSOLE_ENABLE = no         # Console for debug(+400) +COMMAND_ENABLE = yes        # Commands for debug and configuration +NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality +MIDI_ENABLE = no            # MIDI controls +AUDIO_ENABLE = no           # Audio output on port C6 +UNICODE_ENABLE = no         # Unicode +BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. +SUBPROJECT_rev1 = yes +USE_I2C = no +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend + +CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = zen/rev1 diff --git a/keyboards/zen/serial.c b/keyboards/zen/serial.c new file mode 100644 index 0000000000..74bcbb6bf6 --- /dev/null +++ b/keyboards/zen/serial.c @@ -0,0 +1,228 @@ +/* + * WARNING: be careful changing this code, it is very timing dependent + */ + +#ifndef F_CPU +#define F_CPU 16000000 +#endif + +#include <avr/io.h> +#include <avr/interrupt.h> +#include <util/delay.h> +#include <stdbool.h> +#include "serial.h" + +#ifndef USE_I2C + +// Serial pulse period in microseconds. Its probably a bad idea to lower this +// value. +#define SERIAL_DELAY 24 + +uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0}; +uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0}; + +#define SLAVE_DATA_CORRUPT (1<<0) +volatile uint8_t status = 0; + +inline static +void serial_delay(void) { +  _delay_us(SERIAL_DELAY); +} + +inline static +void serial_output(void) { +  SERIAL_PIN_DDR |= SERIAL_PIN_MASK; +} + +// make the serial pin an input with pull-up resistor +inline static +void serial_input(void) { +  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK; +  SERIAL_PIN_PORT |= SERIAL_PIN_MASK; +} + +inline static +uint8_t serial_read_pin(void) { +  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK); +} + +inline static +void serial_low(void) { +  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK; +} + +inline static +void serial_high(void) { +  SERIAL_PIN_PORT |= SERIAL_PIN_MASK; +} + +void serial_master_init(void) { +  serial_output(); +  serial_high(); +} + +void serial_slave_init(void) { +  serial_input(); + +  // Enable INT0 +  EIMSK |= _BV(INT0); +  // Trigger on falling edge of INT0 +  EICRA &= ~(_BV(ISC00) | _BV(ISC01)); +} + +// Used by the master to synchronize timing with the slave. +static +void sync_recv(void) { +  serial_input(); +  // This shouldn't hang if the slave disconnects because the +  // serial line will float to high if the slave does disconnect. +  while (!serial_read_pin()); +  serial_delay(); +} + +// Used by the slave to send a synchronization signal to the master. +static +void sync_send(void) { +  serial_output(); + +  serial_low(); +  serial_delay(); + +  serial_high(); +} + +// Reads a byte from the serial line +static +uint8_t serial_read_byte(void) { +  uint8_t byte = 0; +  serial_input(); +  for ( uint8_t i = 0; i < 8; ++i) { +    byte = (byte << 1) | serial_read_pin(); +    serial_delay(); +    _delay_us(1); +  } + +  return byte; +} + +// Sends a byte with MSB ordering +static +void serial_write_byte(uint8_t data) { +  uint8_t b = 8; +  serial_output(); +  while( b-- ) { +    if(data & (1 << b)) { +      serial_high(); +    } else { +      serial_low(); +    } +    serial_delay(); +  } +} + +// interrupt handle to be used by the slave device +ISR(SERIAL_PIN_INTERRUPT) { +  sync_send(); + +  uint8_t checksum = 0; +  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) { +    serial_write_byte(serial_slave_buffer[i]); +    sync_send(); +    checksum += serial_slave_buffer[i]; +  } +  serial_write_byte(checksum); +  sync_send(); + +  // wait for the sync to finish sending +  serial_delay(); + +  // read the middle of pulses +  _delay_us(SERIAL_DELAY/2); + +  uint8_t checksum_computed = 0; +  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) { +    serial_master_buffer[i] = serial_read_byte(); +    sync_send(); +    checksum_computed += serial_master_buffer[i]; +  } +  uint8_t checksum_received = serial_read_byte(); +  sync_send(); + +  serial_input(); // end transaction + +  if ( checksum_computed != checksum_received ) { +    status |= SLAVE_DATA_CORRUPT; +  } else { +    status &= ~SLAVE_DATA_CORRUPT; +  } +} + +inline +bool serial_slave_DATA_CORRUPT(void) { +  return status & SLAVE_DATA_CORRUPT; +} + +// Copies the serial_slave_buffer to the master and sends the +// serial_master_buffer to the slave. +// +// Returns: +// 0 => no error +// 1 => slave did not respond +int serial_update_buffers(void) { +  // this code is very time dependent, so we need to disable interrupts +  cli(); + +  // signal to the slave that we want to start a transaction +  serial_output(); +  serial_low(); +  _delay_us(1); + +  // wait for the slaves response +  serial_input(); +  serial_high(); +  _delay_us(SERIAL_DELAY); + +  // check if the slave is present +  if (serial_read_pin()) { +    // slave failed to pull the line low, assume not present +    sei(); +    return 1; +  } + +  // if the slave is present syncronize with it +  sync_recv(); + +  uint8_t checksum_computed = 0; +  // receive data from the slave +  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) { +    serial_slave_buffer[i] = serial_read_byte(); +    sync_recv(); +    checksum_computed += serial_slave_buffer[i]; +  } +  uint8_t checksum_received = serial_read_byte(); +  sync_recv(); + +  if (checksum_computed != checksum_received) { +    sei(); +    return 1; +  } + +  uint8_t checksum = 0; +  // send data to the slave +  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) { +    serial_write_byte(serial_master_buffer[i]); +    sync_recv(); +    checksum += serial_master_buffer[i]; +  } +  serial_write_byte(checksum); +  sync_recv(); + +  // always, release the line when not in use +  serial_output(); +  serial_high(); + +  sei(); +  return 0; +} + +#endif diff --git a/keyboards/zen/serial.h b/keyboards/zen/serial.h new file mode 100644 index 0000000000..15fe4db7b4 --- /dev/null +++ b/keyboards/zen/serial.h @@ -0,0 +1,26 @@ +#ifndef MY_SERIAL_H +#define MY_SERIAL_H + +#include "config.h" +#include <stdbool.h> + +/* TODO:  some defines for interrupt setup */ +#define SERIAL_PIN_DDR DDRD +#define SERIAL_PIN_PORT PORTD +#define SERIAL_PIN_INPUT PIND +#define SERIAL_PIN_MASK _BV(PD0) +#define SERIAL_PIN_INTERRUPT INT0_vect + +#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 +#define SERIAL_MASTER_BUFFER_LENGTH 1 + +// Buffers for master - slave communication +extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; +extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH]; + +void serial_master_init(void); +void serial_slave_init(void); +int serial_update_buffers(void); +bool serial_slave_data_corrupt(void); + +#endif diff --git a/keyboards/zen/split_rgb.c b/keyboards/zen/split_rgb.c new file mode 100644 index 0000000000..6d7cb44cf0 --- /dev/null +++ b/keyboards/zen/split_rgb.c @@ -0,0 +1,41 @@ +#include <stdint.h> +#include <stdbool.h> +#include "split_util.h" +#include "progmem.h" +#include "print.h" +#include "rgblight.h" + +#ifdef USE_I2C +#  include "i2c.h" +#else // USE_SERIAL +#  include "serial.h" +#endif + + +rgblight_config_t rgblight_config; + +void rgblight_slave_update(void) { +  //rgblight_effect_christmas(); +} + + +void rgblight_set(void) { +  if (rgblight_config.enable) { +    #ifdef RGBW +      ws2812_setleds_rgbw(led, RGBLED_NUM); +    #else +      ws2812_setleds(led, RGBLED_NUM); +    #endif +  } else { +    for (uint8_t i = 0; i < RGBLED_NUM; i++) { +      led[i].r = 0; +      led[i].g = 0; +      led[i].b = 0; +    } +    #ifdef RGBW +      ws2812_setleds_rgbw(led, RGBLED_NUM); +    #else +      ws2812_setleds(led, RGBLED_NUM); +    #endif +  } +} diff --git a/keyboards/zen/split_rgb.h b/keyboards/zen/split_rgb.h new file mode 100644 index 0000000000..5f552890af --- /dev/null +++ b/keyboards/zen/split_rgb.h @@ -0,0 +1,6 @@ +#ifndef SPLIT_RGB_H +#define SPLIT_RGB_H + +void rgblight_slave_update(void); + +#endif diff --git a/keyboards/zen/split_util.c b/keyboards/zen/split_util.c new file mode 100644 index 0000000000..346cbc9089 --- /dev/null +++ b/keyboards/zen/split_util.c @@ -0,0 +1,86 @@ +#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" +#include "timer.h" + +#ifdef USE_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 +    i2c_master_init(); +#ifdef SSD1306OLED +    matrix_master_OLED_init (); +#endif +#else +    serial_master_init(); +#endif +} + +static void keyboard_slave_setup(void) { +  timer_init(); +#ifdef USE_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(); +    } +} diff --git a/keyboards/zen/split_util.h b/keyboards/zen/split_util.h new file mode 100644 index 0000000000..595a0659e1 --- /dev/null +++ b/keyboards/zen/split_util.h @@ -0,0 +1,20 @@ +#ifndef SPLIT_KEYBOARD_UTIL_H +#define SPLIT_KEYBOARD_UTIL_H + +#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); + +#endif diff --git a/keyboards/zen/zen.c b/keyboards/zen/zen.c new file mode 100644 index 0000000000..22131ef5c7 --- /dev/null +++ b/keyboards/zen/zen.c @@ -0,0 +1 @@ +#include "zen.h" diff --git a/keyboards/zen/zen.h b/keyboards/zen/zen.h new file mode 100644 index 0000000000..4560ff8cda --- /dev/null +++ b/keyboards/zen/zen.h @@ -0,0 +1,23 @@ +#ifndef ZEN_H +#define ZEN_H + +#include "rev1.h" +#include "quantum.h" + +// Used to create a keymap using only KC_ prefixed keys +#define KC_KEYMAP( \ +    L00, L01, L02, L03, L04, L05,           R01, R02, R03, R04, R05, R06,\ +    L10, L11, L12, L13, L14, L15,           R11, R12, R13, R14, R15, R16,\ +    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26,\ +    L30, L31, L32, L33, L34, L35,           R31, R32, R33, R34, R35, R36,\ +    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +    ) \ +    KEYMAP( \ +        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \ +        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \ +        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \ +        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35,                     KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \ +        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46, \ +    ) + +#endif
\ No newline at end of file  | 
