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

master
QMK Bot 2024-03-21 05:04:57 +00:00
commit 1439e3348f
4 changed files with 225 additions and 0 deletions

View File

@ -0,0 +1,104 @@
{
"manufacturer": "Jotix",
"keyboard_name": "jotlily60",
"maintainer" : "jotix",
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotlily60",
"usb": {
"vid": "0x4A4F",
"pid": "0x2332",
"device_version": "0.0.1"
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"development_board": "promicro",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": [ "D0", "D4", "C6", "D7", "E6", "B4", "B5" ],
"rows": [ "F7", "B1", "B3", "B2", "B6" ],
},
"split": {
"enabled": true,
"soft_serial_pin": "D3"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0.5},
{"matrix": [0, 1], "x": 1, "y": 0.5},
{"matrix": [0, 2], "x": 2, "y": 0.25},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.25},
{"matrix": [0, 5], "x": 5, "y": 0.25},
{"matrix": [5, 5], "x": 10, "y": 0.25},
{"matrix": [5, 4], "x": 11, "y": 0.25},
{"matrix": [5, 3], "x": 12, "y": 0},
{"matrix": [5, 2], "x": 13, "y": 0.25},
{"matrix": [5, 1], "x": 14, "y": 0.5},
{"matrix": [5, 0], "x": 15, "y": 0.5},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.25},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [6, 5], "x": 10, "y": 1.25},
{"matrix": [6, 4], "x": 11, "y": 1.25},
{"matrix": [6, 3], "x": 12, "y": 1},
{"matrix": [6, 2], "x": 13, "y": 1.25},
{"matrix": [6, 1], "x": 14, "y": 1.5},
{"matrix": [6, 0], "x": 15, "y": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2.5},
{"matrix": [2, 1], "x": 1, "y": 2.5},
{"matrix": [2, 2], "x": 2, "y": 2.25},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.25},
{"matrix": [2, 5], "x": 5, "y": 2.25},
{"matrix": [7, 5], "x": 10, "y": 2.25},
{"matrix": [7, 4], "x": 11, "y": 2.25},
{"matrix": [7, 3], "x": 12, "y": 2},
{"matrix": [7, 2], "x": 13, "y": 2.25},
{"matrix": [7, 1], "x": 14, "y": 2.5},
{"matrix": [7, 0], "x": 15, "y": 2.5},
{"matrix": [3, 0], "x": 0, "y": 3.5},
{"matrix": [3, 1], "x": 1, "y": 3.5},
{"matrix": [3, 2], "x": 2, "y": 3.25},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3.25},
{"matrix": [3, 5], "x": 5, "y": 3.25},
{"matrix": [3, 6], "x": 6, "y": 3.5},
{"matrix": [8, 6], "x": 9, "y": 3.5},
{"matrix": [8, 5], "x": 10, "y": 3.25},
{"matrix": [8, 4], "x": 11, "y": 3.25},
{"matrix": [8, 3], "x": 12, "y": 3},
{"matrix": [8, 2], "x": 13, "y": 3.25},
{"matrix": [8, 1], "x": 14, "y": 3.5},
{"matrix": [8, 0], "x": 15, "y": 3.5},
{"matrix": [4, 2], "x": 2, "y": 4.25},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4.25},
{"matrix": [4, 5], "x": 5, "y": 4.5},
{"matrix": [4, 6], "x": 6, "y": 4.75},
{"matrix": [9, 6], "x": 9, "y": 4.75},
{"matrix": [9, 5], "x": 10, "y": 4.5},
{"matrix": [9, 4], "x": 11, "y": 4.25},
{"matrix": [9, 3], "x": 12, "y": 4},
{"matrix": [9, 2], "x": 13, "y": 4.25}
]
}
}
}

View File

@ -0,0 +1,65 @@
// Copyright 2024 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
enum layers {
_QWERTY,
_FN,
_ADJUST
};
#define FN MO(_FN)
#define ADJUST MO(_ADJUST)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* | esc | Q | W | E | R | T | | Y | U | I | O | P | tab |
* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* | caps | A | S | D | F | G | | H | J | K | L | ; | ' |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
* | shift | Z | X | C | V | B | { | } | N | M | , | . | / | enter |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
* | alt | super | ctrl | space | fn | fn | bspc | del | meh | ralt |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
*/
[_QWERTY] = LAYOUT (
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB,
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_LCBR,KC_RCBR,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
KC_LALT,KC_LGUI,KC_LCTL,KC_SPC, FN, FN, KC_BSPC,KC_DEL, KC_MEH, KC_RALT
),
/* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* | + | ! | @ | # | $ | % | | ^ | & | * | ( | ) | _ |
* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* |adjust | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |
* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
* | | F11 | F12 | F13 | F14 | F15 | | left | down | up | right | | | " |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
* | | vol- | mute | vol+ | ` | ~ | [ | ] | home | end | pgup | pgdn | \ | |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
* | | | | | | | | | | |
* +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
*/
[_FN] = LAYOUT (
KC_PLUS,KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,
ADJUST, 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_F14, KC_F15, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_BSLS,KC_DQUO,
_______,KC_VOLD,KC_MUTE,KC_VOLU,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_HOME,KC_END, KC_PGUP,KC_PGDN,KC_PIPE,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
),
[_ADJUST] = LAYOUT (
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
_______,QK_BOOT,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
_______,_______,_______,DB_TOGG,_______,_______, _______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
),
};

View File

@ -0,0 +1,55 @@
# jotlily60
![jotlily60](https://i.imgur.com/I68WGmJh.jpg)
A split keyboard kit made by jotix, inspired in the Lily58 keyboard.
* Keyboard Maintainer: [jotix](https://github.com/jotix)
* Hardware Supported: Arduino Pro Micro
---
### Arduino Pro Micro Pinout
| Rows | 0 | 1 | 2 | 3 | 4 |
|-------------|----|----|----|----|----|
| Arduino pin | A0 | 15 | 14 | 16 | 10 |
| QMK pin | F7 | B1 | B3 | B2 | B6 |
| Columns | 0 | 1 | 2 | 3 | 4 | 5 | 6 |
|-------------|----|----|----|----|----|----|----|
| Arduino pin | 3 | 4 | 5 | 6 | 7 | 8 | 9 |
| QMK pin | D0 | D4 | C6 | D7 | E6 | B4 | B5 |
| Serial | |
|-------------|-----|
| Arduino pin | TX0 |
| QMK pin | D3 |
---
### Compiling the Firmware
Compile example for this keyboard (after setting up your build environment):
qmk compile -kb handwired/jotlily60 -km default
---
### The Defaukt Keymap
+-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
| = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
| esc | Q | W | E | R | T | | Y | U | I | O | P | tab |
+-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+
| caps | A | S | D | F | G | | H | J | K | L | ; | ' |
+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
| shift | Z | X | C | V | B | { | } | N | M | , | . | / | enter |
+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
| alt | super | ctrl | space | fn | fn | bspc | del | meh | ralt |
+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
---
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 @@
# This file intentionally left blank