diff options
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/grumpy/keyboard.json | 51 | ||||
-rw-r--r-- | keyboards/grumpy/keymaps/jack/keymap.c | 13 | ||||
-rw-r--r-- | keyboards/grumpy/readme.md | 3 | ||||
-rw-r--r-- | keyboards/leftover30/chconf.h | 2 | ||||
-rw-r--r-- | keyboards/leftover30/config.h | 2 | ||||
-rw-r--r-- | keyboards/leftover30/halconf.h | 2 | ||||
-rw-r--r-- | keyboards/leftover30/keymaps/jack/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/leftover30/mcuconf.h | 2 | ||||
-rw-r--r-- | keyboards/leftover30/readme.md | 6 | ||||
-rw-r--r-- | keyboards/locus/keymaps/jack/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/sweep/config.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/halconf.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/keymaps/jack/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/sweep/lib/jetbrainsmono11.qff.c | 104 | ||||
-rw-r--r-- | keyboards/sweep/lib/jetbrainsmono11.qff.h | 8 | ||||
-rw-r--r-- | keyboards/sweep/mcuconf.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/sweep/sweep.c | 17 | ||||
-rw-r--r-- | keyboards/tornish/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/tornish/readme.md | 8 | ||||
-rw-r--r-- | keyboards/xyz60/keymaps/jack/keymap.c | 8 |
21 files changed, 29 insertions, 221 deletions
diff --git a/keyboards/grumpy/keyboard.json b/keyboards/grumpy/keyboard.json deleted file mode 100644 index 2ad7bf2..0000000 --- a/keyboards/grumpy/keyboard.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "keyboard_name": "grumpy", - "manufacturer": "jacks", - "maintainer": "pngu.org", - "processor": "RP2040", - "bootloader": "rp2040", - "diode_direction": "COL2ROW", - "matrix_pins" : { - "cols": ["GP26", "GP27", "GP28", "GP29", "GP6"], - "rows": ["GP7", "GP0", "GP1", "GP2", "GP4", "GP3"] - }, - "usb": { - "vid": "0x6A73", - "pid": "0x6279", - "device_version": "1.0.0" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "w", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "e", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "r", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "t", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "y", "matrix": [3, 4], "x": 5, "y": 0 }, - { "label": "u", "matrix": [3, 3], "x": 6, "y": 0 }, - { "label": "i", "matrix": [3, 2], "x": 7, "y": 0 }, - { "label": "o", "matrix": [3, 1], "x": 8, "y": 0 }, - { "label": "a", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "s", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "d", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "f", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "g", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "h", "matrix": [4, 4], "x": 5, "y": 1 }, - { "label": "j", "matrix": [4, 3], "x": 6, "y": 1 }, - { "label": "k", "matrix": [4, 2], "x": 7, "y": 1 }, - { "label": "l", "matrix": [4, 1], "x": 8, "y": 1 }, - { "label": ";", "matrix": [4, 0], "x": 9, "y": 1 }, - { "label": "z", "matrix": [2, 0], "x": 0, "y": 2 }, - { "label": "x", "matrix": [2, 1], "x": 1, "y": 2 }, - { "label": "c", "matrix": [2, 2], "x": 2, "y": 2 }, - { "label": "v", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "b", "matrix": [2, 4], "x": 4, "y": 2 }, - { "label": "n", "matrix": [5, 4], "x": 5, "y": 2 }, - { "label": "m", "matrix": [5, 3], "x": 6, "y": 2 }, - { "label": ",", "matrix": [5, 2], "x": 7, "y": 2 }, - { "label": ".", "matrix": [5, 1], "x": 8, "y": 2 }, - { "label": "/", "matrix": [5, 0], "x": 9, "y": 2 } - ] - } - } -} diff --git a/keyboards/grumpy/keymaps/jack/keymap.c b/keyboards/grumpy/keymaps/jack/keymap.c deleted file mode 100644 index 1f6d0ad..0000000 --- a/keyboards/grumpy/keymaps/jack/keymap.c +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-3.0-or-later -#include "jack.h" - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH - ) -}; -// clang-format on diff --git a/keyboards/grumpy/readme.md b/keyboards/grumpy/readme.md deleted file mode 100644 index 08c8bb2..0000000 --- a/keyboards/grumpy/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -### [grumpy](https://github.com/weteor/Grumpy) - - diff --git a/keyboards/leftover30/chconf.h b/keyboards/leftover30/chconf.h index 2add76c..3889564 100644 --- a/keyboards/leftover30/chconf.h +++ b/keyboards/leftover30/chconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/keyboards/leftover30/config.h b/keyboards/leftover30/config.h index d9c5627..c453ecd 100644 --- a/keyboards/leftover30/config.h +++ b/keyboards/leftover30/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/keyboards/leftover30/halconf.h b/keyboards/leftover30/halconf.h index 4ffc260..bfed83f 100644 --- a/keyboards/leftover30/halconf.h +++ b/keyboards/leftover30/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/keyboards/leftover30/keymaps/jack/keymap.c b/keyboards/leftover30/keymaps/jack/keymap.c index 066d6d3..8b62b21 100644 --- a/keyboards/leftover30/keymaps/jack/keymap.c +++ b/keyboards/leftover30/keymaps/jack/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "jack.h" @@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, KC_BSPC, ___BASE2___, ___BASE3___, - KC_MPLY, XXXXXXX, LWRSPC, C(S(KC_V)), RWORD + KC_MPLY, XXXXXXX, LWRSPC, C(S(KC_V)), XXXXXXX ), [_LOWER] = LAYOUT_jack( ___LOWER1___, KC_DEL, diff --git a/keyboards/leftover30/mcuconf.h b/keyboards/leftover30/mcuconf.h index 10914c8..ec84251 100644 --- a/keyboards/leftover30/mcuconf.h +++ b/keyboards/leftover30/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/keyboards/leftover30/readme.md b/keyboards/leftover30/readme.md index 7eb9850..d6ce8e1 100644 --- a/keyboards/leftover30/readme.md +++ b/keyboards/leftover30/readme.md @@ -1,5 +1,5 @@ ### leftover30 originally designed by [marksard](https://github.com/marksard/Keyboards/tree/master/leftover30), but the pcb seems to be mia...\ -(arm) pcb redesigned by [tominabox1](https://github.com/tominabox1/) with a somewhat jank case from p3d. - - +(arm) pcb redesigned by [tominabox1](https://github.com/tominabox1) with a somewhat jank case from p3d. + + diff --git a/keyboards/locus/keymaps/jack/keymap.c b/keyboards/locus/keymaps/jack/keymap.c index 0779bc5..7c2915b 100644 --- a/keyboards/locus/keymaps/jack/keymap.c +++ b/keyboards/locus/keymaps/jack/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "jack.h" diff --git a/keyboards/sweep/config.h b/keyboards/sweep/config.h index e6ef7f3..51edc09 100644 --- a/keyboards/sweep/config.h +++ b/keyboards/sweep/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keyboards/sweep/halconf.h b/keyboards/sweep/halconf.h index 63f81cd..a6c11ab 100644 --- a/keyboards/sweep/halconf.h +++ b/keyboards/sweep/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keyboards/sweep/keymaps/jack/keymap.c b/keyboards/sweep/keymaps/jack/keymap.c index d505967..dc9a11b 100644 --- a/keyboards/sweep/keymaps/jack/keymap.c +++ b/keyboards/sweep/keymaps/jack/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "jack.h" @@ -14,13 +14,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___LOWER1___, ___LOWER2___, ___LOWER3___, - KC_TRNS, KC_TRNS, KC_TRNS, PNP + _______, _______, _______, PNP ), [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, - NUKE, KC_TRNS, KC_TRNS, KC_TRNS + REMOVE, _______, _______, _______ ) }; // clang-format on diff --git a/keyboards/sweep/lib/jetbrainsmono11.qff.c b/keyboards/sweep/lib/jetbrainsmono11.qff.c deleted file mode 100644 index 9a60c9f..0000000 --- a/keyboards/sweep/lib/jetbrainsmono11.qff.c +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright 2024 QMK -// copyright SPDX-License-Identifier: GPL-2.0-or-later - -// Font's metadata -// --------------- -// Glyphs: , !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, 0, 1, 2, 3, 4, 5, 6, -// 7, 8, 9, :, ;, <, =, >, ?, @, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, -// Q, R, S, T, U, V, W, X, Y, Z, [, \, ], ^, _, `, a, b, c, d, e, f, g, h, i, j, -// k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, {, |, }, ~ - -#include <qp.h> - -const uint32_t font_jetbrainsmono11_length = 1365; - -// clang-format off -const uint8_t font_jetbrainsmono11[1365] = { - 0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0x55, 0x05, 0x00, 0x00, 0xAA, 0xFA, 0xFF, - 0xFF, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x07, 0x00, - 0x00, 0xC7, 0x02, 0x00, 0x87, 0x05, 0x00, 0x47, 0x08, 0x00, 0x07, 0x0B, 0x00, 0xC7, 0x0D, 0x00, - 0x87, 0x10, 0x00, 0x47, 0x13, 0x00, 0x07, 0x16, 0x00, 0xC7, 0x18, 0x00, 0x87, 0x1B, 0x00, 0x47, - 0x1E, 0x00, 0x07, 0x21, 0x00, 0xC7, 0x23, 0x00, 0x87, 0x26, 0x00, 0x47, 0x29, 0x00, 0x07, 0x2C, - 0x00, 0xC7, 0x2E, 0x00, 0x87, 0x31, 0x00, 0x47, 0x34, 0x00, 0x07, 0x37, 0x00, 0xC7, 0x39, 0x00, - 0x87, 0x3C, 0x00, 0x47, 0x3F, 0x00, 0x07, 0x42, 0x00, 0xC7, 0x44, 0x00, 0x87, 0x47, 0x00, 0x47, - 0x4A, 0x00, 0x07, 0x4D, 0x00, 0xC7, 0x4F, 0x00, 0x87, 0x52, 0x00, 0x47, 0x55, 0x00, 0x07, 0x58, - 0x00, 0xC7, 0x5A, 0x00, 0x87, 0x5D, 0x00, 0x47, 0x60, 0x00, 0x07, 0x63, 0x00, 0xC7, 0x65, 0x00, - 0x87, 0x68, 0x00, 0x47, 0x6B, 0x00, 0x07, 0x6E, 0x00, 0xC7, 0x70, 0x00, 0x87, 0x73, 0x00, 0x47, - 0x76, 0x00, 0x07, 0x79, 0x00, 0xC7, 0x7B, 0x00, 0x87, 0x7E, 0x00, 0x47, 0x81, 0x00, 0x07, 0x84, - 0x00, 0xC7, 0x86, 0x00, 0x87, 0x89, 0x00, 0x47, 0x8C, 0x00, 0x07, 0x8F, 0x00, 0xC7, 0x91, 0x00, - 0x87, 0x94, 0x00, 0x47, 0x97, 0x00, 0x07, 0x9A, 0x00, 0xC7, 0x9C, 0x00, 0x87, 0x9F, 0x00, 0x47, - 0xA2, 0x00, 0x07, 0xA5, 0x00, 0xC7, 0xA7, 0x00, 0x87, 0xAA, 0x00, 0x47, 0xAD, 0x00, 0x07, 0xB0, - 0x00, 0xC7, 0xB2, 0x00, 0x87, 0xB5, 0x00, 0x47, 0xB8, 0x00, 0x07, 0xBB, 0x00, 0xC7, 0xBD, 0x00, - 0x87, 0xC0, 0x00, 0x47, 0xC3, 0x00, 0x07, 0xC6, 0x00, 0xC7, 0xC8, 0x00, 0x87, 0xCB, 0x00, 0x47, - 0xCE, 0x00, 0x07, 0xD1, 0x00, 0xC7, 0xD3, 0x00, 0x87, 0xD6, 0x00, 0x47, 0xD9, 0x00, 0x07, 0xDC, - 0x00, 0xC7, 0xDE, 0x00, 0x87, 0xE1, 0x00, 0x47, 0xE4, 0x00, 0x07, 0xE7, 0x00, 0xC7, 0xE9, 0x00, - 0x87, 0xEC, 0x00, 0x47, 0xEF, 0x00, 0x07, 0xF2, 0x00, 0xC7, 0xF4, 0x00, 0x87, 0xF7, 0x00, 0x47, - 0xFA, 0x00, 0x07, 0xFD, 0x00, 0xC7, 0xFF, 0x00, 0x87, 0x02, 0x01, 0x04, 0xFB, 0x15, 0x04, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x81, 0x40, - 0x20, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x85, 0x42, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x89, 0xE0, 0xA3, 0x40, 0x7E, 0x12, 0x01, 0x00, 0x00, 0x08, 0x84, 0x47, 0xE1, - 0xE0, 0xE0, 0x50, 0x1A, 0x04, 0x02, 0x00, 0x00, 0x80, 0xA9, 0x50, 0x71, 0xE0, 0x18, 0x8A, 0x18, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x42, 0x30, 0xA4, 0x22, 0x31, 0x17, 0x00, 0x00, 0x00, 0x00, 0x02, - 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x82, 0x40, 0x20, 0x10, 0x08, 0x04, - 0x04, 0x04, 0x00, 0x00, 0x03, 0x02, 0x01, 0x80, 0x40, 0x00, 0x08, 0x84, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x81, 0xF0, 0x31, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xF8, 0x10, - 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x82, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x10, 0x04, 0x82, 0x40, 0x20, 0x08, 0x04, 0x81, 0x00, 0x00, - 0x00, 0x00, 0x47, 0x26, 0x52, 0x89, 0x44, 0x32, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x43, 0x81, 0x40, - 0x20, 0x10, 0x08, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x47, 0x06, 0x82, 0x60, 0x18, 0x04, 0x1F, 0x00, - 0x00, 0x00, 0x80, 0x07, 0x82, 0xE0, 0x40, 0x40, 0x12, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x02, 0x41, - 0x90, 0x48, 0x3C, 0x10, 0x08, 0x00, 0x00, 0x00, 0x80, 0x47, 0x20, 0xF0, 0xC0, 0x40, 0x32, 0x0E, - 0x00, 0x00, 0x00, 0x00, 0x82, 0x41, 0xF0, 0x88, 0x44, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x80, 0x4F, - 0x04, 0x81, 0x60, 0x10, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x47, 0x26, 0xE1, 0xC8, 0x44, 0x22, - 0x0E, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x92, 0x71, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x40, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, - 0x00, 0x04, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x08, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xE0, 0x03, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xC0, 0xC0, - 0x30, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x81, 0x30, 0x08, 0x00, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x47, 0x04, 0xC2, 0xA5, 0x52, 0x28, 0x8C, 0x80, 0x03, 0x00, 0x00, 0x82, 0x41, 0xA1, - 0x48, 0x3C, 0x22, 0x11, 0x00, 0x00, 0x00, 0x80, 0x47, 0x26, 0xF1, 0xC8, 0x44, 0x22, 0x0F, 0x00, - 0x00, 0x00, 0x00, 0x47, 0x24, 0x10, 0x08, 0x04, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x80, 0x47, 0x22, - 0x12, 0x89, 0x44, 0x12, 0x0F, 0x00, 0x00, 0x00, 0x80, 0x4F, 0x20, 0xF0, 0x08, 0x04, 0x02, 0x1F, - 0x00, 0x00, 0x00, 0x80, 0x4F, 0x20, 0x10, 0x78, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, - 0x26, 0x10, 0xE8, 0x44, 0x32, 0x0E, 0x00, 0x00, 0x00, 0x80, 0x48, 0x24, 0xF2, 0x89, 0x44, 0x22, - 0x11, 0x00, 0x00, 0x00, 0x80, 0x07, 0x81, 0x40, 0x20, 0x10, 0x08, 0x0F, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x02, 0x81, 0x40, 0x20, 0x12, 0x0F, 0x00, 0x00, 0x00, 0x80, 0x48, 0x22, 0x71, 0x68, 0x24, - 0x12, 0x11, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x1F, 0x00, 0x00, 0x00, - 0x80, 0xCC, 0x66, 0x52, 0x89, 0x44, 0x22, 0x11, 0x00, 0x00, 0x00, 0x80, 0xC8, 0x64, 0x52, 0xA9, - 0x74, 0x32, 0x19, 0x00, 0x00, 0x00, 0x00, 0x47, 0x22, 0x12, 0x89, 0x44, 0x12, 0x0E, 0x00, 0x00, - 0x00, 0x80, 0x47, 0x24, 0x12, 0x79, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x26, 0x12, - 0x89, 0x44, 0x32, 0x0E, 0x04, 0x02, 0x00, 0x80, 0x47, 0x24, 0x92, 0x79, 0x24, 0x12, 0x11, 0x00, - 0x00, 0x00, 0x00, 0x47, 0x22, 0x60, 0x40, 0x40, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x81, - 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x80, 0x48, 0x24, 0x12, 0x89, 0x44, 0x12, 0x0E, - 0x00, 0x00, 0x00, 0x80, 0x48, 0x24, 0x91, 0x50, 0x28, 0x0C, 0x06, 0x00, 0x00, 0x00, 0x40, 0x2A, - 0xC5, 0x32, 0x99, 0x6C, 0x36, 0x09, 0x00, 0x00, 0x00, 0x80, 0x48, 0x42, 0x61, 0x30, 0x28, 0x12, - 0x11, 0x00, 0x00, 0x00, 0x80, 0x48, 0x42, 0xE1, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x80, - 0x0F, 0x02, 0x41, 0x10, 0x08, 0x02, 0x1F, 0x00, 0x00, 0x00, 0x0E, 0x81, 0x40, 0x20, 0x10, 0x08, - 0x04, 0x02, 0x07, 0x00, 0x00, 0x81, 0x80, 0x40, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x00, 0x00, - 0x06, 0x02, 0x81, 0x40, 0x20, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x82, 0x00, 0x11, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x00, - 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x81, - 0xF1, 0x44, 0x32, 0x1F, 0x00, 0x00, 0x00, 0x80, 0x40, 0xE0, 0x91, 0x89, 0x44, 0x32, 0x0F, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC0, 0x11, 0x09, 0x04, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC4, - 0x93, 0x89, 0x44, 0x32, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x11, 0xF9, 0x04, 0x02, 0x0E, - 0x00, 0x00, 0x00, 0x00, 0x8E, 0x40, 0xF0, 0x11, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xC0, 0x93, 0x89, 0x44, 0x32, 0x1E, 0x84, 0x03, 0x00, 0x80, 0x40, 0xE0, 0x91, 0x89, 0x44, 0x22, - 0x11, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x40, 0x20, 0x10, 0x08, 0x1F, 0x00, 0x00, 0x00, 0x00, - 0x04, 0xE0, 0x81, 0x40, 0x20, 0x10, 0x08, 0xC4, 0x01, 0x00, 0x80, 0x40, 0x20, 0x93, 0x38, 0x24, - 0x12, 0x11, 0x00, 0x00, 0x00, 0xC0, 0x81, 0x40, 0x20, 0x10, 0x08, 0x04, 0x1C, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x60, 0x53, 0xA9, 0x54, 0x2A, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x91, 0x89, - 0x44, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x91, 0x89, 0x44, 0x32, 0x0E, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xE0, 0x91, 0x89, 0x44, 0x32, 0x8F, 0x40, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x93, - 0x89, 0x44, 0x32, 0x1E, 0x08, 0x04, 0x00, 0x00, 0x00, 0xE0, 0x11, 0x89, 0x04, 0x02, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC0, 0x11, 0x38, 0x20, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x80, 0xE0, - 0x23, 0x10, 0x08, 0x04, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x12, 0x89, 0x44, 0x12, 0x0E, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x92, 0x48, 0x28, 0x0C, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x90, 0x42, 0x99, 0x4C, 0x16, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xA3, 0x30, 0x18, 0x14, - 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x92, 0x50, 0x28, 0x0C, 0x04, 0x82, 0x00, 0x00, 0x00, - 0x00, 0xE0, 0x81, 0x20, 0x08, 0x06, 0x1F, 0x00, 0x00, 0x00, 0x08, 0x02, 0x81, 0x30, 0x20, 0x10, - 0x08, 0x04, 0x04, 0x00, 0x00, 0x04, 0x02, 0x81, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00, - 0x03, 0x83, 0x40, 0xC0, 0x11, 0x08, 0x0C, 0x86, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x69, - 0x00, 0x00, 0x00, 0x00, 0x00, -}; -// clang-format on diff --git a/keyboards/sweep/lib/jetbrainsmono11.qff.h b/keyboards/sweep/lib/jetbrainsmono11.qff.h deleted file mode 100644 index de556e3..0000000 --- a/keyboards/sweep/lib/jetbrainsmono11.qff.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2024 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include <qp.h> - -extern const uint32_t font_jetbrainsmono11_length; -extern const uint8_t font_jetbrainsmono11[1365]; diff --git a/keyboards/sweep/mcuconf.h b/keyboards/sweep/mcuconf.h index be63774..182be78 100644 --- a/keyboards/sweep/mcuconf.h +++ b/keyboards/sweep/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keyboards/sweep/rules.mk b/keyboards/sweep/rules.mk index 172fd27..3bac055 100644 --- a/keyboards/sweep/rules.mk +++ b/keyboards/sweep/rules.mk @@ -2,7 +2,3 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # depends on 21844 QUANTUM_PAINTER_DRIVERS += ls0xx_spi - -ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes) - SRC += lib/jetbrainsmono11.qff.c -endif diff --git a/keyboards/sweep/sweep.c b/keyboards/sweep/sweep.c index f14a591..bd73d8a 100644 --- a/keyboards/sweep/sweep.c +++ b/keyboards/sweep/sweep.c @@ -1,13 +1,11 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include <quantum.h> +#include "quantum.h" #ifdef QUANTUM_PAINTER_ENABLE -#include "lib/jetbrainsmono11.qff.h" -#include <qp.h> -#include <qp_surface.h> +#include "qp.h" +#include "qp_surface.h" static painter_device_t display; -static painter_font_handle_t font; static uint8_t framebuffer[SURFACE_REQUIRED_BUFFER_BYTE_SIZE( LS0XX_DISPLAY_WIDTH, LS0XX_DISPLAY_HEIGHT, 1)] = {0}; @@ -16,13 +14,6 @@ void keyboard_post_init_kb(void) { LS0XX_DISPLAY_WIDTH, LS0XX_DISPLAY_HEIGHT, LS0XX_CS_PIN, LCD_SPI_DIVISOR, 0, framebuffer); qp_init(display, QP_ROTATION_0); - font = qp_load_font_mem(font); - if (font) { - static const char *data = "foo bar baz"; - int16_t width = qp_textwidth(font, data); - qp_drawtext(display, LS0XX_DISPLAY_WIDTH - width - 1, - LS0XX_DISPLAY_HEIGHT - font->line_height - 1, font, data); - } keyboard_post_init_user(); } diff --git a/keyboards/tornish/keymaps/default/keymap.c b/keyboards/tornish/keymaps/default/keymap.c index aeb2df2..acd59b8 100644 --- a/keyboards/tornish/keymaps/default/keymap.c +++ b/keyboards/tornish/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/tornish/readme.md b/keyboards/tornish/readme.md index 3224611..57b3d5a 100644 --- a/keyboards/tornish/readme.md +++ b/keyboards/tornish/readme.md @@ -1,10 +1,10 @@ -### half a [torn](https://github.com/rtitmuss/torn) keyboard used solely for minecraft :) - +### half a [torn](https://github.com/rtitmuss/torn) keyboard used for minecraft :) + for whatever reason, this board does not like to flash over usb. -so [flash.sh](flash.sh) does the work for us: -qmk compile -kb tornish -km default > /dev/null +so [flash.sh](flash.sh) does the work instead: ```shell +qmk compile -kb tornish -km default > /dev/null sed -i '$ d' $FIRMWARE #remove last line from firmware hex file (eof indicator) cat $BOOTLOADER >> $FIRMWARE #append bootloader hex file to firmware avrdude -c usbtiny -p atmega328p -U flash:w:$FIRMWARE:i #flash firmware + bootloader over serial diff --git a/keyboards/xyz60/keymaps/jack/keymap.c b/keyboards/xyz60/keymaps/jack/keymap.c index 024d732..81941ed 100644 --- a/keyboards/xyz60/keymaps/jack/keymap.c +++ b/keyboards/xyz60/keymaps/jack/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "jack.h" #define ___NONE___ \ @@ -12,21 +12,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, ___BASE1___, KC_BSPC, _______, PNP, _______, ___BASE2___, _______, _______, _______, ___BASE3___, _______, - _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ + _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ ), [_LOWER] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___LOWER1___, _______, _______, _______, _______, ___LOWER2___, _______, _______, _______, ___LOWER3___, _______, - _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______ ), [_RAISE] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___RAISE1___, _______, _______, _______, _______, ___RAISE2___, _______, _______, _______, ___RAISE3___, _______, - _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______ ) }; // clang-format on |