From 7602515023ebbd81ffdc1ac6754f71316de1d683 Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Sun, 4 Sep 2022 02:54:54 +0100
Subject: [PATCH 1/8] Initial code for tetromino with custom indicators
---
data/mappings/info_rules.json | 2 +-
keyboards/an_achronism/tetromino/README.md | 42 ++++
keyboards/an_achronism/tetromino/config.h | 24 +++
keyboards/an_achronism/tetromino/info.json | 183 ++++++++++++++++++
.../tetromino/keymaps/default/keymap.c | 38 ++++
.../tetromino/keymaps/rgb/config.h | 16 ++
.../tetromino/keymaps/rgb/keymap.c | 100 ++++++++++
keyboards/an_achronism/tetromino/rules.mk | 6 +
8 files changed, 410 insertions(+), 1 deletion(-)
create mode 100644 keyboards/an_achronism/tetromino/README.md
create mode 100644 keyboards/an_achronism/tetromino/config.h
create mode 100644 keyboards/an_achronism/tetromino/info.json
create mode 100644 keyboards/an_achronism/tetromino/keymaps/default/keymap.c
create mode 100644 keyboards/an_achronism/tetromino/keymaps/rgb/config.h
create mode 100644 keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c
create mode 100644 keyboards/an_achronism/tetromino/rules.mk
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 3f140277fea1..82ea98399b86 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -20,12 +20,12 @@
"MOUSE_SHARED_EP": {"info_key": "usb.shared_endpoint.mouse", "value_type": "bool"},
"LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
"LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
- "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
"LTO_ENABLE": {"info_key": "build.lto", "value_type": "bool"},
"MCU": {"info_key": "processor", "warn_duplicate": false},
"MOUSEKEY_ENABLE": {"info_key": "mouse_key.enabled", "value_type": "bool"},
"NO_USB_STARTUP_CHECK": {"info_key": "usb.no_startup_check", "value_type": "bool"},
"PIN_COMPATIBLE": {"info_key": "pin_compatible"},
+ "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
"SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
"SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
"SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
diff --git a/keyboards/an_achronism/tetromino/README.md b/keyboards/an_achronism/tetromino/README.md
new file mode 100644
index 000000000000..70cc5222cbf9
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/README.md
@@ -0,0 +1,42 @@
+# tetromino
+
+
+* Keyboard Maintainer: [an_achronism](https://github.com/an-achronism)
+* Hardware Availability: Currently in prototyping stage, so only via [Discord](https://discord.gg/8hpygm4PgW)
+
+This project started for one reason alone: I suspected that I would hate typing on an ortholinear keyboard and wanted to find out if I was correct.
+
+It ended up turning into something a little more interesting, at least from my perspective. Much of this was driven by my general dissatisfaction with how RGB LEDs tend to be used in keyboards. I'd been talking for quite some time about how I'd like to build RGB behaviours into my keyboards that had a purely functional purpose, rather than existing mostly to look cool. Specifically, I wanted to represent layer and lock statuses in a way I've never seen anybody else do. For instance, turning on Caps Lock would not switch on a single Caps Lock indicator LED, but rather light up all of the keys that would behave differently because of Caps Lock being switched on, meaning A-Z but nothing else. The other indicators (Num and Scroll Lock) would do something very similar. Activating a custom keymap layer would also light up only the keys that were mapped differently on that layer compared to the base layer.
+
+I managed to implement a custom function to achieve exactly the desired RGB LED functionality, but for reasons that mostly have to do with following general QMK guidelines, this (relatively large) custom function is not included in the default keymap. If you want it, flash the "rgb" keymap instead.
+
+## Compiling the firmware
+
+You'll first need to set up a build environment for QMK (see below). Once you've done that, you can run a `make` for the keymap of your choice.
+
+The default keymap does NOT have my preferred custom RGB behaviour in it, in the interests of keeping with QMK repository's preference of keeping the default keymap as straightforward as possible (the custom RGB function is relatively large). If you don't care about having that, you can just do this:
+
+ make tetromino:default
+
+If however you do want my custom RGB matrix behaviour, do this:
+
+ make tetromino:rgb
+
+This will give you the RGB behaviour described in the section above.
+
+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).
+
+## Entering the bootloader
+
+You'll need to do this to flash or reflash the firmware. You can enter the bootloader in a number of different ways:
+
+* **Physical reset button**: If you have a reset button soldered on, and the keyboard is fully assembled, you should be able to reach into the hole in the underside of the case while the keyboard is connected and double-press the reset button (push it twice in quick succession). Only pressing it once will reset the microcontroller, but won't put it into bootloader mode.
+* **Physical BOOTSEL button**: Regardless of whether you have a reset button soldered into place, there is a BOOTSEL button included onboard the Raspberry Pi Pico that hosts the microcontroller. With the keyboard disconnected, press and hold down the BOOTSEL button and connect the keyboard, then release BOOTSEL.
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard (similar to the BOOTSEL method above).
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available in your keymap.
+
+Once that's done, you should see a USB mass storage device appear in your operating system pertaining to the RP2040's bootloader. This indicates that the MCU is ready to flash a firmware of your choice.
+
+## Flashing the firmware
+
+The RP2040 MCU comes preflashed with a UF2 bootloader which, once activated by one of the methods above, allows the user to flash a firmware by simply dragging and dropping the firmware file into the USB mass storage device that appears in the OS. In this case, drag and drop the .uf2 file for your corresponding QMK firmware (compiled previously as per instructions above) into the relevant USB device and the firmware should flash, then the keyboard will immediately restart with the firmware on it, ready to use. Happy typing!
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
new file mode 100644
index 000000000000..61443c5030ea
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -0,0 +1,24 @@
+// Copyright 2022 an_achronism (@an-achronism)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define WS2812_PIO_USE_PIO1 // Use PIO1 on Pi Pico for RGB LEDs
+#define RGB_DI_PIN GP26 // Use GPIO26 (pin 31) for LED matrix logic
+#define DRIVER_LED_TOTAL 70
+/* This next one is now specified in info.json under the rgblight struct,
+so has been moved there instead: */
+// #define RGBLED_NUM 70
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+/* 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
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
new file mode 100644
index 000000000000..1eab904116cf
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -0,0 +1,183 @@
+{
+ "manufacturer": "an_achronism",
+ "keyboard_name": "tetromino",
+ "maintainer": "an-achronism",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "url": "https://github.com/an-achronism/tetromino",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x3435",
+ "vid": "0x4161"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": false,
+ "rgb_matrix": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6",
+ "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"],
+ "rows": ["GP16", "GP17", "GP18", "GP19", "GP20"]
+ },
+ "layouts": {
+ "LAYOUT_ortho_5x14": {
+ "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": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "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": [1, 12], "x": 12, "y": 1 },
+ { "matrix": [1, 13], "x": 13, "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": [2, 12], "x": 12, "y": 2 },
+ { "matrix": [2, 13], "x": 13, "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": [3, 12], "x": 12, "y": 3 },
+ { "matrix": [3, 13], "x": 13, "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 },
+ { "matrix": [4, 12], "x": 12, "y": 4 },
+ { "matrix": [4, 13], "x": 13, "y": 4 }
+ ]
+ }
+ },
+ "rgblight": {
+ "led_count": 70
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 },
+ { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 },
+ { "flags": 4, "matrix": [0, 3], "x": 52, "y": 0 },
+ { "flags": 4, "matrix": [0, 4], "x": 69, "y": 0 },
+ { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 },
+ { "flags": 4, "matrix": [0, 6], "x": 103, "y": 0 },
+ { "flags": 4, "matrix": [0, 7], "x": 121, "y": 0 },
+ { "flags": 4, "matrix": [0, 8], "x": 138, "y": 0 },
+ { "flags": 4, "matrix": [0, 9], "x": 155, "y": 0 },
+ { "flags": 4, "matrix": [0, 10], "x": 172, "y": 0 },
+ { "flags": 4, "matrix": [0, 11], "x": 190, "y": 0 },
+ { "flags": 4, "matrix": [0, 12], "x": 207, "y": 0 },
+ { "flags": 4, "matrix": [0, 13], "x": 224, "y": 0 },
+ { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 },
+ { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 },
+ { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 },
+ { "flags": 4, "matrix": [1, 3], "x": 52, "y": 16 },
+ { "flags": 4, "matrix": [1, 4], "x": 69, "y": 16 },
+ { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 },
+ { "flags": 4, "matrix": [1, 6], "x": 103, "y": 16 },
+ { "flags": 4, "matrix": [1, 7], "x": 121, "y": 16 },
+ { "flags": 4, "matrix": [1, 8], "x": 138, "y": 16 },
+ { "flags": 4, "matrix": [1, 9], "x": 155, "y": 16 },
+ { "flags": 4, "matrix": [1, 10], "x": 172, "y": 16 },
+ { "flags": 4, "matrix": [1, 11], "x": 190, "y": 16 },
+ { "flags": 4, "matrix": [1, 12], "x": 207, "y": 16 },
+ { "flags": 4, "matrix": [1, 13], "x": 224, "y": 16 },
+ { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 },
+ { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 },
+ { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 },
+ { "flags": 4, "matrix": [2, 3], "x": 52, "y": 32 },
+ { "flags": 4, "matrix": [2, 4], "x": 69, "y": 32 },
+ { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 },
+ { "flags": 4, "matrix": [2, 6], "x": 103, "y": 32 },
+ { "flags": 4, "matrix": [2, 7], "x": 121, "y": 32 },
+ { "flags": 4, "matrix": [2, 8], "x": 138, "y": 32 },
+ { "flags": 4, "matrix": [2, 9], "x": 155, "y": 32 },
+ { "flags": 4, "matrix": [2, 10], "x": 172, "y": 32 },
+ { "flags": 4, "matrix": [2, 11], "x": 190, "y": 32 },
+ { "flags": 4, "matrix": [2, 12], "x": 207, "y": 32 },
+ { "flags": 4, "matrix": [2, 13], "x": 224, "y": 32 },
+ { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 },
+ { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 },
+ { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 },
+ { "flags": 4, "matrix": [3, 3], "x": 52, "y": 48 },
+ { "flags": 4, "matrix": [3, 4], "x": 69, "y": 48 },
+ { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 },
+ { "flags": 4, "matrix": [3, 6], "x": 103, "y": 48 },
+ { "flags": 4, "matrix": [3, 7], "x": 121, "y": 48 },
+ { "flags": 4, "matrix": [3, 8], "x": 138, "y": 48 },
+ { "flags": 4, "matrix": [3, 9], "x": 155, "y": 48 },
+ { "flags": 4, "matrix": [3, 10], "x": 172, "y": 48 },
+ { "flags": 4, "matrix": [3, 11], "x": 190, "y": 48 },
+ { "flags": 4, "matrix": [3, 12], "x": 207, "y": 48 },
+ { "flags": 4, "matrix": [3, 13], "x": 224, "y": 48 },
+ { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 },
+ { "flags": 4, "matrix": [4, 1], "x": 17, "y": 64 },
+ { "flags": 4, "matrix": [4, 2], "x": 34, "y": 64 },
+ { "flags": 4, "matrix": [4, 3], "x": 52, "y": 64 },
+ { "flags": 4, "matrix": [4, 4], "x": 69, "y": 64 },
+ { "flags": 4, "matrix": [4, 5], "x": 86, "y": 64 },
+ { "flags": 4, "matrix": [4, 6], "x": 103, "y": 64 },
+ { "flags": 4, "matrix": [4, 7], "x": 121, "y": 64 },
+ { "flags": 4, "matrix": [4, 8], "x": 138, "y": 64 },
+ { "flags": 4, "matrix": [4, 9], "x": 155, "y": 64 },
+ { "flags": 4, "matrix": [4, 10], "x": 172, "y": 64 },
+ { "flags": 4, "matrix": [4, 11], "x": 190, "y": 64 },
+ { "flags": 4, "matrix": [4, 12], "x": 207, "y": 64 },
+ { "flags": 4, "matrix": [4, 13], "x": 224, "y": 64 }
+ ]
+ }
+}
diff --git a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a621e3eec1d4
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Del│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Tab| Q │ W │ E | R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bsp│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Ctl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │UK#│Rtn|
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Sft│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Sft│ ↑ │App|
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Esc│Ctl│Alt│GUI│L_1│Spc│L_2|GUI│Alt│Ctl|UK\│ ← │ ↓ │ → │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ */
+ [0] = LAYOUT_ortho_5x14(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+ KC_ESC, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_ortho_5x14(
+ KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, _______, _______, _______, KC_PWR,
+ _______, _______, KC_UP, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_PAUS, KC_ESC, _______, KC_SLEP,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, KC_CALC,
+ KC_CAPS, _______, _______, _______, _______, KC_PAUS, KC_P1, KC_P2, KC_P3, KC_PENT, _______, KC_CAPS, _______, _______,
+ _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT_ortho_5x14(
+ _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,
+ _______, KC_F4, KC_F3, KC_F2, KC_F1, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
+ _______, KC_F8, KC_F7, KC_F6, KC_F5, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
+ KC_CAPS, KC_F12, KC_F11, KC_F10, KC_F9, C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/an_achronism/tetromino/keymaps/rgb/config.h b/keyboards/an_achronism/tetromino/keymaps/rgb/config.h
new file mode 100644
index 000000000000..9fec381c591a
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/rgb/config.h
@@ -0,0 +1,16 @@
+// Copyright 2022 an_achronism (@an-achronism)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define RGB_TRIGGER_ON_KEYDOWN
+
+/* 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
diff --git a/keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c b/keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c
new file mode 100644
index 000000000000..bace02477741
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c
@@ -0,0 +1,100 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Del│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Tab| Q │ W │ E | R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bsp│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Ctl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │UK#│Rtn|
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Sft│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Sft│ ↑ │App|
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Esc│Ctl│Alt│GUI│L_1│Spc│L_2|GUI│Alt│Ctl|UK\│ ← │ ↓ │ → │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ */
+ [0] = LAYOUT_ortho_5x14(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+ KC_ESC, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_ortho_5x14(
+ KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, _______, _______, _______, KC_PWR,
+ _______, _______, KC_UP, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_PAUS, KC_ESC, _______, KC_SLEP,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, KC_CALC,
+ KC_CAPS, _______, _______, _______, _______, KC_PAUS, KC_P1, KC_P2, KC_P3, KC_PENT, _______, KC_CAPS, _______, _______,
+ _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT_ortho_5x14(
+ _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,
+ _______, KC_F4, KC_F3, KC_F2, KC_F1, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
+ _______, KC_F8, KC_F7, KC_F6, KC_F5, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
+ KC_CAPS, KC_F12, KC_F11, KC_F10, KC_F9, C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
+
+// Initialise RBG matrix with all LEDs set to solid colour and zero HSV (i.e. off):
+void keyboard_post_init_user(void) {
+ rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+ rgb_matrix_sethsv_noeeprom(HSV_OFF);
+};
+
+// Custom RGB indicator behaviour:
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+ uint8_t led_processed_count = 0;
+ for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
+ for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
+ if (led_processed_count == RGB_MATRIX_LED_PROCESS_LIMIT){
+ return;
+ }
+ uint8_t led_index = g_led_config.matrix_co[row][col];
+ uint16_t keycode = keymap_key_to_keycode(0, (keypos_t){col,row});
+ if (led_index >= led_min && led_index <= led_max && led_index != NO_LED) {
+ // Light base layer arrow keys orange if Scroll Lock is on, otherwise light them magenta:
+ led_processed_count++;
+ if (keycode >= KC_RIGHT && keycode <= KC_UP) {
+ if (host_keyboard_led_state().scroll_lock) {
+ rgb_matrix_set_color(led_index, RGB_ORANGE);
+ } else {
+ rgb_matrix_set_color(led_index, RGB_MAGENTA);
+ }
+ }
+ // Light alpha keys (A-Z only) red if Caps Lock is on:
+ if (host_keyboard_led_state().caps_lock && keycode >= KC_A && keycode <= KC_Z) {
+ rgb_matrix_set_color(led_index, RGB_RED);
+ }
+ // Whenever a layer above base is active, recolour only the keys that are different on that layer:
+ if (get_highest_layer(layer_state) > 0) {
+ uint8_t layer = get_highest_layer(layer_state);
+ uint16_t momentary_keycode = keymap_key_to_keycode(layer, (keypos_t){col,row});
+ if (momentary_keycode > KC_TRNS) {
+ switch(layer) {
+ case 2:
+ // The uppermost layer is blue:
+ rgb_matrix_set_color(led_index, RGB_BLUE);
+ break;
+ case 1:
+ // The middle layer is green, except that the numpad section turns
+ // orange when Num Lock is on:
+ if (host_keyboard_led_state().num_lock &&
+ (momentary_keycode == KC_KP_EQUAL ||
+ (momentary_keycode >= KC_NUM_LOCK && momentary_keycode <= KC_KP_DOT)
+ )) {
+ rgb_matrix_set_color(led_index, RGB_ORANGE);
+ } else {
+ rgb_matrix_set_color(led_index, RGB_GREEN);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
new file mode 100644
index 000000000000..746568214b73
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/rules.mk
@@ -0,0 +1,6 @@
+# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
+WS2812_DRIVER = vendor
+
+# These two lines are now specified in info.json, so have been moved to there:
+# RGB_MATRIX_ENABLE = yes
+# RGB_MATRIX_DRIVER = WS2812
From 757ac0abda9e0a8843165d22d542ae34bfe55834 Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Mon, 12 Sep 2022 06:01:34 +0100
Subject: [PATCH 2/8] Proto Tetromino tested, working
---
keyboards/an_achronism/tetromino/README.md | 4 ++--
keyboards/an_achronism/tetromino/config.h | 2 +-
.../an_achronism/tetromino/keymaps/default/keymap.c | 9 ++++++++-
.../tetromino/keymaps/{rgb => indicators}/config.h | 0
.../tetromino/keymaps/{rgb => indicators}/keymap.c | 9 ++++++++-
5 files changed, 19 insertions(+), 5 deletions(-)
rename keyboards/an_achronism/tetromino/keymaps/{rgb => indicators}/config.h (100%)
rename keyboards/an_achronism/tetromino/keymaps/{rgb => indicators}/keymap.c (89%)
diff --git a/keyboards/an_achronism/tetromino/README.md b/keyboards/an_achronism/tetromino/README.md
index 70cc5222cbf9..0fae9a821d95 100644
--- a/keyboards/an_achronism/tetromino/README.md
+++ b/keyboards/an_achronism/tetromino/README.md
@@ -8,7 +8,7 @@ This project started for one reason alone: I suspected that I would hate typing
It ended up turning into something a little more interesting, at least from my perspective. Much of this was driven by my general dissatisfaction with how RGB LEDs tend to be used in keyboards. I'd been talking for quite some time about how I'd like to build RGB behaviours into my keyboards that had a purely functional purpose, rather than existing mostly to look cool. Specifically, I wanted to represent layer and lock statuses in a way I've never seen anybody else do. For instance, turning on Caps Lock would not switch on a single Caps Lock indicator LED, but rather light up all of the keys that would behave differently because of Caps Lock being switched on, meaning A-Z but nothing else. The other indicators (Num and Scroll Lock) would do something very similar. Activating a custom keymap layer would also light up only the keys that were mapped differently on that layer compared to the base layer.
-I managed to implement a custom function to achieve exactly the desired RGB LED functionality, but for reasons that mostly have to do with following general QMK guidelines, this (relatively large) custom function is not included in the default keymap. If you want it, flash the "rgb" keymap instead.
+I managed to implement a custom function to achieve exactly the desired RGB LED functionality, but for reasons that mostly have to do with following general QMK guidelines, this (relatively large) custom function is not included in the default keymap. If you want it, flash the "indicators" keymap instead.
## Compiling the firmware
@@ -20,7 +20,7 @@ The default keymap does NOT have my preferred custom RGB behaviour in it, in the
If however you do want my custom RGB matrix behaviour, do this:
- make tetromino:rgb
+ make tetromino:indicators
This will give you the RGB behaviour described in the section above.
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index 61443c5030ea..34ec0ab70c2d 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -6,7 +6,7 @@
#define WS2812_PIO_USE_PIO1 // Use PIO1 on Pi Pico for RGB LEDs
#define RGB_DI_PIN GP26 // Use GPIO26 (pin 31) for LED matrix logic
#define DRIVER_LED_TOTAL 70
-/* This next one is now specified in info.json under the rgblight struct,
+/* The following line is now specified in info.json under the rgblight struct,
so has been moved there instead: */
// #define RGBLED_NUM 70
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
index a621e3eec1d4..1e612fb92be3 100644
--- a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
KC_ESC, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_ortho_5x14(
@@ -33,6 +33,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F4, KC_F3, KC_F2, KC_F1, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
_______, KC_F8, KC_F7, KC_F6, KC_F5, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
KC_CAPS, KC_F12, KC_F11, KC_F10, KC_F9, C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+ _______, _______, _______, _______, MO(3), _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT_ortho_5x14(
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/an_achronism/tetromino/keymaps/rgb/config.h b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
similarity index 100%
rename from keyboards/an_achronism/tetromino/keymaps/rgb/config.h
rename to keyboards/an_achronism/tetromino/keymaps/indicators/config.h
diff --git a/keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
similarity index 89%
rename from keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c
rename to keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
index bace02477741..06d60d85cdfb 100644
--- a/keyboards/an_achronism/tetromino/keymaps/rgb/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
KC_ESC, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_ortho_5x14(
@@ -33,6 +33,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F4, KC_F3, KC_F2, KC_F1, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
_______, KC_F8, KC_F7, KC_F6, KC_F5, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
KC_CAPS, KC_F12, KC_F11, KC_F10, KC_F9, C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+ _______, _______, _______, _______, MO(3), _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT_ortho_5x14(
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
From d664c5a0983d489eb236e0ad3e33522b214f849e Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:02:01 +0100
Subject: [PATCH 3/8] Copyright and licence headers added (whoops)
---
keyboards/an_achronism/tetromino/config.h | 18 ++++++++++++++++--
.../tetromino/keymaps/default/keymap.c | 17 +++++++++++++++++
.../tetromino/keymaps/indicators/config.h | 18 ++++++++++++++++--
.../tetromino/keymaps/indicators/keymap.c | 17 +++++++++++++++++
4 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index 34ec0ab70c2d..1d452af9a7b3 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -1,5 +1,19 @@
-// Copyright 2022 an_achronism (@an-achronism)
-// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
#pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
index 1e612fb92be3..f9a51fef240d 100644
--- a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
@@ -1,3 +1,20 @@
+/*
+Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/config.h b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
index 9fec381c591a..f117063fb1a5 100644
--- a/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
@@ -1,5 +1,19 @@
-// Copyright 2022 an_achronism (@an-achronism)
-// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
#pragma once
#define RGB_TRIGGER_ON_KEYDOWN
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
index 06d60d85cdfb..8f56c41be603 100644
--- a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
@@ -1,3 +1,20 @@
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
From ee9833beb3ecb474f6296c45b6f23c305f9cee83 Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:04:01 +0100
Subject: [PATCH 4/8] One of the headers was inconsistent with the rest, fixed
now
---
keyboards/an_achronism/tetromino/keymaps/default/keymap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
index f9a51fef240d..4f47154c6970 100644
--- a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
/*
-Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
+Copyright 2022 an_achronism (@an-achronism)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
From 6e9afde5e9d1f4f902a741038dff512184617dbc Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:15:35 +0100
Subject: [PATCH 5/8] Let Pico use PIO0
---
keyboards/an_achronism/tetromino/config.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index 1d452af9a7b3..0042ae829ac1 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -17,12 +17,10 @@ along with this program. If not, see .
#pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define WS2812_PIO_USE_PIO1 // Use PIO1 on Pi Pico for RGB LEDs
+// #define WS2812_PIO_USE_PIO1 // This appears to be optional and not required
#define RGB_DI_PIN GP26 // Use GPIO26 (pin 31) for LED matrix logic
#define DRIVER_LED_TOTAL 70
-/* The following line is now specified in info.json under the rgblight struct,
-so has been moved there instead: */
-// #define RGBLED_NUM 70
+// #define RGBLED_NUM 70 // Moved to info.json, under rgblight
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
From fb37f92c5efc77de12e433f4d4eb71afb4e6eec1 Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:24:46 +0100
Subject: [PATCH 6/8] Reverting alphabetical sort of 1 line in info.json for PR
compartmentalisation
---
data/mappings/info_rules.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 6c71d06f2d89..a4da10fd312c 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -20,12 +20,12 @@
"MOUSE_SHARED_EP": {"info_key": "usb.shared_endpoint.mouse", "value_type": "bool"},
"LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
"LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
+ "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
"LTO_ENABLE": {"info_key": "build.lto", "value_type": "bool"},
"MCU": {"info_key": "processor", "warn_duplicate": false},
"MOUSEKEY_ENABLE": {"info_key": "mouse_key.enabled", "value_type": "bool"},
"NO_USB_STARTUP_CHECK": {"info_key": "usb.no_startup_check", "value_type": "bool"},
"PIN_COMPATIBLE": {"info_key": "pin_compatible"},
- "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
"SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
"SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
"SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
From b2287c87fc1fb3be1924ab49e94391beaaf39b1c Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Fri, 16 Sep 2022 16:14:22 +0100
Subject: [PATCH 7/8] More config moved to info.json
---
keyboards/an_achronism/tetromino/config.h | 5 -----
keyboards/an_achronism/tetromino/info.json | 3 ++-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index 0042ae829ac1..6208224465de 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -17,12 +17,7 @@ along with this program. If not, see .
#pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-// #define WS2812_PIO_USE_PIO1 // This appears to be optional and not required
-#define RGB_DI_PIN GP26 // Use GPIO26 (pin 31) for LED matrix logic
#define DRIVER_LED_TOTAL 70
-// #define RGBLED_NUM 70 // Moved to info.json, under rgblight
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
/* disable debug print */
//#define NO_DEBUG
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
index 1eab904116cf..b8aae9d201ed 100644
--- a/keyboards/an_achronism/tetromino/info.json
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -103,7 +103,8 @@
}
},
"rgblight": {
- "led_count": 70
+ "led_count": 70,
+ "pin": "GP26"
},
"rgb_matrix": {
"driver": "WS2812",
From 62ffaee8c3ca921a46b1c02e3b4770297732fbca Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Fri, 16 Sep 2022 16:39:53 +0100
Subject: [PATCH 8/8] rules.mk comments removed
---
keyboards/an_achronism/tetromino/rules.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
index 746568214b73..ff20f6e38e43 100644
--- a/keyboards/an_achronism/tetromino/rules.mk
+++ b/keyboards/an_achronism/tetromino/rules.mk
@@ -1,6 +1,2 @@
# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
WS2812_DRIVER = vendor
-
-# These two lines are now specified in info.json, so have been moved to there:
-# RGB_MATRIX_ENABLE = yes
-# RGB_MATRIX_DRIVER = WS2812