Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-04-13 14:31:55 +00:00
commit 6814e32757
12 changed files with 547 additions and 0 deletions

View file

@ -0,0 +1,78 @@
{
"keyboard_name": "Leeloo",
"url": "https://clicketysplit.ca/pages/leeloo",
"maintainer": "Clickety Split Ltd",
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":0, "y":0.5},
{"label":"1", "x":1, "y":0.4},
{"label":"2", "x":2, "y":0.2},
{"label":"3", "x":3, "y":0},
{"label":"4", "x":4, "y":0.2},
{"label":"5", "x":5, "y":0.4},
{"label":"6", "x":9, "y":0.4},
{"label":"7", "x":10, "y":0.2},
{"label":"8", "x":11, "y":0},
{"label":"9", "x":12, "y":0.2},
{"label":"0", "x":13, "y":0.4},
{"label":"Back Slash", "x":14, "y":0.5},
{"label":"TAB", "x":0, "y":1.5},
{"label":"Q", "x":1, "y":1.4},
{"label":"W", "x":2, "y":1.2},
{"label":"E", "x":3, "y":1.0},
{"label":"R", "x":4, "y":1.2},
{"label":"T", "x":5, "y":1.4},
{"label":"Y", "x":9, "y":1.4},
{"label":"U", "x":10, "y":1.2},
{"label":"I", "x":11, "y":1.0},
{"label":"O", "x":12, "y":1.2},
{"label":"P", "x":13, "y":1.4},
{"label":"GRV", "x":14, "y":1.5},
{"label":"CAPS", "x":0, "y":2.5},
{"label":"A", "x":1, "y":2.4},
{"label":"S", "x":2, "y":2.2},
{"label":"D", "x":3, "y":2.0},
{"label":"F", "x":4, "y":2.2},
{"label":"G", "x":5, "y":2.4},
{"label":"H", "x":9, "y":2.4},
{"label":"J", "x":10, "y":2.2},
{"label":"K", "x":11, "y":2.0},
{"label":"L", "x":12, "y":2.2},
{"label":";", "x":13, "y":2.4},
{"label":"'", "x":14, "y":2.5},
{"label":"Shift", "x":0, "y":3.5},
{"label":"Z", "x":1, "y":3.4},
{"label":"X", "x":2, "y":3.2},
{"label":"C", "x":3, "y":3.0},
{"label":"V", "x":4, "y":3.2},
{"label":"B", "x":5, "y":3.4},
{"label":"N", "x":9, "y":3.4},
{"label":"M", "x":10, "y":3.2},
{"label":",", "x":11, "y":3.0},
{"label":".", "x":12, "y":3.2},
{"label":"/", "x":13, "y":3.4},
{"label":"Shift", "x":14, "y":3.5},
{"label":"Alt", "x":2.7, "y":4.6},
{"label":"Ctrl", "x":3.8, "y":4.5},
{"label":"Enter", "x":5.7, "y":3.57},
{"label":"MINS", "x":7.12, "y":2.96},
{"label":"GUI", "x":6.25, "y":3.4},
{"label":"GUI", "x":7.75, "y":3.4},
{"label":"EQL", "x":6.39, "y":6.86},
{"label":"Space", "x":8.08, "y":6.18},
{"label":"Back Space", "x":10.2, "y":4.5},
{"label":"Delete", "x":11.3, "y":4.6}
]
}
}
}

View file

@ -0,0 +1,35 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* 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
// Select hand configuration
// #define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
#ifdef TAPPING_TERM
#undef TAPPING_TERM
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 150
#endif
// If rotary encoders are used, and they require more or less resolution/sensitivity
// you may try increasing or decreasing the value.
// #define ENCODER_RESOLUTION 2

View file

@ -0,0 +1,114 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
enum layer_names {
_BASE,
_LOWER,
_RAISE,
_ADJUST
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* QWERTY
* ,-----------------------------------------. ,-----------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | \ |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | ` |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | CAPS | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
* |------+------+------+------+------+------| LGUI | | RGUI |------+------+------+------+------+------|
* |LSHIFT| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RSHIFT|
* `-----------------------------------------/ / \ \-----------------------------------------'
* | LALT | LCTL | ENT | / MINS / \ EQL \ | SPC | BSPC | DEL |
* | | | LOWR |/ RAISE / \RAISE \ | LOWR | | |
* `-------------------------------' '------''-----------------------'
*/
[_BASE] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV,
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_LGUI, KC_RGUI, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LALT, KC_LCTL, LT(1,KC_ENT), LT(2,KC_MINS), LT(2,KC_EQL), LT(1,KC_SPC), KC_BSPC, KC_DEL
),
/* LOWER
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | < | ( | [ | { |--------. ,-------| } | ] | ) | > | | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |--------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | LALT | LCTL | ENT | / MINS / \ EQL \ | SPC | BSPC | DEL |
* | | | LOWR |/ RAISE / \RAISE \ | LOWR | | |
* `-------------------------------' '------''-----------------------'
*/
[_LOWER] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_LABK, KC_LPRN, KC_LBRC, KC_LCBR, KC_RCBR, KC_RBRC, KC_RPRN, KC_RABK, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
/* RAISE
* ,-----------------------------------------. ,-----------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | PGUP | HOME | UP | END | | F12 |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |-------. ,-------| PGDN | LEFT | DOWN | RIGHT| | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | LWRD | | RWRD | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | LALT | LCTL | ENT | / MINS / \ EQL \ | SPC | DEL | DEL |
* | | | LOWR |/ RAISE / \RAISE \ | LOWR | | |
* `-------------------------------' '------''-----------------------'
*/
[_RAISE] = LAYOUT(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, KC_F12,
_______, _______, _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, C(KC_LEFT), _______, C(KC_RGHT), _______, _______,
_______, _______, _______, _______, _______, _______, KC_DEL, _______
),
/* ADJUST
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |--------. ,-------| | | | | | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |--------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | LALT | LCTL | ENT | / MINS / \ EQL \ | SPC | BSPC | DEL |
* | | | LOWR |/ RAISE / \RAISE \ | LOWR | | |
* `-------------------------------' '------''-----------------------'
*/
[_ADJUST] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View file

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

View file

@ -0,0 +1,131 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "leeloo.h"
#ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
if (!is_keyboard_master()) {
return OLED_ROTATION_180;
} else {
return rotation;
}
}
static void render_keylock_status(led_t led_state) {
oled_write_P(PSTR("Lock: "), false);
oled_write_P(PSTR("CAPS"), led_state.caps_lock);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("NUML"), led_state.num_lock);
oled_write_P(PSTR(" "), false);
oled_write_ln_P(PSTR("SCLK"), led_state.scroll_lock);
}
static void render_mod_status(uint8_t modifiers) {
oled_write_P(PSTR("Mods: "), false);
oled_write_P(PSTR("Sft"), (modifiers & MOD_MASK_SHIFT));
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("Ctl"), (modifiers & MOD_MASK_CTRL));
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("Alt"), (modifiers & MOD_MASK_ALT));
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
}
static void render_secondary_oled(void) {
// Version Information
oled_write_P(PSTR("Leeloo\n\n"), false);
oled_write_P(PSTR("Firmware: "), false);
oled_write_P(PSTR("v1.0"), false);
oled_write_P(PSTR("\n"), false);
oled_write_P(PSTR("Clickety Split Ltd."), false);
}
static void render_status(void) {
// Host Keyboard Layer Status
switch (get_highest_layer(default_layer_state)) {
case _BASE:
oled_write_P(PSTR("QWERTY | "), false);
break;
}
// Host Keyboard Layer Status
switch (get_highest_layer(layer_state)) {
case 0:
oled_write_P(PSTR("Base \n"), false);
break;
case _LOWER:
oled_write_P(PSTR("Lower \n"), false);
break;
case _RAISE:
oled_write_P(PSTR("Raise \n"), false);
break;
case _ADJUST:
oled_write_P(PSTR("Adjust \n"), false);
break;
default:
oled_write_P(PSTR("Unknown \n"), false);
}
oled_write_P(PSTR("\n"), false);
render_keylock_status(host_keyboard_led_state());
render_mod_status(get_mods() | get_oneshot_mods());
}
bool oled_task_kb(void) {
if (!oled_task_user()) {
return false;
}
if (is_keyboard_master()) {
// Renders the current keyboard state (layer, lock, caps, scroll, etc)
render_status();
} else {
// Version Information
render_secondary_oled();
}
return false;
}
#endif // OLED_ENABLE
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 0) {
// Volume control
if (clockwise) {
tap_code_delay(KC_VOLD, 10);
} else {
tap_code_delay(KC_VOLU, 10);
}
} else if (index == 1) {
// Page up/Page down
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
}
return true;
}
#endif

View file

@ -0,0 +1,24 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#if defined(KEYBOARD_clickety_split_leeloo_rev1)
# include "rev1.h"
#endif

View file

@ -0,0 +1,16 @@
# Leeloo
![Leeloo](https://cdn.shopify.com/s/files/1/0599/3460/5491/files/Leeloo-rev1.0-w.jpg?v=1646798726)
Leeloo is a 4x6x5m ortholinear split keyboard kit made and sold by Clickety Split Ltd.
* Keyboard Maintainer: [Clickety Split](https://github.com/ClicketySplit)
* Hardware Supported: Leeloo PCB rev1, Pro Micro, Elite-C
* Hardware Availability: [clicketysplit.ca](https://clicketysplit.ca/pages/leeloo)
Make example, after setting up build environment:
make clickety_split/leeloo/rev1:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

View file

@ -0,0 +1,68 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4013
#define PRODUCT_ID 0x2022
#define DEVICE_VER 0x0013
#define MANUFACTURER Clickety Split Ltd
#define PRODUCT Leeloo
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
#define MATRIX_COLS 6
// wiring of each half
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
/* communication between sides */
#define SOFT_SERIAL_PIN D2
/* define tapping term */
#define TAPPING_TERM 100
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* encoder support */
#define ENCODERS_PAD_A { F5 }
#define ENCODERS_PAD_B { F4 }
#define ENCODERS_PAD_A_RIGHT { F4 }
#define ENCODERS_PAD_B_RIGHT { F5 }
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
// #define NO_DEBUG
/* disable print */
// #define NO_PRINT

View file

@ -0,0 +1,18 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "leeloo.h"

View file

@ -0,0 +1,40 @@
/* Copyright 2022 Clickety Split Ltd.
* https://clicketysplit.ca
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
L30, L31, L32, L33, L34, L35, L45, R45, R35, R34, R33, R32, R31, R30, \
L41, L42, L43, L44, R44, R43, R42, R41 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ KC_NO, L41, L42, L43, L44, L45 }, \
{ R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \
{ KC_NO, R41, R42, R43, R44, R45 } \
}

View file

@ -0,0 +1 @@
# Intentionally left blank.

View file

@ -0,0 +1,21 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
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
SPLIT_KEYBOARD = yes
DEFAULT_FOLDER = clickety_split/leeloo/rev1