From d65a0939efc954fa8bf5e48d39e20302d5a20123 Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Fri, 17 Feb 2023 15:11:21 -0800 Subject: [PATCH 01/12] added equals board --- keyboards/boardsource/equals/config.h | 45 ++++ .../equals/graphics/thintel15.qff.c | 70 ++++++ keyboards/boardsource/equals/halconf.h | 8 + keyboards/boardsource/equals/info.json | 216 ++++++++++++++++++ .../boardsource/equals/keymaps/cole/config.h | 1 + .../boardsource/equals/keymaps/cole/keymap.c | 67 ++++++ .../boardsource/equals/keymaps/cole/rules.mk | 2 + .../boardsource/equals/keymaps/cole/ui.c | 41 ++++ .../equals/keymaps/default/keymap.c | 51 +++++ .../equals/keymaps/default/rules.mk | 1 + .../boardsource/equals/keymaps/default/ui.c | 41 ++++ .../boardsource/equals/keymaps/via/keymap.c | 37 +++ .../boardsource/equals/keymaps/via/rules.mk | 1 + keyboards/boardsource/equals/mcuconf.h | 9 + keyboards/boardsource/equals/readme.md | 27 +++ keyboards/boardsource/equals/rules.mk | 4 + 16 files changed, 621 insertions(+) create mode 100644 keyboards/boardsource/equals/config.h create mode 100644 keyboards/boardsource/equals/graphics/thintel15.qff.c create mode 100644 keyboards/boardsource/equals/halconf.h create mode 100644 keyboards/boardsource/equals/info.json create mode 100644 keyboards/boardsource/equals/keymaps/cole/config.h create mode 100644 keyboards/boardsource/equals/keymaps/cole/keymap.c create mode 100644 keyboards/boardsource/equals/keymaps/cole/rules.mk create mode 100644 keyboards/boardsource/equals/keymaps/cole/ui.c create mode 100644 keyboards/boardsource/equals/keymaps/default/keymap.c create mode 100644 keyboards/boardsource/equals/keymaps/default/rules.mk create mode 100644 keyboards/boardsource/equals/keymaps/default/ui.c create mode 100644 keyboards/boardsource/equals/keymaps/via/keymap.c create mode 100644 keyboards/boardsource/equals/keymaps/via/rules.mk create mode 100644 keyboards/boardsource/equals/mcuconf.h create mode 100644 keyboards/boardsource/equals/readme.md create mode 100644 keyboards/boardsource/equals/rules.mk diff --git a/keyboards/boardsource/equals/config.h b/keyboards/boardsource/equals/config.h new file mode 100644 index 000000000000..b3d633defb02 --- /dev/null +++ b/keyboards/boardsource/equals/config.h @@ -0,0 +1,45 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +// #define NO_DEBUG + +/* disable print */ +// #define NO_PRINT + +/* disable action features */ +// #define NO_ACTION_LAYER +// #define NO_ACTION_TAPPING +// #define NO_ACTION_ONESHOT + +#pragma once +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U + +#define RGB_MATRIX_LED_COUNT 70 +#define RGB_DI_PIN GP21 + +#define AUDIO_PIN GP29 +#define AUDIO_PWM_DRIVER PWMD6 +#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B + +#define AUDIO_CLICKY +#define AUDIO_INIT_DELAY 1000 +#define STARTUP_SONG SONG(STARTUP_SOUND) + +// SPI Configuration +#define SPI_DRIVER SPID1 +#define SPI_SCK_PIN GP26 +#define SPI_MOSI_PIN GP27 + +// Display Configuration +#define OLED_CS_PIN GP25 +#define OLED_DC_PIN GP20 +#define OLED_RST_PIN GP28 diff --git a/keyboards/boardsource/equals/graphics/thintel15.qff.c b/keyboards/boardsource/equals/graphics/thintel15.qff.c new file mode 100644 index 000000000000..4a3f07eba909 --- /dev/null +++ b/keyboards/boardsource/equals/graphics/thintel15.qff.c @@ -0,0 +1,70 @@ + +#include + +const uint32_t font_thintel15_length = 966; + +// clang-format off +const uint8_t font_thintel15[966] = { + 0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0xC6, 0x03, 0x00, 0x00, 0x39, 0xFC, 0xFF, + 0xFF, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x02, 0x00, + 0x00, 0xC2, 0x00, 0x00, 0x84, 0x01, 0x00, 0x06, 0x03, 0x00, 0x46, 0x05, 0x00, 0x88, 0x07, 0x00, + 0x46, 0x0A, 0x00, 0x82, 0x0C, 0x00, 0x43, 0x0D, 0x00, 0x83, 0x0E, 0x00, 0xC4, 0x0F, 0x00, 0x46, + 0x11, 0x00, 0x83, 0x13, 0x00, 0xC5, 0x14, 0x00, 0x82, 0x16, 0x00, 0x44, 0x17, 0x00, 0xC5, 0x18, + 0x00, 0x84, 0x1A, 0x00, 0x05, 0x1C, 0x00, 0xC5, 0x1D, 0x00, 0x85, 0x1F, 0x00, 0x45, 0x21, 0x00, + 0x05, 0x23, 0x00, 0xC5, 0x24, 0x00, 0x85, 0x26, 0x00, 0x45, 0x28, 0x00, 0x02, 0x2A, 0x00, 0xC3, + 0x2A, 0x00, 0x05, 0x2C, 0x00, 0xC5, 0x2D, 0x00, 0x85, 0x2F, 0x00, 0x45, 0x31, 0x00, 0x08, 0x33, + 0x00, 0xC5, 0x35, 0x00, 0x85, 0x37, 0x00, 0x45, 0x39, 0x00, 0x05, 0x3B, 0x00, 0xC4, 0x3C, 0x00, + 0x44, 0x3E, 0x00, 0xC5, 0x3F, 0x00, 0x85, 0x41, 0x00, 0x44, 0x43, 0x00, 0xC5, 0x44, 0x00, 0x85, + 0x46, 0x00, 0x44, 0x48, 0x00, 0xC6, 0x49, 0x00, 0x06, 0x4C, 0x00, 0x45, 0x4E, 0x00, 0x05, 0x50, + 0x00, 0xC5, 0x51, 0x00, 0x85, 0x53, 0x00, 0x45, 0x55, 0x00, 0x06, 0x57, 0x00, 0x45, 0x59, 0x00, + 0x06, 0x5B, 0x00, 0x46, 0x5D, 0x00, 0x86, 0x5F, 0x00, 0xC6, 0x61, 0x00, 0x06, 0x64, 0x00, 0x44, + 0x66, 0x00, 0xC4, 0x67, 0x00, 0x44, 0x69, 0x00, 0xC6, 0x6A, 0x00, 0x05, 0x6D, 0x00, 0xC3, 0x6E, + 0x00, 0x05, 0x70, 0x00, 0xC5, 0x71, 0x00, 0x84, 0x73, 0x00, 0x05, 0x75, 0x00, 0xC5, 0x76, 0x00, + 0x84, 0x78, 0x00, 0x05, 0x7A, 0x00, 0xC5, 0x7B, 0x00, 0x82, 0x7D, 0x00, 0x43, 0x7E, 0x00, 0x85, + 0x7F, 0x00, 0x42, 0x81, 0x00, 0x06, 0x82, 0x00, 0x45, 0x84, 0x00, 0x05, 0x86, 0x00, 0xC5, 0x87, + 0x00, 0x85, 0x89, 0x00, 0x44, 0x8B, 0x00, 0xC5, 0x8C, 0x00, 0x83, 0x8E, 0x00, 0xC5, 0x8F, 0x00, + 0x86, 0x91, 0x00, 0xC6, 0x93, 0x00, 0x06, 0x96, 0x00, 0x45, 0x98, 0x00, 0x04, 0x9A, 0x00, 0x85, + 0x9B, 0x00, 0x42, 0x9D, 0x00, 0x05, 0x9E, 0x00, 0xC5, 0x9F, 0x00, 0x04, 0xFB, 0x86, 0x02, 0x00, + 0x00, 0x00, 0x00, 0x54, 0x45, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xFD, 0xD2, + 0xAF, 0x28, 0x00, 0x00, 0x00, 0x84, 0x53, 0x15, 0x0E, 0x55, 0x39, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x12, 0x15, 0x0A, 0x28, 0x54, 0x24, 0x00, 0x00, 0x00, 0x80, 0x50, 0x14, 0x52, 0x95, 0x58, 0x00, + 0x00, 0x00, 0x14, 0x00, 0x00, 0x4A, 0x92, 0x24, 0x02, 0x00, 0x91, 0x24, 0x49, 0x01, 0x00, 0x20, + 0x27, 0x05, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x1F, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x60, 0x0A, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x24, 0x22, + 0x11, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00, 0x20, 0x23, 0x22, 0x72, 0x00, 0x00, + 0xC0, 0x24, 0x44, 0x44, 0x78, 0x00, 0x00, 0xC0, 0x24, 0x44, 0x50, 0x32, 0x00, 0x00, 0x80, 0x29, + 0x95, 0x1E, 0x42, 0x00, 0x00, 0xE0, 0x85, 0x83, 0x50, 0x32, 0x00, 0x00, 0xC0, 0xA4, 0x70, 0x52, + 0x32, 0x00, 0x00, 0xE0, 0x21, 0x42, 0x84, 0x10, 0x00, 0x00, 0xC0, 0xA4, 0x64, 0x52, 0x32, 0x00, + 0x00, 0xC0, 0xA4, 0xE4, 0x50, 0x32, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x30, 0x60, 0x0A, 0x00, + 0x00, 0x11, 0x11, 0x04, 0x41, 0x00, 0x00, 0x00, 0x80, 0x07, 0x1E, 0x00, 0x00, 0x00, 0x20, 0x08, + 0x82, 0x88, 0x08, 0x00, 0x00, 0xC0, 0x24, 0x64, 0x04, 0x10, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x59, + 0x55, 0x2D, 0x02, 0x1C, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0xE0, 0xA4, + 0x74, 0x52, 0x3A, 0x00, 0x00, 0xC0, 0xA4, 0x10, 0x42, 0x32, 0x00, 0x00, 0xE0, 0xA4, 0x94, 0x52, + 0x3A, 0x00, 0x00, 0x70, 0x11, 0x17, 0x71, 0x00, 0x00, 0x70, 0x11, 0x17, 0x11, 0x00, 0x00, 0xC0, + 0xA4, 0xD0, 0x52, 0x32, 0x00, 0x00, 0x20, 0xA5, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0x70, 0x22, 0x22, + 0x72, 0x00, 0x00, 0xC0, 0x21, 0x84, 0x50, 0x32, 0x00, 0x00, 0x20, 0xA5, 0x32, 0x4A, 0x4A, 0x00, + 0x00, 0x10, 0x11, 0x11, 0x71, 0x00, 0x00, 0x40, 0xB4, 0x55, 0x51, 0x14, 0x45, 0x00, 0x00, 0x00, + 0x40, 0x34, 0x55, 0x59, 0x14, 0x45, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00, + 0xE0, 0xA4, 0x74, 0x42, 0x08, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x51, 0x00, 0x00, 0xE0, 0xA4, + 0x74, 0x52, 0x4A, 0x00, 0x00, 0xC0, 0xA4, 0x60, 0x50, 0x32, 0x00, 0x00, 0xC0, 0x47, 0x10, 0x04, + 0x41, 0x10, 0x00, 0x00, 0x00, 0x20, 0xA5, 0x94, 0x52, 0x32, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51, + 0xA4, 0x10, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51, 0xB5, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14, + 0x29, 0x84, 0x12, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x0E, 0x41, 0x10, 0x00, 0x00, 0x00, + 0xC0, 0x07, 0x21, 0x84, 0x10, 0x7C, 0x00, 0x00, 0x00, 0x17, 0x11, 0x11, 0x11, 0x07, 0x00, 0x10, + 0x21, 0x22, 0x44, 0x00, 0x00, 0x47, 0x44, 0x44, 0x44, 0x07, 0x00, 0x84, 0x12, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x93, 0x5C, 0x72, 0x00, 0x00, 0x20, 0x84, 0x93, 0x52, 0x3A, 0x00, 0x00, 0x00, 0x60, + 0x11, 0x61, 0x00, 0x00, 0x00, 0x21, 0x97, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x93, 0x5E, 0x70, + 0x00, 0x00, 0x60, 0x11, 0x13, 0x11, 0x00, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x28, 0x19, 0x20, + 0x84, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x10, 0x55, 0x00, 0x80, 0x20, 0x49, 0x0A, 0x00, 0x20, 0x84, + 0x94, 0x4E, 0x4A, 0x00, 0x00, 0x54, 0x55, 0x00, 0x00, 0x00, 0x2C, 0x55, 0x55, 0x55, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x93, 0x52, 0x32, 0x00, 0x00, 0x00, + 0x80, 0x93, 0x52, 0x3A, 0x21, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x08, 0x01, 0x00, 0x50, 0x13, + 0x11, 0x00, 0x00, 0x00, 0x00, 0x17, 0x0C, 0x3A, 0x00, 0x00, 0x48, 0x96, 0x44, 0x00, 0x00, 0x00, + 0x80, 0x94, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51, 0xA4, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x44, 0x51, 0x54, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x0A, 0xA1, 0x44, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x94, 0x52, 0x72, 0x28, 0x19, 0x00, 0x70, 0x24, 0x71, 0x00, 0x00, 0x4C, 0x08, + 0x11, 0x84, 0x10, 0x0C, 0x00, 0x55, 0x55, 0x01, 0x83, 0x10, 0x82, 0x08, 0x21, 0x03, 0x00, 0x00, + 0x00, 0xB0, 0x1A, 0x00, 0x00, 0x00, +}; +// clang-format on \ No newline at end of file diff --git a/keyboards/boardsource/equals/halconf.h b/keyboards/boardsource/equals/halconf.h new file mode 100644 index 000000000000..aa99e7341a03 --- /dev/null +++ b/keyboards/boardsource/equals/halconf.h @@ -0,0 +1,8 @@ + +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_SPI TRUE + +#include_next \ No newline at end of file diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json new file mode 100644 index 000000000000..5e8bf90cf6a1 --- /dev/null +++ b/keyboards/boardsource/equals/info.json @@ -0,0 +1,216 @@ +{ + "manufacturer": "Boardsource", + "keyboard_name": "Equals", + "maintainer": "Boardsource", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "audio":true + }, + "matrix_pins": { + "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], + "rows": ["GP12","GP13","GP16","GP17","GP18"] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x7688", + "vid": "0x4273" + }, + + "rgb_matrix": { + "driver": "WS2812", + "led_count": 70, + "max_brightness": 150, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat":true, + "band_pinwheel_val":true, + "band_spiral_sat":true, + "band_spiral_val":true, + "cycle_all":true, + "cycle_left_right":true, + "cycle_up_down":true, + "rainbow_moving_chevron":true, + "cycle_out_in":true, + "cycle_out_in_dual":true, + "cycle_pinwheel":true, + "cycle_spiral":true, + "dual_beacon":true, + "rainbow_beacon":true, + "rainbow_pinwheels":true, + "raindrops":true, + "jellybean_raindrops":true, + "hue_breathing":true, + "hue_pendulum":true, + "hue_wave":true, + "pixel_rain":true, + "pixel_flow":true, + "pixel_fractal":true, + "typing_heatmap":true, + "digital_rain":true, + "solid_reactive_simple":true, + "solid_reactive":true, + "solid_reactive_wide":true, + "solid_reactive_multiwide":true, + "solid_reactive_cross":true, + "solid_reactive_multicross":true, + "solid_reactive_nexus":true, + "solid_reactive_multinexus":true, + "splash":true, + "multisplash":true, + "solid_splash":true, +"solid_multisplash":true + }, + "layout": [ + { "flags": 2, "x": 220, "y": 17 }, + { "flags": 2, "x": 172, "y": 17 }, + { "flags": 2, "x": 112, "y": 17 }, + { "flags": 2, "x": 50, "y": 17 }, + { "flags": 2, "x": 4, "y": 17 }, + { "flags": 2, "x": 4, "y": 56 }, + { "flags": 2, "x": 50, "y": 56 }, + { "flags": 2, "x": 112, "y": 56 }, + { "flags": 2, "x": 172, "y": 56 }, + { "flags": 2, "x": 220, "y": 56 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, + { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, + { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, + { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, + { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, + { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, + { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, + { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, + { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, + { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, + { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, + { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, + { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, + { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 }, + { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 }, + { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 }, + { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, + { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 }, + { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 }, + { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 }, + { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 }, + { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 }, + { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }, + { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 }, + { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 }, + { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 }, + { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 }, + { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 }, + { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 }, + { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 }, + { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 }, + { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 }, + { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 }, + { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 } + ] + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [1, 11], "x": 11, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [2, 5], "x": 5, "y": 2 }, + { "matrix": [2, 6], "x": 6, "y": 2 }, + { "matrix": [2, 7], "x": 7, "y": 2 }, + { "matrix": [2, 8], "x": 8, "y": 2 }, + { "matrix": [2, 9], "x": 9, "y": 2 }, + { "matrix": [2, 10], "x": 10, "y": 2 }, + { "matrix": [2, 11], "x": 11, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 4, "y": 3 }, + { "matrix": [3, 5], "x": 5, "y": 3 }, + { "matrix": [3, 6], "x": 6, "y": 3 }, + { "matrix": [3, 7], "x": 7, "y": 3 }, + { "matrix": [3, 8], "x": 8, "y": 3 }, + { "matrix": [3, 9], "x": 9, "y": 3 }, + { "matrix": [3, 10], "x": 10, "y": 3 }, + { "matrix": [3, 11], "x": 11, "y": 3 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "x": 2, "y": 4 }, + { "matrix": [4, 3], "x": 3, "y": 4 }, + { "matrix": [4, 4], "x": 4, "y": 4 }, + { "matrix": [4, 5], "x": 5, "y": 4 }, + { "matrix": [4, 6], "x": 6, "y": 4 }, + { "matrix": [4, 7], "x": 7, "y": 4 }, + { "matrix": [4, 8], "x": 8, "y": 4 }, + { "matrix": [4, 9], "x": 9, "y": 4 }, + { "matrix": [4, 10], "x": 10, "y": 4 }, + { "matrix": [4, 11], "x": 11, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/cole/config.h b/keyboards/boardsource/equals/keymaps/cole/config.h new file mode 100644 index 000000000000..12b2b08d3346 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/cole/config.h @@ -0,0 +1 @@ +#define COMBO_COUNT 4 \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/cole/keymap.c b/keyboards/boardsource/equals/keymaps/cole/keymap.c new file mode 100644 index 000000000000..2c6414d60d05 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/cole/keymap.c @@ -0,0 +1,67 @@ +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define KC_CTSC MT(MOD_LGUI, KC_SCLN) +#define LOWER_SPC LT(_LOWER, KC_SPC) +#define LOWER_SPC LT(_LOWER, KC_SPC) +#define RASE_BACK LT(_RAISE, KC_BSPC) +#define SHFT_Z MT(MOD_LSFT, KC_Z) +#define SHIFT_SLASH MT(MOD_RSFT, KC_SLSH) +#define RASE_ENT LT(_RAISE, KC_ENT) +#define CTRL_A MT(KC_LGUI, KC_A) +extern void ui_init(void); +extern void ui_task(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_MAIN] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, + CTRL_A, KC_S, KC_D, KC_F, KC_G, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_CTSC, + SHFT_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, SHIFT_SLASH, + _______, _______, _______, LOWER, KC_RCTL, RASE_ENT, RASE_BACK, LOWER_SPC, KC_TAB, _______, _______, _______), + [_RAISE] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, + KC_LSFT, KC_GRV, _______, _______, XXXXXXX, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______, _______, _______, _______), + [_LOWER] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DQT, + KC_ESC, KC_TILD, _______, _______, RGB_MODE_FORWARD, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______, _______, _______, _______) + +}; + +const uint16_t PROGMEM we_combo[] = {KC_W, KC_E, COMBO_END}; +const uint16_t PROGMEM iu_combo[] = {KC_I, KC_U, COMBO_END}; +const uint16_t PROGMEM kj_combo[] = {KC_K, KC_J, COMBO_END}; +const uint16_t PROGMEM er_combo[] = {KC_E, KC_R, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + COMBO(we_combo, KC_ESC), + COMBO(iu_combo, KC_BSPC), + COMBO(kj_combo, KC_COLN), + COMBO(er_combo, KC_TAB)}; + +void keyboard_post_init_user(void) +{ + // Init the display + ui_init(); +} + +void housekeeping_task_user(void) +{ + // Draw the display + ui_task(); +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/cole/rules.mk b/keyboards/boardsource/equals/keymaps/cole/rules.mk new file mode 100644 index 000000000000..da8c6345f659 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/cole/rules.mk @@ -0,0 +1,2 @@ +SRC += ui.c +COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/cole/ui.c b/keyboards/boardsource/equals/keymaps/cole/ui.c new file mode 100644 index 000000000000..15f3af1350a7 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/cole/ui.c @@ -0,0 +1,41 @@ +#include +#include QMK_KEYBOARD_H +#include "qp.h" +#include "qp_st7735.h" +#include "graphics/thintel15.qff.c" + +static painter_device_t oled; +static painter_font_handle_t font; +void ui_init(void) +{ + oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); + font = qp_load_font_mem(font_thintel15); + qp_init(oled, QP_ROTATION_0); + qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); + qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); + qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); + qp_flush(oled); +} + +void ui_task(void) +{ + static const char *text = "Layer:"; + int16_t width = qp_textwidth(font, text); + qp_drawtext(oled, 20, 140, font, text); + + switch (get_highest_layer(layer_state)) + { + case 0: + qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); + break; + case 1: + qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); + break; + case 2: + qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); + break; + default: + qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); + break; + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/default/keymap.c b/keyboards/boardsource/equals/keymaps/default/keymap.c new file mode 100644 index 000000000000..3ab987ab14aa --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/default/keymap.c @@ -0,0 +1,51 @@ +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +extern void ui_init(void); +extern void ui_task(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT_ortho_5x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG), + [_RAISE] = LAYOUT_ortho_5x12( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, + KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [_LOWER] = LAYOUT_ortho_5x12( + 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_UP, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [3] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; + +void keyboard_post_init_user(void) +{ + // Init the display + ui_init(); +} + +void housekeeping_task_user(void) +{ + // Draw the display + ui_task(); +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/default/rules.mk b/keyboards/boardsource/equals/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee901c0bee03 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/default/rules.mk @@ -0,0 +1 @@ +SRC += ui.c \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/default/ui.c b/keyboards/boardsource/equals/keymaps/default/ui.c new file mode 100644 index 000000000000..15f3af1350a7 --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/default/ui.c @@ -0,0 +1,41 @@ +#include +#include QMK_KEYBOARD_H +#include "qp.h" +#include "qp_st7735.h" +#include "graphics/thintel15.qff.c" + +static painter_device_t oled; +static painter_font_handle_t font; +void ui_init(void) +{ + oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); + font = qp_load_font_mem(font_thintel15); + qp_init(oled, QP_ROTATION_0); + qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); + qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); + qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); + qp_flush(oled); +} + +void ui_task(void) +{ + static const char *text = "Layer:"; + int16_t width = qp_textwidth(font, text); + qp_drawtext(oled, 20, 140, font, text); + + switch (get_highest_layer(layer_state)) + { + case 0: + qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); + break; + case 1: + qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); + break; + case 2: + qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); + break; + default: + qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); + break; + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/via/keymap.c b/keyboards/boardsource/equals/keymaps/via/keymap.c new file mode 100644 index 000000000000..f1daa032d50c --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/via/keymap.c @@ -0,0 +1,37 @@ +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT_ortho_5x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG), + [_RAISE] = LAYOUT_ortho_5x12( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, + KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [_LOWER] = LAYOUT_ortho_5x12( + 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_UP, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [3] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; diff --git a/keyboards/boardsource/equals/keymaps/via/rules.mk b/keyboards/boardsource/equals/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/boardsource/equals/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/boardsource/equals/mcuconf.h b/keyboards/boardsource/equals/mcuconf.h new file mode 100644 index 000000000000..30bad6b388c0 --- /dev/null +++ b/keyboards/boardsource/equals/mcuconf.h @@ -0,0 +1,9 @@ +#pragma once + +#include_next + +#undef RP_PWM_USE_PWM6 +#define RP_PWM_USE_PWM6 TRUE + +#undef RP_SPI_USE_SPI1 +#define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md new file mode 100644 index 000000000000..d410ac8da06a --- /dev/null +++ b/keyboards/boardsource/equals/readme.md @@ -0,0 +1,27 @@ +# equals + +![equals](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Cole Smith](https://github.com/boardsource) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make equals:default + +Flashing example for this keyboard: + + make equals: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 + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/boardsource/equals/rules.mk b/keyboards/boardsource/equals/rules.mk new file mode 100644 index 000000000000..b843ba29b559 --- /dev/null +++ b/keyboards/boardsource/equals/rules.mk @@ -0,0 +1,4 @@ +WS2812_DRIVER = vendor +AUDIO_DRIVER = pwm_hardware +QUANTUM_PAINTER_ENABLE = yes +QUANTUM_PAINTER_DRIVERS += st7735_spi From f23a1fcc996d6ccd873f4278ed3e656eace3d51f Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Fri, 17 Feb 2023 17:15:07 -0700 Subject: [PATCH 02/12] initial --- keyboards/boardsource/equals/config.h | 19 ------------------- .../equals/graphics/thintel15.qff.c | 5 +++-- keyboards/boardsource/equals/halconf.h | 5 +++-- keyboards/boardsource/equals/info.json | 6 ++---- .../boardsource/equals/keymaps/cole/config.h | 4 +++- .../boardsource/equals/keymaps/cole/keymap.c | 4 +++- .../boardsource/equals/keymaps/cole/ui.c | 5 +++-- .../equals/keymaps/default/keymap.c | 4 +++- .../boardsource/equals/keymaps/default/ui.c | 5 +++-- .../boardsource/equals/keymaps/via/keymap.c | 2 ++ keyboards/boardsource/equals/mcuconf.h | 2 ++ keyboards/boardsource/equals/readme.md | 6 ++---- 12 files changed, 29 insertions(+), 38 deletions(-) diff --git a/keyboards/boardsource/equals/config.h b/keyboards/boardsource/equals/config.h index b3d633defb02..2239ac71fda9 100644 --- a/keyboards/boardsource/equals/config.h +++ b/keyboards/boardsource/equals/config.h @@ -1,24 +1,5 @@ // Copyright 2023 Cole Smith (@boardsource) // SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -// #define NO_ACTION_LAYER -// #define NO_ACTION_TAPPING -// #define NO_ACTION_ONESHOT - #pragma once #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U diff --git a/keyboards/boardsource/equals/graphics/thintel15.qff.c b/keyboards/boardsource/equals/graphics/thintel15.qff.c index 4a3f07eba909..b1e510502859 100644 --- a/keyboards/boardsource/equals/graphics/thintel15.qff.c +++ b/keyboards/boardsource/equals/graphics/thintel15.qff.c @@ -1,4 +1,5 @@ - +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include const uint32_t font_thintel15_length = 966; @@ -67,4 +68,4 @@ const uint8_t font_thintel15[966] = { 0x11, 0x84, 0x10, 0x0C, 0x00, 0x55, 0x55, 0x01, 0x83, 0x10, 0x82, 0x08, 0x21, 0x03, 0x00, 0x00, 0x00, 0xB0, 0x1A, 0x00, 0x00, 0x00, }; -// clang-format on \ No newline at end of file +// clang-format on diff --git a/keyboards/boardsource/equals/halconf.h b/keyboards/boardsource/equals/halconf.h index aa99e7341a03..ec1c061eeca5 100644 --- a/keyboards/boardsource/equals/halconf.h +++ b/keyboards/boardsource/equals/halconf.h @@ -1,8 +1,9 @@ - +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define HAL_USE_I2C TRUE #define HAL_USE_PWM TRUE #define HAL_USE_SPI TRUE -#include_next \ No newline at end of file +#include_next diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json index 5e8bf90cf6a1..89c45b18b3b9 100644 --- a/keyboards/boardsource/equals/info.json +++ b/keyboards/boardsource/equals/info.json @@ -25,10 +25,8 @@ "pid": "0x7688", "vid": "0x4273" }, - "rgb_matrix": { "driver": "WS2812", - "led_count": 70, "max_brightness": 150, "animations": { "alphas_mods": true, @@ -73,7 +71,7 @@ "splash":true, "multisplash":true, "solid_splash":true, -"solid_multisplash":true + "solid_multisplash":true }, "layout": [ { "flags": 2, "x": 220, "y": 17 }, @@ -213,4 +211,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/keymaps/cole/config.h b/keyboards/boardsource/equals/keymaps/cole/config.h index 12b2b08d3346..bd8815c56aa5 100644 --- a/keyboards/boardsource/equals/keymaps/cole/config.h +++ b/keyboards/boardsource/equals/keymaps/cole/config.h @@ -1 +1,3 @@ -#define COMBO_COUNT 4 \ No newline at end of file +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later +#define COMBO_COUNT 4 diff --git a/keyboards/boardsource/equals/keymaps/cole/keymap.c b/keyboards/boardsource/equals/keymaps/cole/keymap.c index 2c6414d60d05..83544a5c3df5 100644 --- a/keyboards/boardsource/equals/keymaps/cole/keymap.c +++ b/keyboards/boardsource/equals/keymaps/cole/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum layers @@ -64,4 +66,4 @@ void housekeeping_task_user(void) { // Draw the display ui_task(); -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/keymaps/cole/ui.c b/keyboards/boardsource/equals/keymaps/cole/ui.c index 15f3af1350a7..26a943d042a1 100644 --- a/keyboards/boardsource/equals/keymaps/cole/ui.c +++ b/keyboards/boardsource/equals/keymaps/cole/ui.c @@ -1,5 +1,6 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include -#include QMK_KEYBOARD_H #include "qp.h" #include "qp_st7735.h" #include "graphics/thintel15.qff.c" @@ -38,4 +39,4 @@ void ui_task(void) qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); break; } -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/keymaps/default/keymap.c b/keyboards/boardsource/equals/keymaps/default/keymap.c index 3ab987ab14aa..ae7f9ab536a0 100644 --- a/keyboards/boardsource/equals/keymaps/default/keymap.c +++ b/keyboards/boardsource/equals/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum layers @@ -48,4 +50,4 @@ void housekeeping_task_user(void) { // Draw the display ui_task(); -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/keymaps/default/ui.c b/keyboards/boardsource/equals/keymaps/default/ui.c index 15f3af1350a7..26a943d042a1 100644 --- a/keyboards/boardsource/equals/keymaps/default/ui.c +++ b/keyboards/boardsource/equals/keymaps/default/ui.c @@ -1,5 +1,6 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include -#include QMK_KEYBOARD_H #include "qp.h" #include "qp_st7735.h" #include "graphics/thintel15.qff.c" @@ -38,4 +39,4 @@ void ui_task(void) qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); break; } -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/keymaps/via/keymap.c b/keyboards/boardsource/equals/keymaps/via/keymap.c index f1daa032d50c..c4b267155ed9 100644 --- a/keyboards/boardsource/equals/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/keymaps/via/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum layers diff --git a/keyboards/boardsource/equals/mcuconf.h b/keyboards/boardsource/equals/mcuconf.h index 30bad6b388c0..e38c802c071a 100644 --- a/keyboards/boardsource/equals/mcuconf.h +++ b/keyboards/boardsource/equals/mcuconf.h @@ -1,3 +1,5 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include_next diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index d410ac8da06a..5a598618333a 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -2,11 +2,9 @@ ![equals](imgur.com image replace me!) -*A short description of the keyboard/project* - * Keyboard Maintainer: [Cole Smith](https://github.com/boardsource) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Equals PCB w/ RP2040 +* Hardware Availability: [boardsource](https://boardsource.xyz) Make example for this keyboard (after setting up your build environment): From e435b7d7d0bad99b988fd5d4a6463b90ec2b731a Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Wed, 15 Mar 2023 13:10:20 -0700 Subject: [PATCH 03/12] spliting the board in 2 folders --- keyboards/boardsource/equals/4rows/info.json | 174 ++++++++++++++++ .../equals/4rows/keymaps/default/keymap.c | 44 ++++ .../{ => 4rows}/keymaps/default/rules.mk | 0 .../cole => 4rows/keymaps/default}/ui.c | 2 + .../equals/4rows/keymaps/via/keymap.c | 35 ++++ .../equals/{ => 4rows}/keymaps/via/rules.mk | 0 keyboards/boardsource/equals/4rows/rules.mk | 1 + keyboards/boardsource/equals/5rows/info.json | 197 ++++++++++++++++++ .../equals/{ => 5rows}/keymaps/cole/config.h | 0 .../equals/{ => 5rows}/keymaps/cole/keymap.c | 0 .../equals/{ => 5rows}/keymaps/cole/rules.mk | 0 .../default => 5rows/keymaps/cole}/ui.c | 2 + .../{ => 5rows}/keymaps/default/keymap.c | 2 + .../equals/5rows/keymaps/default/rules.mk | 1 + .../equals/5rows/keymaps/default/ui.c | 43 ++++ .../equals/{ => 5rows}/keymaps/via/keymap.c | 2 + .../equals/5rows/keymaps/via/rules.mk | 1 + keyboards/boardsource/equals/5rows/rules.mk | 1 + keyboards/boardsource/equals/info.json | 193 +---------------- 19 files changed, 506 insertions(+), 192 deletions(-) create mode 100644 keyboards/boardsource/equals/4rows/info.json create mode 100644 keyboards/boardsource/equals/4rows/keymaps/default/keymap.c rename keyboards/boardsource/equals/{ => 4rows}/keymaps/default/rules.mk (100%) rename keyboards/boardsource/equals/{keymaps/cole => 4rows/keymaps/default}/ui.c (93%) create mode 100644 keyboards/boardsource/equals/4rows/keymaps/via/keymap.c rename keyboards/boardsource/equals/{ => 4rows}/keymaps/via/rules.mk (100%) create mode 100644 keyboards/boardsource/equals/4rows/rules.mk create mode 100644 keyboards/boardsource/equals/5rows/info.json rename keyboards/boardsource/equals/{ => 5rows}/keymaps/cole/config.h (100%) rename keyboards/boardsource/equals/{ => 5rows}/keymaps/cole/keymap.c (100%) rename keyboards/boardsource/equals/{ => 5rows}/keymaps/cole/rules.mk (100%) rename keyboards/boardsource/equals/{keymaps/default => 5rows/keymaps/cole}/ui.c (93%) rename keyboards/boardsource/equals/{ => 5rows}/keymaps/default/keymap.c (97%) create mode 100644 keyboards/boardsource/equals/5rows/keymaps/default/rules.mk create mode 100644 keyboards/boardsource/equals/5rows/keymaps/default/ui.c rename keyboards/boardsource/equals/{ => 5rows}/keymaps/via/keymap.c (96%) create mode 100644 keyboards/boardsource/equals/5rows/keymaps/via/rules.mk create mode 100644 keyboards/boardsource/equals/5rows/rules.mk diff --git a/keyboards/boardsource/equals/4rows/info.json b/keyboards/boardsource/equals/4rows/info.json new file mode 100644 index 000000000000..11018f009c30 --- /dev/null +++ b/keyboards/boardsource/equals/4rows/info.json @@ -0,0 +1,174 @@ +{ + "keyboard_name": "Equals 4x12", + + "matrix_pins": { + "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], + "rows": ["GP12","GP13","GP16","GP17"] + }, + + + "rgb_matrix": { + "driver": "WS2812", + "led_count": 70, + "max_brightness": 150, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat":true, + "band_pinwheel_val":true, + "band_spiral_sat":true, + "band_spiral_val":true, + "cycle_all":true, + "cycle_left_right":true, + "cycle_up_down":true, + "rainbow_moving_chevron":true, + "cycle_out_in":true, + "cycle_out_in_dual":true, + "cycle_pinwheel":true, + "cycle_spiral":true, + "dual_beacon":true, + "rainbow_beacon":true, + "rainbow_pinwheels":true, + "raindrops":true, + "jellybean_raindrops":true, + "hue_breathing":true, + "hue_pendulum":true, + "hue_wave":true, + "pixel_rain":true, + "pixel_flow":true, + "pixel_fractal":true, + "typing_heatmap":true, + "digital_rain":true, + "solid_reactive_simple":true, + "solid_reactive":true, + "solid_reactive_wide":true, + "solid_reactive_multiwide":true, + "solid_reactive_cross":true, + "solid_reactive_multicross":true, + "solid_reactive_nexus":true, + "solid_reactive_multinexus":true, + "splash":true, + "multisplash":true, + "solid_splash":true, +"solid_multisplash":true + }, + "layout": [ + { "flags": 2, "x": 220, "y": 17 }, + { "flags": 2, "x": 172, "y": 17 }, + { "flags": 2, "x": 112, "y": 17 }, + { "flags": 2, "x": 50, "y": 17 }, + { "flags": 2, "x": 4, "y": 17 }, + { "flags": 2, "x": 4, "y": 56 }, + { "flags": 2, "x": 50, "y": 56 }, + { "flags": 2, "x": 112, "y": 56 }, + { "flags": 2, "x": 172, "y": 56 }, + { "flags": 2, "x": 220, "y": 56 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, + { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, + { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, + { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, + { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, + { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, + { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, + { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, + { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, + { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, + { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, + { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, + { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, + { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, + { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 }, + { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 }, + { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 }, + { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, + { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 }, + { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 }, + { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 }, + { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 }, + { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 }, + { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 } + ] + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [1, 11], "x": 11, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [2, 5], "x": 5, "y": 2 }, + { "matrix": [2, 6], "x": 6, "y": 2 }, + { "matrix": [2, 7], "x": 7, "y": 2 }, + { "matrix": [2, 8], "x": 8, "y": 2 }, + { "matrix": [2, 9], "x": 9, "y": 2 }, + { "matrix": [2, 10], "x": 10, "y": 2 }, + { "matrix": [2, 11], "x": 11, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 4, "y": 3 }, + { "matrix": [3, 5], "x": 5, "y": 3 }, + { "matrix": [3, 6], "x": 6, "y": 3 }, + { "matrix": [3, 7], "x": 7, "y": 3 }, + { "matrix": [3, 8], "x": 8, "y": 3 }, + { "matrix": [3, 9], "x": 9, "y": 3 }, + { "matrix": [3, 10], "x": 10, "y": 3 }, + { "matrix": [3, 11], "x": 11, "y": 3 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/4rows/keymaps/default/keymap.c b/keyboards/boardsource/equals/4rows/keymaps/default/keymap.c new file mode 100644 index 000000000000..6744262bd63b --- /dev/null +++ b/keyboards/boardsource/equals/4rows/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +extern void ui_init(void); +extern void ui_task(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT_ortho_4x12( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + [_RAISE] = LAYOUT_ortho_4x12( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [_LOWER] = LAYOUT_ortho_4x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY)}; + +void keyboard_post_init_user(void) +{ + // Init the display + ui_init(); +} + +void housekeeping_task_user(void) +{ + // Draw the display + ui_task(); +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/default/rules.mk b/keyboards/boardsource/equals/4rows/keymaps/default/rules.mk similarity index 100% rename from keyboards/boardsource/equals/keymaps/default/rules.mk rename to keyboards/boardsource/equals/4rows/keymaps/default/rules.mk diff --git a/keyboards/boardsource/equals/keymaps/cole/ui.c b/keyboards/boardsource/equals/4rows/keymaps/default/ui.c similarity index 93% rename from keyboards/boardsource/equals/keymaps/cole/ui.c rename to keyboards/boardsource/equals/4rows/keymaps/default/ui.c index 15f3af1350a7..cf9dd1bf16c9 100644 --- a/keyboards/boardsource/equals/keymaps/cole/ui.c +++ b/keyboards/boardsource/equals/4rows/keymaps/default/ui.c @@ -1,3 +1,5 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later #include #include QMK_KEYBOARD_H #include "qp.h" diff --git a/keyboards/boardsource/equals/4rows/keymaps/via/keymap.c b/keyboards/boardsource/equals/4rows/keymaps/via/keymap.c new file mode 100644 index 000000000000..5c3f5c93a1ec --- /dev/null +++ b/keyboards/boardsource/equals/4rows/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT_ortho_4x12( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + [_RAISE] = LAYOUT_ortho_4x12( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [_LOWER] = LAYOUT_ortho_4x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + [4] = LAYOUT_ortho_4x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; diff --git a/keyboards/boardsource/equals/keymaps/via/rules.mk b/keyboards/boardsource/equals/4rows/keymaps/via/rules.mk similarity index 100% rename from keyboards/boardsource/equals/keymaps/via/rules.mk rename to keyboards/boardsource/equals/4rows/keymaps/via/rules.mk diff --git a/keyboards/boardsource/equals/4rows/rules.mk b/keyboards/boardsource/equals/4rows/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/boardsource/equals/4rows/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/boardsource/equals/5rows/info.json b/keyboards/boardsource/equals/5rows/info.json new file mode 100644 index 000000000000..b899bf4e6cdc --- /dev/null +++ b/keyboards/boardsource/equals/5rows/info.json @@ -0,0 +1,197 @@ +{ + "keyboard_name": "Equals 5x12", + + "matrix_pins": { + "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], + "rows": ["GP12","GP13","GP16","GP17","GP18"] + }, + + + "rgb_matrix": { + "driver": "WS2812", + "led_count": 70, + "max_brightness": 150, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat":true, + "band_pinwheel_val":true, + "band_spiral_sat":true, + "band_spiral_val":true, + "cycle_all":true, + "cycle_left_right":true, + "cycle_up_down":true, + "rainbow_moving_chevron":true, + "cycle_out_in":true, + "cycle_out_in_dual":true, + "cycle_pinwheel":true, + "cycle_spiral":true, + "dual_beacon":true, + "rainbow_beacon":true, + "rainbow_pinwheels":true, + "raindrops":true, + "jellybean_raindrops":true, + "hue_breathing":true, + "hue_pendulum":true, + "hue_wave":true, + "pixel_rain":true, + "pixel_flow":true, + "pixel_fractal":true, + "typing_heatmap":true, + "digital_rain":true, + "solid_reactive_simple":true, + "solid_reactive":true, + "solid_reactive_wide":true, + "solid_reactive_multiwide":true, + "solid_reactive_cross":true, + "solid_reactive_multicross":true, + "solid_reactive_nexus":true, + "solid_reactive_multinexus":true, + "splash":true, + "multisplash":true, + "solid_splash":true, +"solid_multisplash":true + }, + "layout": [ + { "flags": 2, "x": 220, "y": 17 }, + { "flags": 2, "x": 172, "y": 17 }, + { "flags": 2, "x": 112, "y": 17 }, + { "flags": 2, "x": 50, "y": 17 }, + { "flags": 2, "x": 4, "y": 17 }, + { "flags": 2, "x": 4, "y": 56 }, + { "flags": 2, "x": 50, "y": 56 }, + { "flags": 2, "x": 112, "y": 56 }, + { "flags": 2, "x": 172, "y": 56 }, + { "flags": 2, "x": 220, "y": 56 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, + { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, + { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, + { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, + { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, + { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, + { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, + { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, + { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, + { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, + { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, + { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, + { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, + { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 }, + { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 }, + { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 }, + { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, + { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 }, + { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 }, + { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 }, + { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 }, + { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 }, + { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }, + { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 }, + { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 }, + { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 }, + { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 }, + { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 }, + { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 }, + { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 }, + { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 }, + { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 }, + { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 }, + { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 } + ] + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [1, 11], "x": 11, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [2, 5], "x": 5, "y": 2 }, + { "matrix": [2, 6], "x": 6, "y": 2 }, + { "matrix": [2, 7], "x": 7, "y": 2 }, + { "matrix": [2, 8], "x": 8, "y": 2 }, + { "matrix": [2, 9], "x": 9, "y": 2 }, + { "matrix": [2, 10], "x": 10, "y": 2 }, + { "matrix": [2, 11], "x": 11, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 4, "y": 3 }, + { "matrix": [3, 5], "x": 5, "y": 3 }, + { "matrix": [3, 6], "x": 6, "y": 3 }, + { "matrix": [3, 7], "x": 7, "y": 3 }, + { "matrix": [3, 8], "x": 8, "y": 3 }, + { "matrix": [3, 9], "x": 9, "y": 3 }, + { "matrix": [3, 10], "x": 10, "y": 3 }, + { "matrix": [3, 11], "x": 11, "y": 3 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "x": 2, "y": 4 }, + { "matrix": [4, 3], "x": 3, "y": 4 }, + { "matrix": [4, 4], "x": 4, "y": 4 }, + { "matrix": [4, 5], "x": 5, "y": 4 }, + { "matrix": [4, 6], "x": 6, "y": 4 }, + { "matrix": [4, 7], "x": 7, "y": 4 }, + { "matrix": [4, 8], "x": 8, "y": 4 }, + { "matrix": [4, 9], "x": 9, "y": 4 }, + { "matrix": [4, 10], "x": 10, "y": 4 }, + { "matrix": [4, 11], "x": 11, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/cole/config.h b/keyboards/boardsource/equals/5rows/keymaps/cole/config.h similarity index 100% rename from keyboards/boardsource/equals/keymaps/cole/config.h rename to keyboards/boardsource/equals/5rows/keymaps/cole/config.h diff --git a/keyboards/boardsource/equals/keymaps/cole/keymap.c b/keyboards/boardsource/equals/5rows/keymaps/cole/keymap.c similarity index 100% rename from keyboards/boardsource/equals/keymaps/cole/keymap.c rename to keyboards/boardsource/equals/5rows/keymaps/cole/keymap.c diff --git a/keyboards/boardsource/equals/keymaps/cole/rules.mk b/keyboards/boardsource/equals/5rows/keymaps/cole/rules.mk similarity index 100% rename from keyboards/boardsource/equals/keymaps/cole/rules.mk rename to keyboards/boardsource/equals/5rows/keymaps/cole/rules.mk diff --git a/keyboards/boardsource/equals/keymaps/default/ui.c b/keyboards/boardsource/equals/5rows/keymaps/cole/ui.c similarity index 93% rename from keyboards/boardsource/equals/keymaps/default/ui.c rename to keyboards/boardsource/equals/5rows/keymaps/cole/ui.c index 15f3af1350a7..cf9dd1bf16c9 100644 --- a/keyboards/boardsource/equals/keymaps/default/ui.c +++ b/keyboards/boardsource/equals/5rows/keymaps/cole/ui.c @@ -1,3 +1,5 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later #include #include QMK_KEYBOARD_H #include "qp.h" diff --git a/keyboards/boardsource/equals/keymaps/default/keymap.c b/keyboards/boardsource/equals/5rows/keymaps/default/keymap.c similarity index 97% rename from keyboards/boardsource/equals/keymaps/default/keymap.c rename to keyboards/boardsource/equals/5rows/keymaps/default/keymap.c index 3ab987ab14aa..952d2142e7f5 100644 --- a/keyboards/boardsource/equals/keymaps/default/keymap.c +++ b/keyboards/boardsource/equals/5rows/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum layers diff --git a/keyboards/boardsource/equals/5rows/keymaps/default/rules.mk b/keyboards/boardsource/equals/5rows/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee901c0bee03 --- /dev/null +++ b/keyboards/boardsource/equals/5rows/keymaps/default/rules.mk @@ -0,0 +1 @@ +SRC += ui.c \ No newline at end of file diff --git a/keyboards/boardsource/equals/5rows/keymaps/default/ui.c b/keyboards/boardsource/equals/5rows/keymaps/default/ui.c new file mode 100644 index 000000000000..cf9dd1bf16c9 --- /dev/null +++ b/keyboards/boardsource/equals/5rows/keymaps/default/ui.c @@ -0,0 +1,43 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include QMK_KEYBOARD_H +#include "qp.h" +#include "qp_st7735.h" +#include "graphics/thintel15.qff.c" + +static painter_device_t oled; +static painter_font_handle_t font; +void ui_init(void) +{ + oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); + font = qp_load_font_mem(font_thintel15); + qp_init(oled, QP_ROTATION_0); + qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); + qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); + qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); + qp_flush(oled); +} + +void ui_task(void) +{ + static const char *text = "Layer:"; + int16_t width = qp_textwidth(font, text); + qp_drawtext(oled, 20, 140, font, text); + + switch (get_highest_layer(layer_state)) + { + case 0: + qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); + break; + case 1: + qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); + break; + case 2: + qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); + break; + default: + qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); + break; + } +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/keymaps/via/keymap.c b/keyboards/boardsource/equals/5rows/keymaps/via/keymap.c similarity index 96% rename from keyboards/boardsource/equals/keymaps/via/keymap.c rename to keyboards/boardsource/equals/5rows/keymaps/via/keymap.c index f1daa032d50c..9070c5a98ac1 100644 --- a/keyboards/boardsource/equals/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/5rows/keymaps/via/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum layers diff --git a/keyboards/boardsource/equals/5rows/keymaps/via/rules.mk b/keyboards/boardsource/equals/5rows/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/boardsource/equals/5rows/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/boardsource/equals/5rows/rules.mk b/keyboards/boardsource/equals/5rows/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/boardsource/equals/5rows/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json index 5e8bf90cf6a1..1e8a8434a933 100644 --- a/keyboards/boardsource/equals/info.json +++ b/keyboards/boardsource/equals/info.json @@ -14,203 +14,12 @@ "rgb_matrix": true, "audio":true }, - "matrix_pins": { - "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], - "rows": ["GP12","GP13","GP16","GP17","GP18"] - }, "processor": "RP2040", "url": "", "usb": { "device_version": "1.0.0", "pid": "0x7688", "vid": "0x4273" - }, - - "rgb_matrix": { - "driver": "WS2812", - "led_count": 70, - "max_brightness": 150, - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat":true, - "band_pinwheel_val":true, - "band_spiral_sat":true, - "band_spiral_val":true, - "cycle_all":true, - "cycle_left_right":true, - "cycle_up_down":true, - "rainbow_moving_chevron":true, - "cycle_out_in":true, - "cycle_out_in_dual":true, - "cycle_pinwheel":true, - "cycle_spiral":true, - "dual_beacon":true, - "rainbow_beacon":true, - "rainbow_pinwheels":true, - "raindrops":true, - "jellybean_raindrops":true, - "hue_breathing":true, - "hue_pendulum":true, - "hue_wave":true, - "pixel_rain":true, - "pixel_flow":true, - "pixel_fractal":true, - "typing_heatmap":true, - "digital_rain":true, - "solid_reactive_simple":true, - "solid_reactive":true, - "solid_reactive_wide":true, - "solid_reactive_multiwide":true, - "solid_reactive_cross":true, - "solid_reactive_multicross":true, - "solid_reactive_nexus":true, - "solid_reactive_multinexus":true, - "splash":true, - "multisplash":true, - "solid_splash":true, -"solid_multisplash":true - }, - "layout": [ - { "flags": 2, "x": 220, "y": 17 }, - { "flags": 2, "x": 172, "y": 17 }, - { "flags": 2, "x": 112, "y": 17 }, - { "flags": 2, "x": 50, "y": 17 }, - { "flags": 2, "x": 4, "y": 17 }, - { "flags": 2, "x": 4, "y": 56 }, - { "flags": 2, "x": 50, "y": 56 }, - { "flags": 2, "x": 112, "y": 56 }, - { "flags": 2, "x": 172, "y": 56 }, - { "flags": 2, "x": 220, "y": 56 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, - { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, - { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, - { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, - { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, - { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, - { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, - { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, - { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, - { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, - { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, - { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, - { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, - { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, - { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, - { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, - { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, - { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, - { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, - { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, - { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, - { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, - { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, - { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, - { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 }, - { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 }, - { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 }, - { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 }, - { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, - { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 }, - { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 }, - { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 }, - { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 }, - { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 }, - { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }, - { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 }, - { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 }, - { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 }, - { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 }, - { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 }, - { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 }, - { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 }, - { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 }, - { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 }, - { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 }, - { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 } - ] - }, - "layouts": { - "LAYOUT_ortho_5x12": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [0, 5], "x": 5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10, "y": 0 }, - { "matrix": [0, 11], "x": 11, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, - { "matrix": [1, 5], "x": 5, "y": 1 }, - { "matrix": [1, 6], "x": 6, "y": 1 }, - { "matrix": [1, 7], "x": 7, "y": 1 }, - { "matrix": [1, 8], "x": 8, "y": 1 }, - { "matrix": [1, 9], "x": 9, "y": 1 }, - { "matrix": [1, 10], "x": 10, "y": 1 }, - { "matrix": [1, 11], "x": 11, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2 }, - { "matrix": [2, 5], "x": 5, "y": 2 }, - { "matrix": [2, 6], "x": 6, "y": 2 }, - { "matrix": [2, 7], "x": 7, "y": 2 }, - { "matrix": [2, 8], "x": 8, "y": 2 }, - { "matrix": [2, 9], "x": 9, "y": 2 }, - { "matrix": [2, 10], "x": 10, "y": 2 }, - { "matrix": [2, 11], "x": 11, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3 }, - { "matrix": [3, 4], "x": 4, "y": 3 }, - { "matrix": [3, 5], "x": 5, "y": 3 }, - { "matrix": [3, 6], "x": 6, "y": 3 }, - { "matrix": [3, 7], "x": 7, "y": 3 }, - { "matrix": [3, 8], "x": 8, "y": 3 }, - { "matrix": [3, 9], "x": 9, "y": 3 }, - { "matrix": [3, 10], "x": 10, "y": 3 }, - { "matrix": [3, 11], "x": 11, "y": 3 }, - { "matrix": [4, 0], "x": 0, "y": 4 }, - { "matrix": [4, 1], "x": 1, "y": 4 }, - { "matrix": [4, 2], "x": 2, "y": 4 }, - { "matrix": [4, 3], "x": 3, "y": 4 }, - { "matrix": [4, 4], "x": 4, "y": 4 }, - { "matrix": [4, 5], "x": 5, "y": 4 }, - { "matrix": [4, 6], "x": 6, "y": 4 }, - { "matrix": [4, 7], "x": 7, "y": 4 }, - { "matrix": [4, 8], "x": 8, "y": 4 }, - { "matrix": [4, 9], "x": 9, "y": 4 }, - { "matrix": [4, 10], "x": 10, "y": 4 }, - { "matrix": [4, 11], "x": 11, "y": 4 } - ] - } } + } \ No newline at end of file From c78d6c3b9b873c2f5051ff840a6877e6886d3748 Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Wed, 15 Mar 2023 13:29:17 -0700 Subject: [PATCH 04/12] correct names --- keyboards/boardsource/equals/{4rows => 48}/info.json | 2 +- .../equals/{4rows => 48}/keymaps/default/keymap.c | 0 .../equals/{4rows => 48}/keymaps/default/rules.mk | 0 .../boardsource/equals/{4rows => 48}/keymaps/default/ui.c | 0 .../boardsource/equals/{4rows => 48}/keymaps/via/keymap.c | 0 .../boardsource/equals/{4rows => 48}/keymaps/via/rules.mk | 0 keyboards/boardsource/equals/{4rows => 48}/rules.mk | 0 keyboards/boardsource/equals/{5rows => 60}/info.json | 2 +- .../boardsource/equals/{5rows => 60}/keymaps/cole/config.h | 0 .../boardsource/equals/{5rows => 60}/keymaps/cole/keymap.c | 0 .../boardsource/equals/{5rows => 60}/keymaps/cole/rules.mk | 0 .../boardsource/equals/{5rows => 60}/keymaps/cole/ui.c | 0 .../equals/{5rows => 60}/keymaps/default/keymap.c | 0 .../equals/{5rows => 60}/keymaps/default/rules.mk | 0 .../boardsource/equals/{5rows => 60}/keymaps/default/ui.c | 0 .../boardsource/equals/{5rows => 60}/keymaps/via/keymap.c | 0 .../boardsource/equals/{5rows => 60}/keymaps/via/rules.mk | 0 keyboards/boardsource/equals/{5rows => 60}/rules.mk | 0 keyboards/boardsource/equals/readme.md | 7 ++----- 19 files changed, 4 insertions(+), 7 deletions(-) rename keyboards/boardsource/equals/{4rows => 48}/info.json (99%) rename keyboards/boardsource/equals/{4rows => 48}/keymaps/default/keymap.c (100%) rename keyboards/boardsource/equals/{4rows => 48}/keymaps/default/rules.mk (100%) rename keyboards/boardsource/equals/{4rows => 48}/keymaps/default/ui.c (100%) rename keyboards/boardsource/equals/{4rows => 48}/keymaps/via/keymap.c (100%) rename keyboards/boardsource/equals/{4rows => 48}/keymaps/via/rules.mk (100%) rename keyboards/boardsource/equals/{4rows => 48}/rules.mk (100%) rename keyboards/boardsource/equals/{5rows => 60}/info.json (99%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/cole/config.h (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/cole/keymap.c (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/cole/rules.mk (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/cole/ui.c (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/default/keymap.c (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/default/rules.mk (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/default/ui.c (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/via/keymap.c (100%) rename keyboards/boardsource/equals/{5rows => 60}/keymaps/via/rules.mk (100%) rename keyboards/boardsource/equals/{5rows => 60}/rules.mk (100%) diff --git a/keyboards/boardsource/equals/4rows/info.json b/keyboards/boardsource/equals/48/info.json similarity index 99% rename from keyboards/boardsource/equals/4rows/info.json rename to keyboards/boardsource/equals/48/info.json index 11018f009c30..931c8b02005e 100644 --- a/keyboards/boardsource/equals/4rows/info.json +++ b/keyboards/boardsource/equals/48/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Equals 4x12", + "keyboard_name": "Equals 48", "matrix_pins": { "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], diff --git a/keyboards/boardsource/equals/4rows/keymaps/default/keymap.c b/keyboards/boardsource/equals/48/keymaps/default/keymap.c similarity index 100% rename from keyboards/boardsource/equals/4rows/keymaps/default/keymap.c rename to keyboards/boardsource/equals/48/keymaps/default/keymap.c diff --git a/keyboards/boardsource/equals/4rows/keymaps/default/rules.mk b/keyboards/boardsource/equals/48/keymaps/default/rules.mk similarity index 100% rename from keyboards/boardsource/equals/4rows/keymaps/default/rules.mk rename to keyboards/boardsource/equals/48/keymaps/default/rules.mk diff --git a/keyboards/boardsource/equals/4rows/keymaps/default/ui.c b/keyboards/boardsource/equals/48/keymaps/default/ui.c similarity index 100% rename from keyboards/boardsource/equals/4rows/keymaps/default/ui.c rename to keyboards/boardsource/equals/48/keymaps/default/ui.c diff --git a/keyboards/boardsource/equals/4rows/keymaps/via/keymap.c b/keyboards/boardsource/equals/48/keymaps/via/keymap.c similarity index 100% rename from keyboards/boardsource/equals/4rows/keymaps/via/keymap.c rename to keyboards/boardsource/equals/48/keymaps/via/keymap.c diff --git a/keyboards/boardsource/equals/4rows/keymaps/via/rules.mk b/keyboards/boardsource/equals/48/keymaps/via/rules.mk similarity index 100% rename from keyboards/boardsource/equals/4rows/keymaps/via/rules.mk rename to keyboards/boardsource/equals/48/keymaps/via/rules.mk diff --git a/keyboards/boardsource/equals/4rows/rules.mk b/keyboards/boardsource/equals/48/rules.mk similarity index 100% rename from keyboards/boardsource/equals/4rows/rules.mk rename to keyboards/boardsource/equals/48/rules.mk diff --git a/keyboards/boardsource/equals/5rows/info.json b/keyboards/boardsource/equals/60/info.json similarity index 99% rename from keyboards/boardsource/equals/5rows/info.json rename to keyboards/boardsource/equals/60/info.json index b899bf4e6cdc..62ba7031c17c 100644 --- a/keyboards/boardsource/equals/5rows/info.json +++ b/keyboards/boardsource/equals/60/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Equals 5x12", + "keyboard_name": "Equals 60", "matrix_pins": { "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], diff --git a/keyboards/boardsource/equals/5rows/keymaps/cole/config.h b/keyboards/boardsource/equals/60/keymaps/cole/config.h similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/cole/config.h rename to keyboards/boardsource/equals/60/keymaps/cole/config.h diff --git a/keyboards/boardsource/equals/5rows/keymaps/cole/keymap.c b/keyboards/boardsource/equals/60/keymaps/cole/keymap.c similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/cole/keymap.c rename to keyboards/boardsource/equals/60/keymaps/cole/keymap.c diff --git a/keyboards/boardsource/equals/5rows/keymaps/cole/rules.mk b/keyboards/boardsource/equals/60/keymaps/cole/rules.mk similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/cole/rules.mk rename to keyboards/boardsource/equals/60/keymaps/cole/rules.mk diff --git a/keyboards/boardsource/equals/5rows/keymaps/cole/ui.c b/keyboards/boardsource/equals/60/keymaps/cole/ui.c similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/cole/ui.c rename to keyboards/boardsource/equals/60/keymaps/cole/ui.c diff --git a/keyboards/boardsource/equals/5rows/keymaps/default/keymap.c b/keyboards/boardsource/equals/60/keymaps/default/keymap.c similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/default/keymap.c rename to keyboards/boardsource/equals/60/keymaps/default/keymap.c diff --git a/keyboards/boardsource/equals/5rows/keymaps/default/rules.mk b/keyboards/boardsource/equals/60/keymaps/default/rules.mk similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/default/rules.mk rename to keyboards/boardsource/equals/60/keymaps/default/rules.mk diff --git a/keyboards/boardsource/equals/5rows/keymaps/default/ui.c b/keyboards/boardsource/equals/60/keymaps/default/ui.c similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/default/ui.c rename to keyboards/boardsource/equals/60/keymaps/default/ui.c diff --git a/keyboards/boardsource/equals/5rows/keymaps/via/keymap.c b/keyboards/boardsource/equals/60/keymaps/via/keymap.c similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/via/keymap.c rename to keyboards/boardsource/equals/60/keymaps/via/keymap.c diff --git a/keyboards/boardsource/equals/5rows/keymaps/via/rules.mk b/keyboards/boardsource/equals/60/keymaps/via/rules.mk similarity index 100% rename from keyboards/boardsource/equals/5rows/keymaps/via/rules.mk rename to keyboards/boardsource/equals/60/keymaps/via/rules.mk diff --git a/keyboards/boardsource/equals/5rows/rules.mk b/keyboards/boardsource/equals/60/rules.mk similarity index 100% rename from keyboards/boardsource/equals/5rows/rules.mk rename to keyboards/boardsource/equals/60/rules.mk diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index 5a598618333a..0f232d86d133 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -8,11 +8,8 @@ Make example for this keyboard (after setting up your build environment): - make equals:default + make boardsource/equals/5rows:default or make boardsource/equals/4rows:default -Flashing example for this keyboard: - - make equals: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). @@ -21,5 +18,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset button**: Briefly press the button on the back of the PCB * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 6aa21f8e0e47f768a2aeb159d2433b64dcf72cbf Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Wed, 15 Mar 2023 13:30:21 -0700 Subject: [PATCH 05/12] readme --- keyboards/boardsource/equals/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index 0f232d86d133..afaad46b0143 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -8,7 +8,7 @@ Make example for this keyboard (after setting up your build environment): - make boardsource/equals/5rows:default or make boardsource/equals/4rows:default + make boardsource/equals/60:default or make boardsource/equals/48:default 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). From ca2571de6c2e64e4902eb70796327849f190aabc Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Mon, 10 Apr 2023 11:43:33 -0700 Subject: [PATCH 06/12] keymaps --- .../equals/48/keymaps/cole/config.h | 3 + .../equals/48/keymaps/cole/keymap.c | 66 +++++++++++++++++++ .../equals/48/keymaps/cole/rules.mk | 2 + .../boardsource/equals/48/keymaps/cole/ui.c | 42 ++++++++++++ .../equals/60/keymaps/via/keymap.c | 4 +- keyboards/boardsource/equals/config.h | 2 +- 6 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 keyboards/boardsource/equals/48/keymaps/cole/config.h create mode 100644 keyboards/boardsource/equals/48/keymaps/cole/keymap.c create mode 100644 keyboards/boardsource/equals/48/keymaps/cole/rules.mk create mode 100644 keyboards/boardsource/equals/48/keymaps/cole/ui.c diff --git a/keyboards/boardsource/equals/48/keymaps/cole/config.h b/keyboards/boardsource/equals/48/keymaps/cole/config.h new file mode 100644 index 000000000000..bd8815c56aa5 --- /dev/null +++ b/keyboards/boardsource/equals/48/keymaps/cole/config.h @@ -0,0 +1,3 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later +#define COMBO_COUNT 4 diff --git a/keyboards/boardsource/equals/48/keymaps/cole/keymap.c b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c new file mode 100644 index 000000000000..d036abdaa0f8 --- /dev/null +++ b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c @@ -0,0 +1,66 @@ +// Copyright 2022 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum layers +{ + _MAIN, + _RAISE, + _LOWER, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define KC_CTSC MT(MOD_LGUI, KC_SCLN) +#define LOWER_SPC LT(_LOWER, KC_SPC) +#define LOWER_SPC LT(_LOWER, KC_SPC) +#define RASE_BACK LT(_RAISE, KC_BSPC) +#define SHFT_Z MT(MOD_LSFT, KC_Z) +#define SHIFT_SLASH MT(MOD_RSFT, KC_SLSH) +#define RASE_ENT LT(_RAISE, KC_ENT) +#define CTRL_A MT(KC_LGUI, KC_A) +extern void ui_init(void); +extern void ui_task(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_MAIN] = LAYOUT_ortho_4x12( + KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, + CTRL_A, KC_S, KC_D, KC_F, KC_G, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_CTSC, + SHFT_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, SHIFT_SLASH, + _______, _______, _______, LOWER, KC_RCTL, RASE_ENT, RASE_BACK, LOWER_SPC, KC_TAB, _______, _______, _______), + [_RAISE] = LAYOUT_ortho_4x12( + KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, + KC_LSFT, KC_GRV, _______, _______, XXXXXXX, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______, _______, _______, _______), + [_LOWER] = LAYOUT_ortho_4x12( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DQT, + KC_ESC, KC_TILD, _______, _______, RGB_MODE_FORWARD, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______, _______, _______, _______) + +}; + +const uint16_t PROGMEM we_combo[] = {KC_W, KC_E, COMBO_END}; +const uint16_t PROGMEM iu_combo[] = {KC_I, KC_U, COMBO_END}; +const uint16_t PROGMEM kj_combo[] = {KC_K, KC_J, COMBO_END}; +const uint16_t PROGMEM er_combo[] = {KC_E, KC_R, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + COMBO(we_combo, KC_ESC), + COMBO(iu_combo, KC_BSPC), + COMBO(kj_combo, KC_COLN), + COMBO(er_combo, KC_TAB)}; + +void keyboard_post_init_user(void) +{ + // Init the display + ui_init(); +} + +void housekeeping_task_user(void) +{ + // Draw the display + ui_task(); +} \ No newline at end of file diff --git a/keyboards/boardsource/equals/48/keymaps/cole/rules.mk b/keyboards/boardsource/equals/48/keymaps/cole/rules.mk new file mode 100644 index 000000000000..da8c6345f659 --- /dev/null +++ b/keyboards/boardsource/equals/48/keymaps/cole/rules.mk @@ -0,0 +1,2 @@ +SRC += ui.c +COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/boardsource/equals/48/keymaps/cole/ui.c b/keyboards/boardsource/equals/48/keymaps/cole/ui.c new file mode 100644 index 000000000000..26a943d042a1 --- /dev/null +++ b/keyboards/boardsource/equals/48/keymaps/cole/ui.c @@ -0,0 +1,42 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include "qp.h" +#include "qp_st7735.h" +#include "graphics/thintel15.qff.c" + +static painter_device_t oled; +static painter_font_handle_t font; +void ui_init(void) +{ + oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); + font = qp_load_font_mem(font_thintel15); + qp_init(oled, QP_ROTATION_0); + qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); + qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); + qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); + qp_flush(oled); +} + +void ui_task(void) +{ + static const char *text = "Layer:"; + int16_t width = qp_textwidth(font, text); + qp_drawtext(oled, 20, 140, font, text); + + switch (get_highest_layer(layer_state)) + { + case 0: + qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); + break; + case 1: + qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); + break; + case 2: + qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); + break; + default: + qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); + break; + } +} diff --git a/keyboards/boardsource/equals/60/keymaps/via/keymap.c b/keyboards/boardsource/equals/60/keymaps/via/keymap.c index c4b267155ed9..ec63d6c0c8b8 100644 --- a/keyboards/boardsource/equals/60/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/60/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG), + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), [_RAISE] = LAYOUT_ortho_5x12( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), [_LOWER] = LAYOUT_ortho_5x12( 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_UP, _______, _______, _______, + _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), diff --git a/keyboards/boardsource/equals/config.h b/keyboards/boardsource/equals/config.h index 2239ac71fda9..b2b14a11a67a 100644 --- a/keyboards/boardsource/equals/config.h +++ b/keyboards/boardsource/equals/config.h @@ -11,7 +11,7 @@ #define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B -#define AUDIO_CLICKY +// #define AUDIO_CLICKY #define AUDIO_INIT_DELAY 1000 #define STARTUP_SONG SONG(STARTUP_SOUND) From 7e0452ee96ec1982b6e66ffd8a105949c989e970 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Wed, 15 Mar 2023 23:42:56 -0600 Subject: [PATCH 07/12] initial --- keyboards/boardsource/equals/48/info.json | 211 ++++++++-------- .../equals/48/keymaps/default/keymap.c | 29 +-- .../equals/48/keymaps/default/rules.mk | 1 - .../equals/48/keymaps/default/ui.c | 43 ---- .../equals/48/keymaps/via/keymap.c | 20 +- .../equals/48/keymaps/via/rules.mk | 2 +- keyboards/boardsource/equals/60/info.json | 233 +++++++++--------- .../equals/60/keymaps/cole/keymap.c | 14 -- .../boardsource/equals/60/keymaps/cole/ui.c | 42 ---- .../equals/60/keymaps/default/keymap.c | 35 +-- .../equals/60/keymaps/default/rules.mk | 1 - .../equals/60/keymaps/default/ui.c | 42 ---- .../equals/60/keymaps/via/keymap.c | 21 +- keyboards/boardsource/equals/config.h | 1 - keyboards/boardsource/equals/equals.c | 19 ++ .../equals/graphics/thintel15.qff.c | 2 - keyboards/boardsource/equals/info.json | 1 - keyboards/boardsource/equals/readme.md | 7 +- keyboards/boardsource/equals/rules.mk | 3 + keyboards/boardsource/equals/ui.c | 39 +++ 20 files changed, 323 insertions(+), 443 deletions(-) delete mode 100644 keyboards/boardsource/equals/48/keymaps/default/rules.mk delete mode 100644 keyboards/boardsource/equals/48/keymaps/default/ui.c delete mode 100644 keyboards/boardsource/equals/60/keymaps/cole/ui.c delete mode 100644 keyboards/boardsource/equals/60/keymaps/default/rules.mk delete mode 100644 keyboards/boardsource/equals/60/keymaps/default/ui.c create mode 100644 keyboards/boardsource/equals/equals.c create mode 100644 keyboards/boardsource/equals/ui.c diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json index 931c8b02005e..8286bc54c04a 100644 --- a/keyboards/boardsource/equals/48/info.json +++ b/keyboards/boardsource/equals/48/info.json @@ -1,122 +1,119 @@ { "keyboard_name": "Equals 48", - "matrix_pins": { - "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], - "rows": ["GP12","GP13","GP16","GP17"] + "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], + "rows": ["GP12", "GP13", "GP16", "GP17"] }, - - - "rgb_matrix": { + "rgb_matrix": { "driver": "WS2812", - "led_count": 70, "max_brightness": 150, "animations": { "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, "band_val": true, - "band_pinwheel_sat":true, - "band_pinwheel_val":true, - "band_spiral_sat":true, - "band_spiral_val":true, - "cycle_all":true, - "cycle_left_right":true, - "cycle_up_down":true, - "rainbow_moving_chevron":true, - "cycle_out_in":true, - "cycle_out_in_dual":true, - "cycle_pinwheel":true, - "cycle_spiral":true, - "dual_beacon":true, - "rainbow_beacon":true, - "rainbow_pinwheels":true, - "raindrops":true, - "jellybean_raindrops":true, - "hue_breathing":true, - "hue_pendulum":true, - "hue_wave":true, - "pixel_rain":true, - "pixel_flow":true, - "pixel_fractal":true, - "typing_heatmap":true, - "digital_rain":true, - "solid_reactive_simple":true, - "solid_reactive":true, - "solid_reactive_wide":true, - "solid_reactive_multiwide":true, - "solid_reactive_cross":true, - "solid_reactive_multicross":true, - "solid_reactive_nexus":true, - "solid_reactive_multinexus":true, - "splash":true, - "multisplash":true, - "solid_splash":true, -"solid_multisplash":true + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true }, "layout": [ - { "flags": 2, "x": 220, "y": 17 }, - { "flags": 2, "x": 172, "y": 17 }, - { "flags": 2, "x": 112, "y": 17 }, - { "flags": 2, "x": 50, "y": 17 }, - { "flags": 2, "x": 4, "y": 17 }, - { "flags": 2, "x": 4, "y": 56 }, - { "flags": 2, "x": 50, "y": 56 }, - { "flags": 2, "x": 112, "y": 56 }, - { "flags": 2, "x": 172, "y": 56 }, - { "flags": 2, "x": 220, "y": 56 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, - { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, - { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, - { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, - { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, - { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, - { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, - { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, - { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, - { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, - { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, - { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, - { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, - { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, - { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, - { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, - { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, - { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, - { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, - { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, - { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, - { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, - { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, - { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, - { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 }, - { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 }, - { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 }, - { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 }, - { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, - { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 }, - { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 }, - { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 }, - { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 }, - { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 }, - { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 } + { "flags": 2, "x": 220, "y": 17 }, + { "flags": 2, "x": 172, "y": 17 }, + { "flags": 2, "x": 112, "y": 17 }, + { "flags": 2, "x": 50, "y": 17 }, + { "flags": 2, "x": 4, "y": 17 }, + { "flags": 2, "x": 4, "y": 56 }, + { "flags": 2, "x": 50, "y": 56 }, + { "flags": 2, "x": 112, "y": 56 }, + { "flags": 2, "x": 172, "y": 56 }, + { "flags": 2, "x": 220, "y": 56 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, + { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, + { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, + { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, + { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, + { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, + { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, + { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, + { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, + { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, + { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, + { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, + { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, + { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, + { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 }, + { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 }, + { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 }, + { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, + { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 }, + { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 }, + { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 }, + { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 }, + { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 }, + { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 } ] - }, + }, + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ @@ -171,4 +168,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/48/keymaps/default/keymap.c b/keyboards/boardsource/equals/48/keymaps/default/keymap.c index 6744262bd63b..92d83bb0e892 100644 --- a/keyboards/boardsource/equals/48/keymaps/default/keymap.c +++ b/keyboards/boardsource/equals/48/keymaps/default/keymap.c @@ -2,43 +2,32 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -enum layers -{ +enum layers { _MAIN, _RAISE, - _LOWER, + _LOWER }; #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) -extern void ui_init(void); -extern void ui_task(void); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT_ortho_4x12( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), [_RAISE] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY)}; - -void keyboard_post_init_user(void) -{ - // Init the display - ui_init(); -} - -void housekeeping_task_user(void) -{ - // Draw the display - ui_task(); -} \ No newline at end of file + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) +}; diff --git a/keyboards/boardsource/equals/48/keymaps/default/rules.mk b/keyboards/boardsource/equals/48/keymaps/default/rules.mk deleted file mode 100644 index ee901c0bee03..000000000000 --- a/keyboards/boardsource/equals/48/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SRC += ui.c \ No newline at end of file diff --git a/keyboards/boardsource/equals/48/keymaps/default/ui.c b/keyboards/boardsource/equals/48/keymaps/default/ui.c deleted file mode 100644 index cf9dd1bf16c9..000000000000 --- a/keyboards/boardsource/equals/48/keymaps/default/ui.c +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2022 @boardsource -// SPDX-License-Identifier: GPL-2.0-or-later -#include -#include QMK_KEYBOARD_H -#include "qp.h" -#include "qp_st7735.h" -#include "graphics/thintel15.qff.c" - -static painter_device_t oled; -static painter_font_handle_t font; -void ui_init(void) -{ - oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); - font = qp_load_font_mem(font_thintel15); - qp_init(oled, QP_ROTATION_0); - qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); - qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); - qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); - qp_flush(oled); -} - -void ui_task(void) -{ - static const char *text = "Layer:"; - int16_t width = qp_textwidth(font, text); - qp_drawtext(oled, 20, 140, font, text); - - switch (get_highest_layer(layer_state)) - { - case 0: - qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); - break; - case 1: - qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); - break; - case 2: - qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); - break; - default: - qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); - break; - } -} \ No newline at end of file diff --git a/keyboards/boardsource/equals/48/keymaps/via/keymap.c b/keyboards/boardsource/equals/48/keymaps/via/keymap.c index 5c3f5c93a1ec..92d83bb0e892 100644 --- a/keyboards/boardsource/equals/48/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/48/keymaps/via/keymap.c @@ -2,11 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -enum layers -{ +enum layers { _MAIN, _RAISE, - _LOWER, + _LOWER }; #define LOWER MO(_LOWER) @@ -17,19 +16,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), [_RAISE] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), - [4] = LAYOUT_ortho_4x12( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) +}; diff --git a/keyboards/boardsource/equals/48/keymaps/via/rules.mk b/keyboards/boardsource/equals/48/keymaps/via/rules.mk index 036bd6d1c3ec..1e5b99807cb7 100644 --- a/keyboards/boardsource/equals/48/keymaps/via/rules.mk +++ b/keyboards/boardsource/equals/48/keymaps/via/rules.mk @@ -1 +1 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json index 62ba7031c17c..f55c5f56114b 100644 --- a/keyboards/boardsource/equals/60/info.json +++ b/keyboards/boardsource/equals/60/info.json @@ -1,133 +1,130 @@ { "keyboard_name": "Equals 60", - "matrix_pins": { - "cols": ["GP0","GP1","GP2","GP3","GP4","GP5","GP6","GP7","GP8","GP9","GP10","GP11"], - "rows": ["GP12","GP13","GP16","GP17","GP18"] + "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], + "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"] }, - - - "rgb_matrix": { + "rgb_matrix": { "driver": "WS2812", - "led_count": 70, "max_brightness": 150, "animations": { "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, "band_val": true, - "band_pinwheel_sat":true, - "band_pinwheel_val":true, - "band_spiral_sat":true, - "band_spiral_val":true, - "cycle_all":true, - "cycle_left_right":true, - "cycle_up_down":true, - "rainbow_moving_chevron":true, - "cycle_out_in":true, - "cycle_out_in_dual":true, - "cycle_pinwheel":true, - "cycle_spiral":true, - "dual_beacon":true, - "rainbow_beacon":true, - "rainbow_pinwheels":true, - "raindrops":true, - "jellybean_raindrops":true, - "hue_breathing":true, - "hue_pendulum":true, - "hue_wave":true, - "pixel_rain":true, - "pixel_flow":true, - "pixel_fractal":true, - "typing_heatmap":true, - "digital_rain":true, - "solid_reactive_simple":true, - "solid_reactive":true, - "solid_reactive_wide":true, - "solid_reactive_multiwide":true, - "solid_reactive_cross":true, - "solid_reactive_multicross":true, - "solid_reactive_nexus":true, - "solid_reactive_multinexus":true, - "splash":true, - "multisplash":true, - "solid_splash":true, -"solid_multisplash":true + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true }, "layout": [ - { "flags": 2, "x": 220, "y": 17 }, - { "flags": 2, "x": 172, "y": 17 }, - { "flags": 2, "x": 112, "y": 17 }, - { "flags": 2, "x": 50, "y": 17 }, - { "flags": 2, "x": 4, "y": 17 }, - { "flags": 2, "x": 4, "y": 56 }, - { "flags": 2, "x": 50, "y": 56 }, - { "flags": 2, "x": 112, "y": 56 }, - { "flags": 2, "x": 172, "y": 56 }, - { "flags": 2, "x": 220, "y": 56 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, - { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, - { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, - { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, - { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, - { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, - { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, - { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, - { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, - { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, - { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, - { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, - { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, - { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, - { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, - { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, - { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, - { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, - { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, - { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, - { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, - { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, - { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, - { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, - { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 }, - { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 }, - { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 }, - { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 }, - { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, - { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 }, - { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 }, - { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 }, - { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 }, - { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 }, - { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }, - { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 }, - { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 }, - { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 }, - { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 }, - { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 }, - { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 }, - { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 }, - { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 }, - { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 }, - { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 }, - { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 } + { "flags": 2, "x": 220, "y": 17 }, + { "flags": 2, "x": 172, "y": 17 }, + { "flags": 2, "x": 112, "y": 17 }, + { "flags": 2, "x": 50, "y": 17 }, + { "flags": 2, "x": 4, "y": 17 }, + { "flags": 2, "x": 4, "y": 56 }, + { "flags": 2, "x": 50, "y": 56 }, + { "flags": 2, "x": 112, "y": 56 }, + { "flags": 2, "x": 172, "y": 56 }, + { "flags": 2, "x": 220, "y": 56 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 }, + { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 }, + { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 }, + { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 }, + { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 }, + { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 }, + { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 }, + { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 }, + { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 }, + { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 }, + { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 }, + { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 }, + { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 }, + { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 }, + { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 }, + { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 }, + { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 }, + { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 }, + { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 }, + { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 }, + { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 }, + { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 }, + { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 }, + { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }, + { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 }, + { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 }, + { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 }, + { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 }, + { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 }, + { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 }, + { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 }, + { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 }, + { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 }, + { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 }, + { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 } ] - }, + }, + "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { "layout": [ @@ -194,4 +191,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/boardsource/equals/60/keymaps/cole/keymap.c b/keyboards/boardsource/equals/60/keymaps/cole/keymap.c index fc20bc2387c3..ce9829af93c8 100644 --- a/keyboards/boardsource/equals/60/keymaps/cole/keymap.c +++ b/keyboards/boardsource/equals/60/keymaps/cole/keymap.c @@ -19,8 +19,6 @@ enum layers #define SHIFT_SLASH MT(MOD_RSFT, KC_SLSH) #define RASE_ENT LT(_RAISE, KC_ENT) #define CTRL_A MT(KC_LGUI, KC_A) -extern void ui_init(void); -extern void ui_task(void); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -55,15 +53,3 @@ combo_t key_combos[COMBO_COUNT] = { COMBO(iu_combo, KC_BSPC), COMBO(kj_combo, KC_COLN), COMBO(er_combo, KC_TAB)}; - -void keyboard_post_init_user(void) -{ - // Init the display - ui_init(); -} - -void housekeeping_task_user(void) -{ - // Draw the display - ui_task(); -} \ No newline at end of file diff --git a/keyboards/boardsource/equals/60/keymaps/cole/ui.c b/keyboards/boardsource/equals/60/keymaps/cole/ui.c deleted file mode 100644 index 26a943d042a1..000000000000 --- a/keyboards/boardsource/equals/60/keymaps/cole/ui.c +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "qp.h" -#include "qp_st7735.h" -#include "graphics/thintel15.qff.c" - -static painter_device_t oled; -static painter_font_handle_t font; -void ui_init(void) -{ - oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); - font = qp_load_font_mem(font_thintel15); - qp_init(oled, QP_ROTATION_0); - qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); - qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); - qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); - qp_flush(oled); -} - -void ui_task(void) -{ - static const char *text = "Layer:"; - int16_t width = qp_textwidth(font, text); - qp_drawtext(oled, 20, 140, font, text); - - switch (get_highest_layer(layer_state)) - { - case 0: - qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); - break; - case 1: - qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); - break; - case 2: - qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); - break; - default: - qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); - break; - } -} diff --git a/keyboards/boardsource/equals/60/keymaps/default/keymap.c b/keyboards/boardsource/equals/60/keymaps/default/keymap.c index ae7f9ab536a0..99a049214b14 100644 --- a/keyboards/boardsource/equals/60/keymaps/default/keymap.c +++ b/keyboards/boardsource/equals/60/keymaps/default/keymap.c @@ -2,17 +2,14 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -enum layers -{ +enum layers { _MAIN, _RAISE, - _LOWER, + _LOWER }; #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) -extern void ui_init(void); -extern void ui_task(void); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT_ortho_5x12( @@ -20,34 +17,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG), + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG + ), [_RAISE] = LAYOUT_ortho_5x12( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), [_LOWER] = LAYOUT_ortho_5x12( 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), - [3] = LAYOUT_ortho_5x12( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; - -void keyboard_post_init_user(void) -{ - // Init the display - ui_init(); -} - -void housekeeping_task_user(void) -{ - // Draw the display - ui_task(); -} + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) +}; diff --git a/keyboards/boardsource/equals/60/keymaps/default/rules.mk b/keyboards/boardsource/equals/60/keymaps/default/rules.mk deleted file mode 100644 index ee901c0bee03..000000000000 --- a/keyboards/boardsource/equals/60/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SRC += ui.c \ No newline at end of file diff --git a/keyboards/boardsource/equals/60/keymaps/default/ui.c b/keyboards/boardsource/equals/60/keymaps/default/ui.c deleted file mode 100644 index 26a943d042a1..000000000000 --- a/keyboards/boardsource/equals/60/keymaps/default/ui.c +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "qp.h" -#include "qp_st7735.h" -#include "graphics/thintel15.qff.c" - -static painter_device_t oled; -static painter_font_handle_t font; -void ui_init(void) -{ - oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); - font = qp_load_font_mem(font_thintel15); - qp_init(oled, QP_ROTATION_0); - qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); - qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); - qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); - qp_flush(oled); -} - -void ui_task(void) -{ - static const char *text = "Layer:"; - int16_t width = qp_textwidth(font, text); - qp_drawtext(oled, 20, 140, font, text); - - switch (get_highest_layer(layer_state)) - { - case 0: - qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); - break; - case 1: - qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); - break; - case 2: - qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); - break; - default: - qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); - break; - } -} diff --git a/keyboards/boardsource/equals/60/keymaps/via/keymap.c b/keyboards/boardsource/equals/60/keymaps/via/keymap.c index ec63d6c0c8b8..54528b8f600e 100644 --- a/keyboards/boardsource/equals/60/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/60/keymaps/via/keymap.c @@ -2,11 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -enum layers -{ +enum layers { _MAIN, _RAISE, - _LOWER, + _LOWER }; #define LOWER MO(_LOWER) @@ -18,22 +17,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), [_RAISE] = LAYOUT_ortho_5x12( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), [_LOWER] = LAYOUT_ortho_5x12( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), - [3] = LAYOUT_ortho_5x12( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) +}; diff --git a/keyboards/boardsource/equals/config.h b/keyboards/boardsource/equals/config.h index b2b14a11a67a..6d38d52702fc 100644 --- a/keyboards/boardsource/equals/config.h +++ b/keyboards/boardsource/equals/config.h @@ -11,7 +11,6 @@ #define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B -// #define AUDIO_CLICKY #define AUDIO_INIT_DELAY 1000 #define STARTUP_SONG SONG(STARTUP_SOUND) diff --git a/keyboards/boardsource/equals/equals.c b/keyboards/boardsource/equals/equals.c new file mode 100644 index 000000000000..f9cc57f123d4 --- /dev/null +++ b/keyboards/boardsource/equals/equals.c @@ -0,0 +1,19 @@ +// Copyright 2023 @boardsource +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" +extern void ui_init(void); +extern void ui_task(void); + +#ifdef QUANTUM_PAINTER_ENABLE +void keyboard_post_init_kb(void) { + // Init the display + ui_init(); + keyboard_post_init_user(); +} + +void housekeeping_task_kb(void) { + // Draw the display + ui_task(); + housekeeping_task_user(); +} +#endif //QUANTUM_PAINTER_ENABLE diff --git a/keyboards/boardsource/equals/graphics/thintel15.qff.c b/keyboards/boardsource/equals/graphics/thintel15.qff.c index b1e510502859..c361ad5346eb 100644 --- a/keyboards/boardsource/equals/graphics/thintel15.qff.c +++ b/keyboards/boardsource/equals/graphics/thintel15.qff.c @@ -2,8 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -const uint32_t font_thintel15_length = 966; - // clang-format off const uint8_t font_thintel15[966] = { 0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0xC6, 0x03, 0x00, 0x00, 0x39, 0xFC, 0xFF, diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json index d9cbcb697afc..7330956d0026 100644 --- a/keyboards/boardsource/equals/info.json +++ b/keyboards/boardsource/equals/info.json @@ -1,6 +1,5 @@ { "manufacturer": "Boardsource", - "keyboard_name": "Equals", "maintainer": "Boardsource", "bootloader": "rp2040", "diode_direction": "COL2ROW", diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index afaad46b0143..4c462eb91b7e 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -8,8 +8,13 @@ Make example for this keyboard (after setting up your build environment): - make boardsource/equals/60:default or make boardsource/equals/48:default + make boardsource/equals/48:default + make boardsource/equals/60:default +Flashing example for this keyboard: + + make boardsource/equals/48:default:flash + make boardsource/equals/60: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). diff --git a/keyboards/boardsource/equals/rules.mk b/keyboards/boardsource/equals/rules.mk index b843ba29b559..75267453f798 100644 --- a/keyboards/boardsource/equals/rules.mk +++ b/keyboards/boardsource/equals/rules.mk @@ -2,3 +2,6 @@ WS2812_DRIVER = vendor AUDIO_DRIVER = pwm_hardware QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7735_spi +ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes) +SRC += ui.c +endif diff --git a/keyboards/boardsource/equals/ui.c b/keyboards/boardsource/equals/ui.c new file mode 100644 index 000000000000..07f7e0773c3a --- /dev/null +++ b/keyboards/boardsource/equals/ui.c @@ -0,0 +1,39 @@ +// Copyright 2023 Cole Smith (@boardsource) +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include "qp.h" +#include "qp_st7735.h" +#include "graphics/thintel15.qff.c" + +static painter_device_t oled; +static painter_font_handle_t font; +void ui_init(void) { + oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); + font = qp_load_font_mem(font_thintel15); + qp_init(oled, QP_ROTATION_0); + qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); + qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); + qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); + qp_flush(oled); +} + +void ui_task(void) { + static const char *text = "Layer:"; + int16_t width = qp_textwidth(font, text); + qp_drawtext(oled, 20, 140, font, text); + + switch (get_highest_layer(layer_state)) { + case 0: + qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); + break; + case 1: + qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); + break; + case 2: + qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); + break; + default: + qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); + break; + } +} From 744a62acd9e53f49a3a1bb778dce9392d225c1ef Mon Sep 17 00:00:00 2001 From: Jack Sangdahl <0x6A73@pm.me> Date: Mon, 24 Apr 2023 13:28:38 -0600 Subject: [PATCH 08/12] cleanup cole keymap --- .../equals/48/keymaps/cole/keymap.c | 14 ------- .../equals/48/keymaps/cole/rules.mk | 3 +- .../boardsource/equals/48/keymaps/cole/ui.c | 42 ------------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 keyboards/boardsource/equals/48/keymaps/cole/ui.c diff --git a/keyboards/boardsource/equals/48/keymaps/cole/keymap.c b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c index d036abdaa0f8..dffb1e07c296 100644 --- a/keyboards/boardsource/equals/48/keymaps/cole/keymap.c +++ b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c @@ -19,8 +19,6 @@ enum layers #define SHIFT_SLASH MT(MOD_RSFT, KC_SLSH) #define RASE_ENT LT(_RAISE, KC_ENT) #define CTRL_A MT(KC_LGUI, KC_A) -extern void ui_init(void); -extern void ui_task(void); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -52,15 +50,3 @@ combo_t key_combos[COMBO_COUNT] = { COMBO(iu_combo, KC_BSPC), COMBO(kj_combo, KC_COLN), COMBO(er_combo, KC_TAB)}; - -void keyboard_post_init_user(void) -{ - // Init the display - ui_init(); -} - -void housekeeping_task_user(void) -{ - // Draw the display - ui_task(); -} \ No newline at end of file diff --git a/keyboards/boardsource/equals/48/keymaps/cole/rules.mk b/keyboards/boardsource/equals/48/keymaps/cole/rules.mk index da8c6345f659..ab1e438182a3 100644 --- a/keyboards/boardsource/equals/48/keymaps/cole/rules.mk +++ b/keyboards/boardsource/equals/48/keymaps/cole/rules.mk @@ -1,2 +1 @@ -SRC += ui.c -COMBO_ENABLE = yes \ No newline at end of file +COMBO_ENABLE = yes diff --git a/keyboards/boardsource/equals/48/keymaps/cole/ui.c b/keyboards/boardsource/equals/48/keymaps/cole/ui.c deleted file mode 100644 index 26a943d042a1..000000000000 --- a/keyboards/boardsource/equals/48/keymaps/cole/ui.c +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "qp.h" -#include "qp_st7735.h" -#include "graphics/thintel15.qff.c" - -static painter_device_t oled; -static painter_font_handle_t font; -void ui_init(void) -{ - oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); - font = qp_load_font_mem(font_thintel15); - qp_init(oled, QP_ROTATION_0); - qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true); - qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true); - qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true); - qp_flush(oled); -} - -void ui_task(void) -{ - static const char *text = "Layer:"; - int16_t width = qp_textwidth(font, text); - qp_drawtext(oled, 20, 140, font, text); - - switch (get_highest_layer(layer_state)) - { - case 0: - qp_drawtext(oled, (20 + width), 140, font, "QWERTY"); - break; - case 1: - qp_drawtext(oled, (20 + width), 140, font, "SYMBOL"); - break; - case 2: - qp_drawtext(oled, (20 + width), 140, font, "NUMBER"); - break; - default: - qp_drawtext(oled, (20 + width), 140, font, "_PANIC_"); - break; - } -} From 7eec131308f7cf960d14cb024a3a6940c81c2e45 Mon Sep 17 00:00:00 2001 From: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Tue, 13 Jun 2023 08:55:49 -0700 Subject: [PATCH 09/12] Update readme.md --- keyboards/boardsource/equals/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index afaad46b0143..521c0a889de5 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -1,6 +1,6 @@ # equals -![equals](imgur.com image replace me!) +![equals](https://i.imgur.com/c3adFqs.jpeg) * Keyboard Maintainer: [Cole Smith](https://github.com/boardsource) * Hardware Supported: Equals PCB w/ RP2040 From c82ad4f8ade7277a5ee7fd2be9e8aa456696c754 Mon Sep 17 00:00:00 2001 From: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Mon, 19 Jun 2023 11:37:59 -0700 Subject: [PATCH 10/12] Update keyboards/boardsource/equals/48/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/boardsource/equals/48/keymaps/via/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/boardsource/equals/48/keymaps/via/keymap.c b/keyboards/boardsource/equals/48/keymaps/via/keymap.c index 5c3f5c93a1ec..8a299c29169c 100644 --- a/keyboards/boardsource/equals/48/keymaps/via/keymap.c +++ b/keyboards/boardsource/equals/48/keymaps/via/keymap.c @@ -28,8 +28,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), - [4] = LAYOUT_ortho_4x12( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; +}; From 82b3692897b10744f5ab07aa9e50678da0067a12 Mon Sep 17 00:00:00 2001 From: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Sun, 9 Jul 2023 08:55:15 -0700 Subject: [PATCH 11/12] Apply suggestions from code review Co-authored-by: Drashna Jaelre --- keyboards/boardsource/equals/48/keymaps/cole/keymap.c | 2 +- keyboards/boardsource/equals/60/keymaps/cole/keymap.c | 2 +- keyboards/boardsource/equals/config.h | 4 ++-- keyboards/boardsource/equals/readme.md | 2 +- keyboards/boardsource/equals/ui.c | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/keyboards/boardsource/equals/48/keymaps/cole/keymap.c b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c index dffb1e07c296..3d1b6b871b49 100644 --- a/keyboards/boardsource/equals/48/keymaps/cole/keymap.c +++ b/keyboards/boardsource/equals/48/keymaps/cole/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM iu_combo[] = {KC_I, KC_U, COMBO_END}; const uint16_t PROGMEM kj_combo[] = {KC_K, KC_J, COMBO_END}; const uint16_t PROGMEM er_combo[] = {KC_E, KC_R, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(we_combo, KC_ESC), COMBO(iu_combo, KC_BSPC), COMBO(kj_combo, KC_COLN), diff --git a/keyboards/boardsource/equals/60/keymaps/cole/keymap.c b/keyboards/boardsource/equals/60/keymaps/cole/keymap.c index ce9829af93c8..c34429209b23 100644 --- a/keyboards/boardsource/equals/60/keymaps/cole/keymap.c +++ b/keyboards/boardsource/equals/60/keymaps/cole/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM iu_combo[] = {KC_I, KC_U, COMBO_END}; const uint16_t PROGMEM kj_combo[] = {KC_K, KC_J, COMBO_END}; const uint16_t PROGMEM er_combo[] = {KC_E, KC_R, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(we_combo, KC_ESC), COMBO(iu_combo, KC_BSPC), COMBO(kj_combo, KC_COLN), diff --git a/keyboards/boardsource/equals/config.h b/keyboards/boardsource/equals/config.h index 6d38d52702fc..7897e178b36e 100644 --- a/keyboards/boardsource/equals/config.h +++ b/keyboards/boardsource/equals/config.h @@ -5,13 +5,13 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U #define RGB_MATRIX_LED_COUNT 70 -#define RGB_DI_PIN GP21 +#define WS2812_DI_PIN GP21 #define AUDIO_PIN GP29 #define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B -#define AUDIO_INIT_DELAY 1000 +#define AUDIO_INIT_DELAY #define STARTUP_SONG SONG(STARTUP_SOUND) // SPI Configuration diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md index 403141219746..4f6fab92b124 100644 --- a/keyboards/boardsource/equals/readme.md +++ b/keyboards/boardsource/equals/readme.md @@ -1,6 +1,6 @@ # equals -![equals](https://i.imgur.com/c3adFqs.jpeg) +![equals](https://i.imgur.com/c3adFqsh.jpeg) * Keyboard Maintainer: [Cole Smith](https://github.com/boardsource) * Hardware Supported: Equals PCB w/ RP2040 diff --git a/keyboards/boardsource/equals/ui.c b/keyboards/boardsource/equals/ui.c index 07f7e0773c3a..f953fc4c8896 100644 --- a/keyboards/boardsource/equals/ui.c +++ b/keyboards/boardsource/equals/ui.c @@ -7,7 +7,8 @@ static painter_device_t oled; static painter_font_handle_t font; -void ui_init(void) { + +__attribute__((weak)) void ui_init(void) { oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0); font = qp_load_font_mem(font_thintel15); qp_init(oled, QP_ROTATION_0); @@ -17,7 +18,7 @@ void ui_init(void) { qp_flush(oled); } -void ui_task(void) { +__attribute__((weak)) void ui_task(void) { static const char *text = "Layer:"; int16_t width = qp_textwidth(font, text); qp_drawtext(oled, 20, 140, font, text); From 92f38a538251c10104ee48403a7d084fa37bb2e8 Mon Sep 17 00:00:00 2001 From: Cole Smith Date: Sun, 9 Jul 2023 09:02:17 -0700 Subject: [PATCH 12/12] removed unneeded files --- keyboards/boardsource/equals/48/keymaps/cole/config.h | 3 --- keyboards/boardsource/equals/60/keymaps/cole/config.h | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 keyboards/boardsource/equals/48/keymaps/cole/config.h delete mode 100644 keyboards/boardsource/equals/60/keymaps/cole/config.h diff --git a/keyboards/boardsource/equals/48/keymaps/cole/config.h b/keyboards/boardsource/equals/48/keymaps/cole/config.h deleted file mode 100644 index bd8815c56aa5..000000000000 --- a/keyboards/boardsource/equals/48/keymaps/cole/config.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#define COMBO_COUNT 4 diff --git a/keyboards/boardsource/equals/60/keymaps/cole/config.h b/keyboards/boardsource/equals/60/keymaps/cole/config.h deleted file mode 100644 index bd8815c56aa5..000000000000 --- a/keyboards/boardsource/equals/60/keymaps/cole/config.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#define COMBO_COUNT 4