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

This commit is contained in:
QMK Bot 2022-07-13 04:31:57 +00:00
commit 27dd4dc91e
9 changed files with 682 additions and 0 deletions

View File

@ -0,0 +1,63 @@
/*
Copyright 2022 Cipulot
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 0x6369
#define PRODUCT_ID 0x6B7A
#define DEVICE_VER 0x0001
#define MANUFACTURER Cipulot
#define PRODUCT Kallos
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS \
{ B3, B2, F0, C7, F4, F1 }
#define MATRIX_COL_PINS \
{ F5, F6, C6, B6, B5, B4, D7, D6, D4, D5, D3, F7, D2, D1, B7 }
#define UNUSED_PINS
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Lightbar pin and LED count definitions*/
#define RGB_DI_PIN D0
#define RGBLED_NUM 13
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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,422 @@
{
"keyboard_name": "Kallos",
"url": "",
"maintainer": "Cipulot",
"layouts": {
"LAYOUT_default": {
"layout": [
{
"label": "0,0",
"x": 0,
"y": 0
},
{
"label": "0,1",
"x": 1.25,
"y": 0
},
{
"label": "0,2",
"x": 2.25,
"y": 0
},
{
"label": "0,3",
"x": 3.25,
"y": 0
},
{
"label": "0,4",
"x": 4.25,
"y": 0
},
{
"label": "0,5",
"x": 5.5,
"y": 0
},
{
"label": "0,6",
"x": 6.5,
"y": 0
},
{
"label": "0,7",
"x": 7.5,
"y": 0
},
{
"label": "0,8",
"x": 8.5,
"y": 0
},
{
"label": "0,9",
"x": 9.75,
"y": 0
},
{
"label": "0,10",
"x": 10.75,
"y": 0
},
{
"label": "0,11",
"x": 11.75,
"y": 0
},
{
"label": "0,12",
"x": 12.75,
"y": 0
},
{
"label": "0,13",
"x": 14,
"y": 0
},
{
"label": "0,14",
"x": 15.25,
"y": 0
},
{
"label": "1,0",
"x": 0,
"y": 1.25
},
{
"label": "1,1",
"x": 1,
"y": 1.25
},
{
"label": "1,2",
"x": 2,
"y": 1.25
},
{
"label": "1,3",
"x": 3,
"y": 1.25
},
{
"label": "1,4",
"x": 4,
"y": 1.25
},
{
"label": "1,5",
"x": 5,
"y": 1.25
},
{
"label": "1,6",
"x": 6,
"y": 1.25
},
{
"label": "1,7",
"x": 7,
"y": 1.25
},
{
"label": "1,8",
"x": 8,
"y": 1.25
},
{
"label": "1,9",
"x": 9,
"y": 1.25
},
{
"label": "1,10",
"x": 10,
"y": 1.25
},
{
"label": "1,11",
"x": 11,
"y": 1.25
},
{
"label": "1,12",
"x": 12,
"y": 1.25
},
{
"label": "1,13",
"x": 13,
"y": 1.25
},
{
"label": "1,14",
"x": 14,
"y": 1.25
},
{
"label": "2,14",
"x": 15.25,
"y": 1.25
},
{
"label": "2,0",
"x": 0,
"y": 2.25,
"w": 1.5
},
{
"label": "2,1",
"x": 1.5,
"y": 2.25
},
{
"label": "2,2",
"x": 2.5,
"y": 2.25
},
{
"label": "2,3",
"x": 3.5,
"y": 2.25
},
{
"label": "2,4",
"x": 4.5,
"y": 2.25
},
{
"label": "2,5",
"x": 5.5,
"y": 2.25
},
{
"label": "2,6",
"x": 6.5,
"y": 2.25
},
{
"label": "2,7",
"x": 7.5,
"y": 2.25
},
{
"label": "2,8",
"x": 8.5,
"y": 2.25
},
{
"label": "2,9",
"x": 9.5,
"y": 2.25
},
{
"label": "2,10",
"x": 10.5,
"y": 2.25
},
{
"label": "2,11",
"x": 11.5,
"y": 2.25
},
{
"label": "2,12",
"x": 12.5,
"y": 2.25
},
{
"label": "2,13",
"x": 13.5,
"y": 2.25,
"w": 1.5
},
{
"label": "3,14",
"x": 15.25,
"y": 2.25
},
{
"label": "3,0",
"x": 0,
"y": 3.25,
"w": 1.75
},
{
"label": "3,1",
"x": 1.75,
"y": 3.25
},
{
"label": "3,2",
"x": 2.75,
"y": 3.25
},
{
"label": "3,3",
"x": 3.75,
"y": 3.25
},
{
"label": "3,4",
"x": 4.75,
"y": 3.25
},
{
"label": "3,5",
"x": 5.75,
"y": 3.25
},
{
"label": "3,6",
"x": 6.75,
"y": 3.25
},
{
"label": "3,7",
"x": 7.75,
"y": 3.25
},
{
"label": "3,8",
"x": 8.75,
"y": 3.25
},
{
"label": "3,9",
"x": 9.75,
"y": 3.25
},
{
"label": "3,10",
"x": 10.75,
"y": 3.25
},
{
"label": "3,11",
"x": 11.75,
"y": 3.25
},
{
"label": "3,13",
"x": 12.75,
"y": 3.25,
"w": 2.25
},
{
"label": "4,0",
"x": 0,
"y": 4.25,
"w": 2.25
},
{
"label": "4,1",
"x": 2.25,
"y": 4.25
},
{
"label": "4,2",
"x": 3.25,
"y": 4.25
},
{
"label": "4,3",
"x": 4.25,
"y": 4.25
},
{
"label": "4,4",
"x": 5.25,
"y": 4.25
},
{
"label": "4,5",
"x": 6.25,
"y": 4.25
},
{
"label": "4,6",
"x": 7.25,
"y": 4.25
},
{
"label": "4,7",
"x": 8.25,
"y": 4.25
},
{
"label": "4,8",
"x": 9.25,
"y": 4.25
},
{
"label": "4,9",
"x": 10.25,
"y": 4.25
},
{
"label": "4,10",
"x": 11.25,
"y": 4.25
},
{
"label": "4,12",
"x": 12.25,
"y": 4.25,
"w": 1.75
},
{
"label": "4,13",
"x": 14.25,
"y": 4.5
},
{
"label": "5,0",
"x": 0,
"y": 5.25,
"w": 1.25
},
{
"label": "5,1",
"x": 2.13,
"y": 5.25,
"w": 1.25
},
{
"label": "5,6",
"x": 3.38,
"y": 5.25,
"w": 6.25
},
{
"label": "5,9",
"x": 9.63,
"y": 5.25,
"w": 1.25
},
{
"label": "5,10",
"x": 11.75,
"y": 5.25,
"w": 1.25
},
{
"label": "5,12",
"x": 13.25,
"y": 5.5
},
{
"label": "5,13",
"x": 14.25,
"y": 5.5
},
{
"label": "5,14",
"x": 15.25,
"y": 5.5
}
]
}
}
}

View File

@ -0,0 +1,17 @@
/* Copyright 2022 Cipulot
*
* 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 "kallos.h"

View File

@ -0,0 +1,35 @@
/* Copyright 2022 Cipulot
*
* 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_default( \
k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k214, \
k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314, \
k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, \
k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k412, k413, \
k500, k501, k506, k509, k510, k512, k513, k514 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \
{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214 }, \
{ k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, k314 }, \
{ k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, KC_NO, k412, k413, KC_NO }, \
{ k500, k501, KC_NO, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, k510, KC_NO, k512, k513, k514 } \
}

View File

@ -0,0 +1,52 @@
/* Copyright 2022 Cipulot
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_default(
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, MO(1), 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_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDOWN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT_default(
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_default(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_default(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,52 @@
/* Copyright 2022 Cipulot
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_default(
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, MO(1), 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_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDOWN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT_default(
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_default(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_default(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

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

View File

@ -0,0 +1,21 @@
# Kallos
* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
* Hardware Supported: Kallos
* Hardware Availability: TBD
Make example for this keyboard (after setting up your build environment):
make cipulot/kallos:default
Flashing example for this keyboard:
make cipulot/kallos: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).
## Bootloader
* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Physical reset button**: Briefly short the pads labeled "Reset" on 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes