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

This commit is contained in:
QMK Bot 2022-09-14 17:56:45 +00:00
commit da60b89dc0
9 changed files with 341 additions and 0 deletions

View file

@ -0,0 +1,17 @@
/* copyright 2021 Joah Nelson (jels)
*
* 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
* MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
*/
#include "calice.h"

View file

@ -0,0 +1,44 @@
/* copyright 2021 Joah Nelson (jels)
*
* 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
* MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define ____ KC_NO
#define LAYOUT_all( \
K0B0, K0A0, K0B1, K0A1, K0B2, K0A2, K0B3, K0A4, K0B4, K0A5, K0B5, K0A6, K0B6, K0A7, K0B7, \
K1B0, K1A0, K1B1, K1A1, K1B2, K1A2, K1B3, K1A4, K1B4, K1A5, K1B5, K1A6, K1B6, K2B6, K1A7, K1B7, \
K2B0, K2A0, K2B1, K2A1, K2B2, K2A2, K2B3, K2A4, K2B4, K2A5, K2B5, K2A6, K3B6, K2A7, K2B7, \
K3B0, K3A0, K3B1, K3A1, K3B2, K3A2, K3B3, K3A4, K3B4, K3A5, K3B5, K3A6, K3A7, K3B7, \
K4B0, K4A0, K4B1, K4A1, K4B2, K4A2, K4B3, K4A4, K4B4, K4A5, K4B5, K4A6, K4B6, K4A7, \
K5B0, K5A0, K5B2, K5A2, K5A4, K5A5, K5B6, K5A7, K5B7 \
){ \
{K0A0, K0A1, K0A2, ____, K0A4, K0A5, K0A6, K0A7}, \
{K0B0, K0B1, K0B2, K0B3, K0B4, K0B5, K0B6, K0B7}, \
{K1A0, K1A1, K1A2, ____, K1A4, K1A5, K1A6, K1A7}, \
{K1B0, K1B1, K1B2, K1B3, K1B4, K1B5, K1B6, K1B7}, \
{K2A0, K2A1, K2A2, ____, K2A4, K2A5, K2A6, K2A7}, \
{K2B0, K2B1, K2B2, K2B3, K2B4, K2B5, K2B6, K2B7}, \
{K3A0, K3A1, K3A2, ____, K3A4, K3A5, K3A6, K3A7}, \
{K3B0, K3B1, K3B2, K3B3, K3B4, K3B5, K3B6, K3B7}, \
{K4A0, K4A1, K4A2, ____, K4A4, K4A5, K4A6, K4A7}, \
{K4B0, K4B1, K4B2, K4B3, K4B4, K4B5, K4B6, ____}, \
{K5A0, ____, K5A2, ____, K5A4, K5A5, ____, K5A7}, \
{K5B0, ____, K5B2, ____, ____, ____, K5B6, K5B7} \
}

View file

@ -0,0 +1,47 @@
/* Copyright 2021 Joah Nelson (Jels)
*
* 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"
/* Define Matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 8
#define BOOTMAGIC_LITE_COLUMN 0
#define BOOTMAGIC_LITE_ROW 1
/*Define Matrix Pins */
#define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3}
#define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2}
#define LED_CAPS_LOCK_PIN D6
/* Envoder */
#define ENCODERS_PAD_A {B0}
#define ENCODERS_PAD_B {B1}
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View file

@ -0,0 +1,98 @@
{
"keyboard_name": "Calice",
"manufacturer": "QwertleKeys",
"url": "",
"maintainer": "Jels",
"usb": {
"vid": "0x716B",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"1,0", "x":0.5, "y":0},
{"label":"0,0", "x":1.75, "y":0},
{"label":"1,1", "x":2.75, "y":0},
{"label":"0,1", "x":3.75, "y":0},
{"label":"1,2", "x":4.75, "y":0},
{"label":"0,2", "x":6.25, "y":0},
{"label":"1,3", "x":7.25, "y":0},
{"label":"0,4", "x":8.25, "y":0},
{"label":"1,4", "x":9.25, "y":0},
{"label":"0,5", "x":10.75, "y":0},
{"label":"1,5", "x":11.75, "y":0},
{"label":"0,6", "x":12.75, "y":0},
{"label":"1,6", "x":13.75, "y":0},
{"label":"0,7", "x":15, "y":0},
{"label":"1,7", "x":16.75, "y":0},
{"label":"3,7", "x":17, "y":1},
{"label":"3,0", "x":1.25, "y":1.25},
{"label":"2,0", "x":2.25, "y":1.25},
{"label":"3,1", "x":3.25, "y":1.25},
{"label":"2,1", "x":4.25, "y":1.25},
{"label":"3,2", "x":5.25, "y":1.25},
{"label":"2,2", "x":6.25, "y":1.25},
{"label":"3,3", "x":7.25, "y":1.25},
{"label":"2,4", "x":8.75, "y":1.25},
{"label":"3,4", "x":9.75, "y":1.25},
{"label":"2,5", "x":10.75, "y":1.25},
{"label":"3,5", "x":11.75, "y":1.25},
{"label":"2,6", "x":12.75, "y":1.25},
{"label":"3,6", "x":13.75, "y":1.25},
{"label":"5,6", "x":14.75, "y":1.25},
{"label":"2,7", "x":15.75, "y":1.25},
{"label":"5,7", "x":17.25, "y":2},
{"label":"5,0", "x":1, "y":2.25, "w":1.5},
{"label":"4,0", "x":2.5, "y":2.25},
{"label":"5,1", "x":3.5, "y":2.25},
{"label":"4,1", "x":4.5, "y":2.25},
{"label":"5,2", "x":5.5, "y":2.25},
{"label":"4,2", "x":6.5, "y":2.25},
{"label":"5,3", "x":8.5, "y":2.25},
{"label":"4,4", "x":9.5, "y":2.25},
{"label":"5,4", "x":10.5, "y":2.25},
{"label":"4,5", "x":11.5, "y":2.25},
{"label":"5,5", "x":12.5, "y":2.25},
{"label":"4,6", "x":13.5, "y":2.25},
{"label":"7,6", "x":14.5, "y":2.25},
{"label":"4,7", "x":15.5, "y":2.25, "w":1.5},
{"label":"7,7", "x":17.5, "y":3},
{"label":"7,0", "x":0.75, "y":3.25, "w":1.75},
{"label":"6,0", "x":2.5, "y":3.25},
{"label":"7,1", "x":3.5, "y":3.25},
{"label":"6,1", "x":4.5, "y":3.25},
{"label":"7,2", "x":5.5, "y":3.25},
{"label":"6,2", "x":6.5, "y":3.25},
{"label":"7,3", "x":9, "y":3.25},
{"label":"6,4", "x":10, "y":3.25},
{"label":"7,4", "x":11, "y":3.25},
{"label":"6,5", "x":12, "y":3.25},
{"label":"7,5", "x":13, "y":3.25},
{"label":"6,6", "x":14, "y":3.25},
{"label":"6,7", "x":15, "y":3.25, "w":2.25},
{"label":"9,0", "x":0.5, "y":4.25, "w":2.25},
{"label":"8,0", "x":2.75, "y":4.25},
{"label":"9,1", "x":3.75, "y":4.25},
{"label":"8,1", "x":4.75, "y":4.25},
{"label":"9,2", "x":5.75, "y":4.25},
{"label":"8,2", "x":6.75, "y":4.25},
{"label":"9,3", "x":8.75, "y":4.25},
{"label":"8,4", "x":9.75, "y":4.25},
{"label":"9,4", "x":10.75, "y":4.25},
{"label":"8,5", "x":11.75, "y":4.25},
{"label":"9,5", "x":12.75, "y":4.25},
{"label":"8,6", "x":13.75, "y":4.25},
{"label":"9,6", "x":14.75, "y":4.25, "w":1.75},
{"label":"8,7", "x":16.5, "y":4.25},
{"label":"11,0", "x":0.5, "y":5.25, "w":1.5},
{"label":"10,0", "x":3.25, "y":5.25, "w":1.5},
{"label":"11,2", "x":4.75, "y":5.25, "w":2.25},
{"label":"10,2", "x":7, "y":5.25},
{"label":"10,4", "x":8.25, "y":5.25, "w":2.75},
{"label":"10,5", "x":11, "y":5.25, "w":1.5},
{"label":"11,6", "x":15.5, "y":5.25},
{"label":"10,7", "x":16.5, "y":5.25},
{"label":"11,7", "x":17.5, "y":5.25}]
}
}
}

View file

@ -0,0 +1,38 @@
/* copyright 2021 Joah Nelson (jels)
*
* 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
* MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//base layer
[0] = LAYOUT_all(
KC_ESC, 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_F13, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};

View file

@ -0,0 +1,54 @@
/* copyright 2021 Joah Nelson (jels)
*
* 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
* MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//base layer
[0] = LAYOUT_all(
KC_ESC, 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_F13, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};

View file

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

View file

@ -0,0 +1,23 @@
# Calice
![Calice](https://i.imgur.com/5Xsw1ojl.jpg)
## A 75% Alice
* Keyboard Maintainer: [jels](https://github.com/Jels02)
* Hardware Supported: Calice PCB
* Hardware Availabililty: Groupbuy
Make example for this keyboard (after setting up your build environment):
make qwertlekeys/calice:default
Flashing example for this keyboard:
make qwertlekeys/calice:default:flash
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).
* **Bootmagic reset**: Hold down the top left key (ESC) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to `RESET` if it is available

View file

@ -0,0 +1,19 @@
# MCU name
MCU = atmega32u4
# Bootloader Selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes