commit 634fc08c4b2bc20b7e2a4602c21003a26aad1818 parent a3ed2db0eabb5d909db3affd3ed48584547e8f19 Author: Jack Sangdahl <0x6A73@pm.me> Date: Fri, 12 Apr 2024 14:09:56 -0600 migrate to keyboard.json, update licence headers, add multicore rp2040 Diffstat:
67 files changed, 144 insertions(+), 110 deletions(-)
diff --git a/keyboards/bully/info.json b/keyboards/bully/keyboard.json diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/grumpy/info.json b/keyboards/grumpy/keyboard.json diff --git a/keyboards/grumpy/keymaps/waffle/keymap.c b/keyboards/grumpy/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/grumpy/rules.mk b/keyboards/grumpy/rules.mk diff --git a/keyboards/leftover30/chconf.h b/keyboards/leftover30/chconf.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #pragma once #define CH_CFG_ST_FREQUENCY 10000 diff --git a/keyboards/leftover30/config.h b/keyboards/leftover30/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #pragma once #define WS2812_SPI SPID2 diff --git a/keyboards/leftover30/halconf.h b/keyboards/leftover30/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #pragma once #define HAL_USE_SPI TRUE diff --git a/keyboards/leftover30/info.json b/keyboards/leftover30/keyboard.json diff --git a/keyboards/leftover30/keymaps/waffle/keymap.c b/keyboards/leftover30/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/leftover30/mcuconf.h b/keyboards/leftover30/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #pragma once #include_next <mcuconf.h> diff --git a/keyboards/leftover30/rules.mk b/keyboards/leftover30/rules.mk diff --git a/keyboards/locus/info.json b/keyboards/locus/keyboard.json diff --git a/keyboards/locus/keymaps/waffle/keymap.c b/keyboards/locus/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/locus/rules.mk b/keyboards/locus/rules.mk diff --git a/keyboards/minidox/info.json b/keyboards/minidox/keyboard.json diff --git a/keyboards/minidox/keymaps/waffle/keymap.c b/keyboards/minidox/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/minidox/rules.mk b/keyboards/minidox/rules.mk diff --git a/keyboards/relic/info.json b/keyboards/relic/keyboard.json diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/relic/rules.mk b/keyboards/relic/rules.mk diff --git a/keyboards/tornish/info.json b/keyboards/tornish/keyboard.json diff --git a/keyboards/tornish/keymaps/default/keymap.c b/keyboards/tornish/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/tornish/rules.mk b/keyboards/tornish/rules.mk @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/vault35/info.json b/keyboards/vault35/keyboard.json diff --git a/keyboards/vault35/keymaps/waffle/keymap.c b/keyboards/vault35/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/vault35/rules.mk b/keyboards/vault35/rules.mk diff --git a/keyboards/xyz60/info.json b/keyboards/xyz60/keyboard.json diff --git a/keyboards/xyz60/keymaps/waffle/keymap.c b/keyboards/xyz60/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" #define ___NONE___ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/xyz60/rules.mk b/keyboards/xyz60/rules.mk diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keymaps/crkbd/halconf.h b/keymaps/crkbd/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define HAL_USE_SERIAL TRUE diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" diff --git a/keymaps/crkbd/mcuconf.h b/keymaps/crkbd/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include_next <mcuconf.h> diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #define ___NONE___ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define WS2812_DI_PIN B0 diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #define XX NO_LED diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define WPM_GRAPH diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define ENABLE_RGB_MATRIX_ALPHAS_MODS diff --git a/keymaps/microdox/keymap.c b/keymaps/microdox/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keymaps/onekey/halconf.h b/keymaps/onekey/halconf.h @@ -1,5 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once -#define HAL_USE_I2C TRUE -#include_next <halconf.h> diff --git a/keymaps/onekey/keymap.c b/keymaps/onekey/keymap.c @@ -1,59 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: GPL-2.0-or-later -#include"waffle.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_ortho_1x1(KC_A) -}; - -#ifdef OLED_ENABLE - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (!is_keyboard_master()) { - return OLED_ROTATION_180; - } - return rotation; -} - -static void render_logo(void) { - static const char PROGMEM logo[] = { - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - }; - oled_write_P(logo, false); -} - -void render_layer_state(void) { - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_ln_P(PSTR("Default"), false); - break; - case 1: - oled_write_ln_P(PSTR("Lower"), false); - break; - case 2: - oled_write_ln_P(PSTR("Raise"), false); - break; - case 3: - oled_write_ln_P(PSTR("Adjust"), false); - break; - default: - oled_write_ln_P(PSTR("Undefined"), false); - } -} -bool oled_task_keymap(void) { - static bool finished_timer = false; - if (!finished_timer && last_input_activity_elapsed() < 8000) { - oled_write(PSTR("eeeeeeee"), false); - } else { - if (!finished_timer) { - oled_clear(); - finished_timer = true; - } - oled_write(PSTR("hhhhhhhhhhhh"), false); - } - return false; -} -#endif diff --git a/keymaps/onekey/mcuconf.h b/keymaps/onekey/mcuconf.h @@ -1,6 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once -#include_next <mcuconf.h> -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE diff --git a/keymaps/onekey/rp2040/chconf.h b/keymaps/onekey/rp2040/chconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#undef CH_CFG_SMP_MODE +#define CH_CFG_SMP_MODE TRUE + +#include_next <chconf.h> diff --git a/keymaps/onekey/rp2040/keymap.c b/keymaps/onekey/rp2040/keymap.c @@ -0,0 +1,17 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "waffle.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(KC_A) +}; + +void c1_main(void) { + chSysWaitSystemState(ch_sys_running); + chInstanceObjectInit(&ch1, &ch_core1_cfg); + chSysUnlock(); + while (true) { + chThdSleepMilliseconds(50); + uprintf("core 1 up\n"); + } +} diff --git a/keymaps/onekey/rp2040/mcuconf.h b/keymaps/onekey/rp2040/mcuconf.h @@ -0,0 +1,7 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once +#include_next <mcuconf.h> + +#undef RP_CORE1_START +#define RP_CORE1_START TRUE diff --git a/keymaps/onekey/rp2040/rules.mk b/keymaps/onekey/rp2040/rules.mk @@ -0,0 +1,3 @@ +DEBUG_ENABLE = yes +OPT_DEFS += -UCRT0_EXTRA_CORES_NUMBER \ + -DCRT0_EXTRA_CORES_NUMBER=1 diff --git a/keymaps/onekey/stm32f103/halconf.h b/keymaps/onekey/stm32f103/halconf.h @@ -0,0 +1,5 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once +#define HAL_USE_I2C TRUE +#include_next <halconf.h> diff --git a/keymaps/onekey/stm32f103/keymap.c b/keymaps/onekey/stm32f103/keymap.c @@ -0,0 +1,59 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#include"waffle.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(KC_A) +}; + +#ifdef OLED_ENABLE + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + if (!is_keyboard_master()) { + return OLED_ROTATION_180; + } + return rotation; +} + +static void render_logo(void) { + static const char PROGMEM logo[] = { + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + }; + oled_write_P(logo, false); +} + +void render_layer_state(void) { + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_ln_P(PSTR("Default"), false); + break; + case 1: + oled_write_ln_P(PSTR("Lower"), false); + break; + case 2: + oled_write_ln_P(PSTR("Raise"), false); + break; + case 3: + oled_write_ln_P(PSTR("Adjust"), false); + break; + default: + oled_write_ln_P(PSTR("Undefined"), false); + } +} +bool oled_task_keymap(void) { + static bool finished_timer = false; + if (!finished_timer && last_input_activity_elapsed() < 8000) { + oled_write(PSTR("eeeeeeee"), false); + } else { + if (!finished_timer) { + oled_clear(); + finished_timer = true; + } + oled_write(PSTR("hhhhhhhhhhhh"), false); + } + return false; +} +#endif diff --git a/keymaps/onekey/stm32f103/mcuconf.h b/keymaps/onekey/stm32f103/mcuconf.h @@ -0,0 +1,6 @@ +// Copyright 2024 jack (@waffle87) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once +#include_next <mcuconf.h> +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE diff --git a/keymaps/onekey/rules.mk b/keymaps/onekey/stm32f103/rules.mk diff --git a/waffle/autocorrect_data.h b/waffle/autocorrect_data.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #define AUTOCORRECT_MIN_LENGTH 5 #define AUTOCORRECT_MAX_LENGTH 10 diff --git a/waffle/autocorrect_dict.txt b/waffle/autocorrect_dict.txt @@ -1,4 +1,4 @@ -# Copyright 2022 jack (@waffle87) +# Copyright 2024 jack (@waffle87) # SPDX-License-Identifier: GPL-2.0-or-later :theri -> their diff --git a/waffle/color.c b/waffle/color.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "color.h" #include <lib/lib8tion/lib8tion.h> diff --git a/waffle/combos.def b/waffle/combos.def @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later // name output keys diff --git a/waffle/combos.h b/waffle/combos.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/waffle/config.h b/waffle/config.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/waffle/dict.h b/waffle/dict.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/waffle/oled.c b/waffle/oled.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" uint32_t oled_timer = 0; diff --git a/waffle/oled.h b/waffle/oled.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include "quantum.h" diff --git a/waffle/oledfont.h b/waffle/oledfont.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "progmem.h" const unsigned char font[] PROGMEM = { diff --git a/waffle/raw.py b/waffle/raw.py @@ -1,4 +1,4 @@ -# Copyright 2022 jack (@waffle87) +# Copyright 2024 jack (@waffle87) # SPDX-License-Identifier: GPL-2.0-or-later import hid import sys diff --git a/waffle/tapping.c b/waffle/tapping.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #include "secrets.h" diff --git a/waffle/unicode.c b/waffle/unicode.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" diff --git a/waffle/waffle.c b/waffle/waffle.c @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #include "combos.h" diff --git a/waffle/waffle.h b/waffle/waffle.h @@ -1,4 +1,4 @@ -// Copyright 2022 jack (@waffle87) +// Copyright 2024 jack (@waffle87) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include QMK_KEYBOARD_H