From 397ac154b7b89caf4a3339089f553d4146ffdfd6 Mon Sep 17 00:00:00 2001 From: Marek128b Date: Fri, 27 Oct 2023 07:51:45 +0200 Subject: [PATCH 01/42] added ergosplit44 keybord v1 --- .../handwired/marek128b/ergosplit44/config.h | 32 ++++ .../handwired/marek128b/ergosplit44/info.json | 171 ++++++++++++++++++ .../ergosplit44/keymaps/default/keymap.c | 55 ++++++ .../ergosplit44/keymaps/default/rgb.c | 33 ++++ .../handwired/marek128b/ergosplit44/readme.md | 27 +++ .../handwired/marek128b/ergosplit44/rules.mk | 1 + 6 files changed, 319 insertions(+) create mode 100644 keyboards/handwired/marek128b/ergosplit44/config.h create mode 100644 keyboards/handwired/marek128b/ergosplit44/info.json create mode 100644 keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c create mode 100644 keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c create mode 100644 keyboards/handwired/marek128b/ergosplit44/readme.md create mode 100644 keyboards/handwired/marek128b/ergosplit44/rules.mk diff --git a/keyboards/handwired/marek128b/ergosplit44/config.h b/keyboards/handwired/marek128b/ergosplit44/config.h new file mode 100644 index 000000000000..648bbd7ccb43 --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/config.h @@ -0,0 +1,32 @@ +// Copyright 2023 Marek128b (@Marek128b) +// 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 + + +//define rgb for ws2812b - 2020 leds +//#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB + +//vial | get the uid: python3 util/vial_generate_keyboard_uid.py +#define VIAL_KEYBOARD_UID {0x5F, 0x97, 0x91, 0x98, 0xCB, 0x9F, 0x51, 0xCD} +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {0, 1} + +//layer count +#define DYNAMIC_KEYMAP_LAYER_COUNT 5 \ No newline at end of file diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json new file mode 100644 index 000000000000..b6b82bf99a6a --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -0,0 +1,171 @@ +{ + "manufacturer": "Marek128b", + "keyboard_name": "ergosplit44", + "maintainer": "Marek128b", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + //cols: 12 + //rows: 4 + "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP17", "GP18"], + "rows": ["GP2", "GP3", "GP4", "GP5"] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4D41" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP26" + }, + "rgb_matrix": { + "driver": "ws2812", + "max_brightness": 25, + "animations": { + "breathing": 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, + "raindrops": true, + "typing_heatmap": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "multisplash": true + }, + "layout":[ + // Row 1 + {"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}, + + // Row 2 + {"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}, + + // Row 3 + {"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}, + + // Row 4 + {"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} + ] + }, + "layouts": { + "LAYOUT": { + "layout":[ //https://qmk.fm/converter/ + //row 1 + {"label":"tab", "matrix": [0, 0],"x":0, "y":1.25}, + {"label":"Q", "matrix": [0, 1],"x":1, "y":1.25}, + {"label":"W", "matrix": [0, 2],"x":2, "y":0.75}, + {"label":"E", "matrix": [0, 3],"x":3, "y":0.5}, + {"label":"R", "matrix": [0, 4],"x":4, "y":0.75}, + {"label":"T", "matrix": [0, 5],"x":5, "y":1}, + + {"label":"Y", "matrix": [0, 6],"x":9.75, "y":1}, + {"label":"U", "matrix": [0, 7],"x":10.75, "y":0.75}, + {"label":"I", "matrix": [0, 8],"x":11.75, "y":0.5}, + {"label":"O", "matrix": [0, 9],"x":12.75, "y":0.75}, + {"label":"P", "matrix": [0, 10],"x":13.75, "y":1.25}, + {"label":"\u00dc", "matrix": [0, 11],"x":14.75, "y":1.25}, + + //row 2 + {"label":"back-space", "matrix": [1, 0],"x":0, "y":2.25}, + {"label":"A", "matrix": [1, 1],"x":1, "y":2.25}, + {"label":"S", "matrix": [1, 2],"x":2, "y":1.75}, + {"label":"D", "matrix": [1, 3],"x":3, "y":1.5}, + {"label":"F", "matrix": [1, 4],"x":4, "y":1.75}, + {"label":"G", "matrix": [1, 5],"x":5, "y":2}, + + {"label":"H", "matrix": [1, 6],"x":9.75, "y":2}, + {"label":"J", "matrix": [1, 7],"x":10.75, "y":1.75}, + {"label":"K", "matrix": [1, 8],"x":11.75, "y":1.5}, + {"label":"L", "matrix": [1, 9],"x":12.75, "y":1.75}, + {"label":"\u00d6", "matrix": [1, 10],"x":13.75, "y":2.25}, + {"label":"\u00c4", "matrix": [1, 11],"x":14.75, "y":2.25}, + + //row 3 + {"label":"shift", "matrix": [2, 0],"x":0, "y":3.25}, + {"label":"Z", "matrix": [2, 1],"x":1, "y":3.25}, + {"label":"X", "matrix": [2, 2],"x":2, "y":2.75}, + {"label":"C", "matrix": [2, 3],"x":3, "y":2.5}, + {"label":"V", "matrix": [2, 4],"x":4, "y":2.75}, + {"label":"B", "matrix": [2, 5],"x":5, "y":3}, + + {"label":"N", "matrix": [2, 6],"x":9.75, "y":3}, + {"label":"M", "matrix": [2, 7],"x":10.75, "y":2.75}, + {"label":"<", "matrix": [2, 8],"x":11.75, "y":2.5}, + {"label":":", "matrix": [2, 9],"x":12.75, "y":2.75}, + {"label":"_", "matrix": [2, 10],"x":13.75, "y":3.25}, + {"label":"Shift", "matrix": [2, 11],"x":14.75, "y":3.25}, + + //row 4 + {"label":"L2", "matrix": [3, 2],"x":-3.5, "y":4.5}, + {"label":"Alt", "matrix": [3, 3],"x":-2.25, "y":7.25}, + {"label":"Strg", "matrix": [3, 4],"x":-1.0, "y":7.25}, + {"label":"Space", "matrix": [3, 5],"x":0, "y":7}, + + {"label":"Space", "matrix": [3, 6],"x":-1.0, "y":8.5}, + {"label":"Strg", "matrix": [3, 7],"x":0, "y":8.75}, + {"label":"AltGr", "matrix": [3, 8],"x":1.25, "y":8.75}, + {"label":"L1", "matrix": [3, 9],"x":2.5, "y":5.75} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c new file mode 100644 index 000000000000..4876a3758421 --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -0,0 +1,55 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +#include "rgb.c" + +enum layer_names { + _QWERTY, + _COLEMAK, + _LOWER, + _RAISE, + _ADJUST, +}; + +enum custom_keycodes { + QWERTY, + COLEMAK, + LOWER, + RAISE, + ADJUST, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT, + KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MINS, KC_RSFT, + TG(COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, MO(RAISE), KC_RALT + ), + [_COLEMAK] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + KC_CAPS, KC_A, KC_R, KC_R, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + TG(QWERTY), KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, MO(RAISE), KC_RALT + ), + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_ADJUST] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c new file mode 100644 index 000000000000..b6c5dbfb5051 --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -0,0 +1,33 @@ +#include "quantum.h" + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) +{ + if (host_keyboard_led_state().caps_lock) + { + rgb_matrix_set_color(0, RGB_RED); + } + + if (host_keyboard_led_state().num_lock) + { + rgb_matrix_set_color(1, RGB_RED); + } + + if (host_keyboard_led_state().scroll_lock) + { + rgb_matrix_set_color(2, RGB_RED); + } + + if (get_highest_layer(layer_state) == 1) + { + rgb_matrix_set_color(3, RGB_CYAN); + } + else if (get_highest_layer(layer_state) == 2) + { + rgb_matrix_set_color(3, RGB_MAGENTA); + } + else if (get_highest_layer(layer_state) == 3) + { + rgb_matrix_set_color(3, RGB_YELLOW); + } + return false; +} diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md new file mode 100644 index 000000000000..0d0994e059f9 --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -0,0 +1,27 @@ +# ergosplit44 + +![ergosplit44](https://i.imgur.com/RhRIe2a.png) + +This is a handdwired split 44 key keyboard. the two sides are connectd via a custom 2x8P pin header cable. + +* Keyboard Maintainer: [Marek128b](https://github.com/Marek128b) +* 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 ergosplit44:default + +Flashing example for this keyboard: + + make ergosplit44: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/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 8e0b4e96a981eb116eeff1a0ede1893dd9d87743 Mon Sep 17 00:00:00 2001 From: Marek128b Date: Fri, 27 Oct 2023 10:30:46 +0200 Subject: [PATCH 02/42] added marek128b-ergosplit44 keybord v0.1 --- keyboards/handwired/marek128b/ergosplit44/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/config.h b/keyboards/handwired/marek128b/ergosplit44/config.h index 648bbd7ccb43..0ecee401bbe0 100644 --- a/keyboards/handwired/marek128b/ergosplit44/config.h +++ b/keyboards/handwired/marek128b/ergosplit44/config.h @@ -20,7 +20,7 @@ //#define NO_ACTION_ONESHOT -//define rgb for ws2812b - 2020 leds +//define rgb for some ws2812b - 2020 leds //#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB //vial | get the uid: python3 util/vial_generate_keyboard_uid.py From 30b789b1fd425d41478c95c30e088a079164542b Mon Sep 17 00:00:00 2001 From: Marek128b Date: Fri, 27 Oct 2023 12:49:09 +0200 Subject: [PATCH 03/42] added marek128b-ergosplit44 keybord v0.1.1 --- keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c index b6c5dbfb5051..3d0c15ca1de2 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -1,3 +1,5 @@ +/* Copyright 2023 @Marek128b */ + #include "quantum.h" bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) From 0f1ee3c2132b1e80630be18c5a358df51843752e Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:48:35 +0200 Subject: [PATCH 04/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index b6b82bf99a6a..e361843a972d 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -4,6 +4,9 @@ "maintainer": "Marek128b", "bootloader": "rp2040", "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 5 + }, "features": { "bootmagic": true, "command": false, From 3f35e34b820cca00349ec6c4f76b8e52f662aac0 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:51:38 +0200 Subject: [PATCH 05/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c index 3d0c15ca1de2..34489eb2dcec 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -31,5 +31,5 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(3, RGB_YELLOW); } - return false; + return true; } From 0a22d3179843c8d028b04b35d457d8c409873a74 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:51:56 +0200 Subject: [PATCH 06/42] Update keyboards/handwired/marek128b/ergosplit44/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md index 0d0994e059f9..cfd6dc729528 100644 --- a/keyboards/handwired/marek128b/ergosplit44/readme.md +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -5,8 +5,8 @@ This is a handdwired split 44 key keyboard. the two sides are connectd via a custom 2x8P pin header cable. * Keyboard Maintainer: [Marek128b](https://github.com/Marek128b) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Handwire, designed for RP2040-Zero +* Hardware Availability: [Open Source](https://github.com/Marek128b/Split40) Make example for this keyboard (after setting up your build environment): From 5b3db0b429ab1a9bc3e3c215e1b1d7441b32ada3 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:52:10 +0200 Subject: [PATCH 07/42] Update keyboards/handwired/marek128b/ergosplit44/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md index cfd6dc729528..c66ae2501b69 100644 --- a/keyboards/handwired/marek128b/ergosplit44/readme.md +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -10,11 +10,11 @@ This is a handdwired split 44 key keyboard. the two sides are connectd via a cus Make example for this keyboard (after setting up your build environment): - make ergosplit44:default + make handwired/marek128b/ergosplit44:default Flashing example for this keyboard: - make ergosplit44:default:flash + make handwired/marek128b/ergosplit44: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). From f111867cd9ffbaabe7039028d0658225f16fc9e0 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:52:22 +0200 Subject: [PATCH 08/42] Update keyboards/handwired/marek128b/ergosplit44/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md index c66ae2501b69..d7b197de183b 100644 --- a/keyboards/handwired/marek128b/ergosplit44/readme.md +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -22,6 +22,6 @@ 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 -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. +* **Physical reset button**: Hold down the `BOOT` button on the RP2040-Zero, then press the `RESET` button. +* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create. From ec376b4a7380e43f3368837c9ee7e71d6a566c6c Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:00:03 +0200 Subject: [PATCH 09/42] Update keyboards/handwired/marek128b/ergosplit44/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md index d7b197de183b..31723d19b17d 100644 --- a/keyboards/handwired/marek128b/ergosplit44/readme.md +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -1,6 +1,6 @@ # ergosplit44 -![ergosplit44](https://i.imgur.com/RhRIe2a.png) +![ergosplit44](https://i.imgur.com/RhRIe2ah.png) This is a handdwired split 44 key keyboard. the two sides are connectd via a custom 2x8P pin header cable. From 026bbad3cc5bad8c85b1328b76eb64ac56d52d2b Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:00:24 +0200 Subject: [PATCH 10/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/rgb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c index 34489eb2dcec..4931cd475545 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -2,8 +2,10 @@ #include "quantum.h" -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) -{ +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(0, RGB_RED); From 7afee6b57c670cdc3db89cd46e3224d29ca3e1f9 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:00:33 +0200 Subject: [PATCH 11/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/rgb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c index 4931cd475545..3ac9b703cef9 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -1,4 +1,5 @@ -/* Copyright 2023 @Marek128b */ +// Copyright 2023 @Marek128b +// SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" From e3a1206ffdfddaa01995e1265ba51adeaa454f2f Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:01:11 +0200 Subject: [PATCH 12/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/handwired/marek128b/ergosplit44/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index e361843a972d..b98da6109b82 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -7,6 +7,9 @@ "dynamic_keymap": { "layer_count": 5 }, + "dynamic_keymap": { + "layer_count": 5 + }, "features": { "bootmagic": true, "command": false, From bbe8524c40a692089cef45f5cf3dd9bf22e919e5 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:07:05 +0200 Subject: [PATCH 13/42] added switch case to rgb.c --- .../ergosplit44/keymaps/default/rgb.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c index 3ac9b703cef9..65ca9e0161b0 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c @@ -22,17 +22,17 @@ bool rgb_matrix_indicators_kb(void) { rgb_matrix_set_color(2, RGB_RED); } - if (get_highest_layer(layer_state) == 1) + switch (get_highest_layer(layer_state)) { - rgb_matrix_set_color(3, RGB_CYAN); - } - else if (get_highest_layer(layer_state) == 2) - { - rgb_matrix_set_color(3, RGB_MAGENTA); - } - else if (get_highest_layer(layer_state) == 3) - { - rgb_matrix_set_color(3, RGB_YELLOW); + case 1: + rgb_matrix_set_color(3, RGB_CYAN); + break; + case 2: + rgb_matrix_set_color(3, RGB_MAGENTA); + break; + case 3: + rgb_matrix_set_color(3, RGB_YELLOW); + break; } return true; } From d5acd855fefbd553caf9e0c5a3628c0856682508 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:16:56 +0200 Subject: [PATCH 14/42] Update info.json --- keyboards/handwired/marek128b/ergosplit44/info.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index b98da6109b82..5c2cce9a82af 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -7,9 +7,6 @@ "dynamic_keymap": { "layer_count": 5 }, - "dynamic_keymap": { - "layer_count": 5 - }, "features": { "bootmagic": true, "command": false, @@ -174,4 +171,4 @@ ] } } -} \ No newline at end of file +} From b0aa228eeec94c447ba307ab8a2dc8be6d2977f6 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:03:09 +0200 Subject: [PATCH 15/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/handwired/marek128b/ergosplit44/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index 5c2cce9a82af..ba024c9164d8 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -17,8 +17,6 @@ "rgb_matrix": true }, "matrix_pins": { - //cols: 12 - //rows: 4 "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP17", "GP18"], "rows": ["GP2", "GP3", "GP4", "GP5"] }, From 946eba0c3df55e2d4686941beb03ce63dd955cdd Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:05:32 +0200 Subject: [PATCH 16/42] Update config.h no vial --- keyboards/handwired/marek128b/ergosplit44/config.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/config.h b/keyboards/handwired/marek128b/ergosplit44/config.h index 0ecee401bbe0..16b578023012 100644 --- a/keyboards/handwired/marek128b/ergosplit44/config.h +++ b/keyboards/handwired/marek128b/ergosplit44/config.h @@ -23,10 +23,5 @@ //define rgb for some ws2812b - 2020 leds //#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -//vial | get the uid: python3 util/vial_generate_keyboard_uid.py -#define VIAL_KEYBOARD_UID {0x5F, 0x97, 0x91, 0x98, 0xCB, 0x9F, 0x51, 0xCD} -#define VIAL_UNLOCK_COMBO_ROWS {0, 0} -#define VIAL_UNLOCK_COMBO_COLS {0, 1} - //layer count -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 \ No newline at end of file +#define DYNAMIC_KEYMAP_LAYER_COUNT 5 From d70da514743802a2e39754f97e64f5d72b65d801 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:17:03 +0100 Subject: [PATCH 17/42] Delete keyboards/handwired/marek128b/ergosplit44/config.h --- .../handwired/marek128b/ergosplit44/config.h | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 keyboards/handwired/marek128b/ergosplit44/config.h diff --git a/keyboards/handwired/marek128b/ergosplit44/config.h b/keyboards/handwired/marek128b/ergosplit44/config.h deleted file mode 100644 index 16b578023012..000000000000 --- a/keyboards/handwired/marek128b/ergosplit44/config.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2023 Marek128b (@Marek128b) -// 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 - - -//define rgb for some ws2812b - 2020 leds -//#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB - -//layer count -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 From 6165f4623baa295825a7f98af9e0d0091fb17528 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:58:48 +0100 Subject: [PATCH 18/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: Duncan Sutherland --- keyboards/handwired/marek128b/ergosplit44/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index ba024c9164d8..f7c5cb661fdd 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -53,7 +53,7 @@ "solid_reactive_cross": true, "multisplash": true }, - "layout":[ + "layout":[ // Row 1 {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From 039d9be7c33c7a1300401a80ffac9d1bdef33760 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:59:05 +0100 Subject: [PATCH 19/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: Duncan Sutherland --- keyboards/handwired/marek128b/ergosplit44/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index f7c5cb661fdd..063ca7a64a77 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -110,7 +110,7 @@ }, "layouts": { "LAYOUT": { - "layout":[ //https://qmk.fm/converter/ + "layout": [ //row 1 {"label":"tab", "matrix": [0, 0],"x":0, "y":1.25}, {"label":"Q", "matrix": [0, 1],"x":1, "y":1.25}, From e65404aa90452dadaa23448d5d3db3ca880b1d89 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Wed, 1 Nov 2023 04:59:05 +0000 Subject: [PATCH 20/42] changed rgb.c to keyboard level --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 2 +- .../marek128b/ergosplit44/{keymaps/default => }/rgb.c | 0 keyboards/handwired/marek128b/ergosplit44/rgb.h | 3 +++ keyboards/handwired/marek128b/ergosplit44/rules.mk | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) rename keyboards/handwired/marek128b/ergosplit44/{keymaps/default => }/rgb.c (100%) create mode 100644 keyboards/handwired/marek128b/ergosplit44/rgb.h diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 4876a3758421..6a21c3ebb131 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "rgb.c" +#include "rgb.h" enum layer_names { _QWERTY, diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c b/keyboards/handwired/marek128b/ergosplit44/rgb.c similarity index 100% rename from keyboards/handwired/marek128b/ergosplit44/keymaps/default/rgb.c rename to keyboards/handwired/marek128b/ergosplit44/rgb.c diff --git a/keyboards/handwired/marek128b/ergosplit44/rgb.h b/keyboards/handwired/marek128b/ergosplit44/rgb.h new file mode 100644 index 000000000000..c48b81e6821c --- /dev/null +++ b/keyboards/handwired/marek128b/ergosplit44/rgb.h @@ -0,0 +1,3 @@ +#pragma once + +bool rgb_matrix_indicators_kb(void); //show lock states and layer states with rgb \ No newline at end of file diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk index 6e7633bfe015..b132538e4ed5 100644 --- a/keyboards/handwired/marek128b/ergosplit44/rules.mk +++ b/keyboards/handwired/marek128b/ergosplit44/rules.mk @@ -1 +1,2 @@ # This file intentionally left blank +SRC += rgb.c \ No newline at end of file From bd8193d72b5c5c4d1f7171e55b879621dcb076dc Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Wed, 1 Nov 2023 05:10:04 +0000 Subject: [PATCH 21/42] changed rgb.h add copyright --- keyboards/handwired/marek128b/ergosplit44/rgb.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/handwired/marek128b/ergosplit44/rgb.h b/keyboards/handwired/marek128b/ergosplit44/rgb.h index c48b81e6821c..08c0cc5e596b 100644 --- a/keyboards/handwired/marek128b/ergosplit44/rgb.h +++ b/keyboards/handwired/marek128b/ergosplit44/rgb.h @@ -1,3 +1,6 @@ +// Copyright 2023 @Marek128b +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once bool rgb_matrix_indicators_kb(void); //show lock states and layer states with rgb \ No newline at end of file From 8da84f7134c6c4325e329ebcd3005a994bc0f325 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 11:05:19 +0100 Subject: [PATCH 22/42] Update keyboards/handwired/marek128b/ergosplit44/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/handwired/marek128b/ergosplit44/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk index b132538e4ed5..7ff128fa692e 100644 --- a/keyboards/handwired/marek128b/ergosplit44/rules.mk +++ b/keyboards/handwired/marek128b/ergosplit44/rules.mk @@ -1,2 +1 @@ -# This file intentionally left blank -SRC += rgb.c \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 31f245642feec64ca7403f03a0e0bd95a79dd15c Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 11:06:14 +0100 Subject: [PATCH 23/42] Delete keyboards/handwired/marek128b/ergosplit44/rgb.h --- keyboards/handwired/marek128b/ergosplit44/rgb.h | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 keyboards/handwired/marek128b/ergosplit44/rgb.h diff --git a/keyboards/handwired/marek128b/ergosplit44/rgb.h b/keyboards/handwired/marek128b/ergosplit44/rgb.h deleted file mode 100644 index 08c0cc5e596b..000000000000 --- a/keyboards/handwired/marek128b/ergosplit44/rgb.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2023 @Marek128b -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -bool rgb_matrix_indicators_kb(void); //show lock states and layer states with rgb \ No newline at end of file From 212a29f301a894de105ab6f53c4f0650cace823c Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:10:46 +0000 Subject: [PATCH 24/42] deleted rgb.h rgb.c moved to keymap.c --- .../ergosplit44/keymaps/default/keymap.c | 37 +++++++++++++++++- .../handwired/marek128b/ergosplit44/rgb.c | 38 ------------------- .../handwired/marek128b/ergosplit44/rgb.h | 6 --- 3 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 keyboards/handwired/marek128b/ergosplit44/rgb.c delete mode 100644 keyboards/handwired/marek128b/ergosplit44/rgb.h diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 6a21c3ebb131..d25b194ee035 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "rgb.h" +#include "quantum.h" enum layer_names { _QWERTY, @@ -53,3 +53,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), }; + + +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) + { + rgb_matrix_set_color(0, RGB_RED); + } + + if (host_keyboard_led_state().num_lock) + { + rgb_matrix_set_color(1, RGB_RED); + } + + if (host_keyboard_led_state().scroll_lock) + { + rgb_matrix_set_color(2, RGB_RED); + } + + switch (get_highest_layer(layer_state)) + { + case 1: + rgb_matrix_set_color(3, RGB_CYAN); + break; + case 2: + rgb_matrix_set_color(3, RGB_MAGENTA); + break; + case 3: + rgb_matrix_set_color(3, RGB_YELLOW); + break; + } + return true; +} diff --git a/keyboards/handwired/marek128b/ergosplit44/rgb.c b/keyboards/handwired/marek128b/ergosplit44/rgb.c deleted file mode 100644 index 65ca9e0161b0..000000000000 --- a/keyboards/handwired/marek128b/ergosplit44/rgb.c +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2023 @Marek128b -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "quantum.h" - -bool rgb_matrix_indicators_kb(void) { - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) - { - rgb_matrix_set_color(0, RGB_RED); - } - - if (host_keyboard_led_state().num_lock) - { - rgb_matrix_set_color(1, RGB_RED); - } - - if (host_keyboard_led_state().scroll_lock) - { - rgb_matrix_set_color(2, RGB_RED); - } - - switch (get_highest_layer(layer_state)) - { - case 1: - rgb_matrix_set_color(3, RGB_CYAN); - break; - case 2: - rgb_matrix_set_color(3, RGB_MAGENTA); - break; - case 3: - rgb_matrix_set_color(3, RGB_YELLOW); - break; - } - return true; -} diff --git a/keyboards/handwired/marek128b/ergosplit44/rgb.h b/keyboards/handwired/marek128b/ergosplit44/rgb.h deleted file mode 100644 index 08c0cc5e596b..000000000000 --- a/keyboards/handwired/marek128b/ergosplit44/rgb.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2023 @Marek128b -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -bool rgb_matrix_indicators_kb(void); //show lock states and layer states with rgb \ No newline at end of file From 864aa15069e474b99ad6ec41b65d2577532d804b Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 12:15:30 +0100 Subject: [PATCH 25/42] Update keymap.c --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index d25b194ee035..40cafcb146cf 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "quantum.h" enum layer_names { _QWERTY, From da5b511be0230646bfb76bfe89c427dd4cb2b0e2 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:55:31 +0100 Subject: [PATCH 26/42] Update keymap.c --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 40cafcb146cf..4b3dca9abf61 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H +#include "quantum.h" enum layer_names { _QWERTY, @@ -53,7 +54,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - bool rgb_matrix_indicators_kb(void) { if (!rgb_matrix_indicators_user()) { return false; From ce07c86591ae601e153b66fc19c97c38caa4c5c6 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 19:02:22 +0100 Subject: [PATCH 27/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 4b3dca9abf61..0339e839d86f 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -54,10 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool rgb_matrix_indicators_kb(void) { - if (!rgb_matrix_indicators_user()) { - return false; - } +bool rgb_matrix_indicators_user(void) { if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(0, RGB_RED); From 11333f5662c9acf647179cd9403bcab3c80b2494 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 19:02:38 +0100 Subject: [PATCH 28/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../ergosplit44/keymaps/default/keymap.c | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 0339e839d86f..74e9fea3587b 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -33,25 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, KC_A, KC_R, KC_R, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TG(QWERTY), KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, MO(RAISE), KC_RALT - ), - [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - [_RAISE] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - [_ADJUST] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), + ) }; bool rgb_matrix_indicators_user(void) { From 81c0290842c6371a2eda857abb6ed3fe88102090 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 20:04:04 +0100 Subject: [PATCH 29/42] Update keymap.c --- .../marek128b/ergosplit44/keymaps/default/keymap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 74e9fea3587b..11196307e90e 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -7,17 +7,12 @@ enum layer_names { _QWERTY, _COLEMAK, - _LOWER, - _RAISE, - _ADJUST, + }; enum custom_keycodes { QWERTY, COLEMAK, - LOWER, - RAISE, - ADJUST, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 5d3dba86384b13aef7ab3a27cbed0b635a588a26 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 23:53:44 +0100 Subject: [PATCH 30/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 11196307e90e..a6362487cedd 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "quantum.h" enum layer_names { _QWERTY, From 29c41c7fe0df76ce99aa174ad4caacf91ac4ce1c Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 23:54:08 +0100 Subject: [PATCH 31/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index a6362487cedd..e52d8bf52d78 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT, KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MINS, KC_RSFT, - TG(COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, MO(RAISE), KC_RALT + TG(_COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, MO(_RAISE), KC_RALT ), [_COLEMAK] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, From d888128d4e711edcc2997b19166335dbc45cf51a Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Thu, 2 Nov 2023 23:54:30 +0100 Subject: [PATCH 32/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index e52d8bf52d78..9e609993a638 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_CAPS, KC_A, KC_R, KC_R, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - TG(QWERTY), KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, MO(RAISE), KC_RALT + TG(_COLEMAK), KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, MO(_RAISE), KC_RALT ) }; From f372c350ad9a72ac161b6ef86887206ec8290b9f Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 3 Nov 2023 00:27:23 +0100 Subject: [PATCH 33/42] Update keymap.c --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 9e609993a638..93a3cb093a65 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -20,13 +20,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT, KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MINS, KC_RSFT, - TG(_COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, MO(_RAISE), KC_RALT + TG(COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, KC_NO, KC_RALT ), [_COLEMAK] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_CAPS, KC_A, KC_R, KC_R, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - TG(_COLEMAK), KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, MO(_RAISE), KC_RALT + KC_TRNS, KC_LCTL, KC_SPC, KC_NO, KC_LALT, KC_SPC, KC_NO, KC_RALT ) }; From a71e00de1f818ed4b43bd94a7de02048ec2f551c Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:48:45 +0100 Subject: [PATCH 34/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 93a3cb093a65..fb03d7e4dc37 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -9,11 +9,6 @@ enum layer_names { }; -enum custom_keycodes { - QWERTY, - COLEMAK, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( From 5734478aba0535342ce88f7a5b500a89666774bd Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:33:56 +0100 Subject: [PATCH 35/42] Update keymap.c --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index fb03d7e4dc37..77eb791f749a 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT, KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MINS, KC_RSFT, - TG(COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, KC_NO, KC_RALT + TG(_COLEMAK),KC_LCTL, KC_SPC, KC_LSFT, KC_RSFT, KC_SPC, KC_NO, KC_RALT ), [_COLEMAK] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, From e85fbe6344c5c4af6e7b6fd852dbd8e427b3d725 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Sat, 4 Nov 2023 23:33:18 +0100 Subject: [PATCH 36/42] Update keyboards/handwired/marek128b/ergosplit44/readme.md Co-authored-by: Duncan Sutherland --- keyboards/handwired/marek128b/ergosplit44/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/readme.md b/keyboards/handwired/marek128b/ergosplit44/readme.md index 31723d19b17d..a9077732f9e6 100644 --- a/keyboards/handwired/marek128b/ergosplit44/readme.md +++ b/keyboards/handwired/marek128b/ergosplit44/readme.md @@ -5,7 +5,7 @@ This is a handdwired split 44 key keyboard. the two sides are connectd via a custom 2x8P pin header cable. * Keyboard Maintainer: [Marek128b](https://github.com/Marek128b) -* Hardware Supported: Handwire, designed for RP2040-Zero +* Hardware Supported: WaveShare RP2040-Zero * Hardware Availability: [Open Source](https://github.com/Marek128b/Split40) Make example for this keyboard (after setting up your build environment): From 57b4009b3d26e576a1d154268ba1561702cd733a Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Sat, 4 Nov 2023 23:33:45 +0100 Subject: [PATCH 37/42] Update keyboards/handwired/marek128b/ergosplit44/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/handwired/marek128b/ergosplit44/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk index 7ff128fa692e..6e7633bfe015 100644 --- a/keyboards/handwired/marek128b/ergosplit44/rules.mk +++ b/keyboards/handwired/marek128b/ergosplit44/rules.mk @@ -1 +1 @@ -# This file intentionally left blank \ No newline at end of file +# This file intentionally left blank From af9e31cbe28d343273ae31d6e96b1f673e1d0cb4 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Sat, 4 Nov 2023 23:37:00 +0100 Subject: [PATCH 38/42] Deleted comments in info.json --- keyboards/handwired/marek128b/ergosplit44/info.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index 063ca7a64a77..9e751d90d1ca 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -53,8 +53,7 @@ "solid_reactive_cross": true, "multisplash": true }, - "layout":[ - // Row 1 + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, @@ -68,7 +67,6 @@ {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, - // Row 2 {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 2], "x": 2, "y": 1}, @@ -82,7 +80,6 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, - // Row 3 {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2}, @@ -96,7 +93,6 @@ {"matrix": [2, 10], "x": 10, "y": 2}, {"matrix": [2, 11], "x": 11, "y": 2}, - // Row 4 {"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 4], "x": 4, "y": 3}, @@ -111,7 +107,6 @@ "layouts": { "LAYOUT": { "layout": [ - //row 1 {"label":"tab", "matrix": [0, 0],"x":0, "y":1.25}, {"label":"Q", "matrix": [0, 1],"x":1, "y":1.25}, {"label":"W", "matrix": [0, 2],"x":2, "y":0.75}, @@ -126,7 +121,6 @@ {"label":"P", "matrix": [0, 10],"x":13.75, "y":1.25}, {"label":"\u00dc", "matrix": [0, 11],"x":14.75, "y":1.25}, - //row 2 {"label":"back-space", "matrix": [1, 0],"x":0, "y":2.25}, {"label":"A", "matrix": [1, 1],"x":1, "y":2.25}, {"label":"S", "matrix": [1, 2],"x":2, "y":1.75}, @@ -141,7 +135,6 @@ {"label":"\u00d6", "matrix": [1, 10],"x":13.75, "y":2.25}, {"label":"\u00c4", "matrix": [1, 11],"x":14.75, "y":2.25}, - //row 3 {"label":"shift", "matrix": [2, 0],"x":0, "y":3.25}, {"label":"Z", "matrix": [2, 1],"x":1, "y":3.25}, {"label":"X", "matrix": [2, 2],"x":2, "y":2.75}, @@ -156,7 +149,6 @@ {"label":"_", "matrix": [2, 10],"x":13.75, "y":3.25}, {"label":"Shift", "matrix": [2, 11],"x":14.75, "y":3.25}, - //row 4 {"label":"L2", "matrix": [3, 2],"x":-3.5, "y":4.5}, {"label":"Alt", "matrix": [3, 3],"x":-2.25, "y":7.25}, {"label":"Strg", "matrix": [3, 4],"x":-1.0, "y":7.25}, From 1e7ba57e6fc8fd56d1ca96b2ca33c3b6e07df601 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Sat, 4 Nov 2023 23:37:54 +0100 Subject: [PATCH 39/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 77eb791f749a..9c39b6e79bcc 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -6,7 +6,6 @@ enum layer_names { _QWERTY, _COLEMAK, - }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From f019360f315ff0195fcdf8452d88c1e7f4b199a8 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Sat, 4 Nov 2023 23:38:01 +0100 Subject: [PATCH 40/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- .../handwired/marek128b/ergosplit44/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 9c39b6e79bcc..743184e79ca4 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -9,7 +9,6 @@ enum layer_names { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT, From 7ae22aa83bce688103083a37f1c8736a68791ad5 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:37:31 +0100 Subject: [PATCH 41/42] Update keyboards/handwired/marek128b/ergosplit44/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/marek128b/ergosplit44/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/info.json index 9e751d90d1ca..8e0c71fc06f4 100644 --- a/keyboards/handwired/marek128b/ergosplit44/info.json +++ b/keyboards/handwired/marek128b/ergosplit44/info.json @@ -53,7 +53,7 @@ "solid_reactive_cross": true, "multisplash": true }, - "layout": [ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, From 15249d47a8d5259855f4cc10a97c15f215da6618 Mon Sep 17 00:00:00 2001 From: Marek128b <58476072+Marek128b@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:48:35 +0100 Subject: [PATCH 42/42] Update keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- .../ergosplit44/keymaps/default/keymap.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c index 743184e79ca4..a08d6d96847b 100644 --- a/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c +++ b/keyboards/handwired/marek128b/ergosplit44/keymaps/default/keymap.c @@ -24,32 +24,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool rgb_matrix_indicators_user(void) { - if (host_keyboard_led_state().caps_lock) - { + if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(0, RGB_RED); } - if (host_keyboard_led_state().num_lock) - { + if (host_keyboard_led_state().num_lock) { rgb_matrix_set_color(1, RGB_RED); } - if (host_keyboard_led_state().scroll_lock) - { + if (host_keyboard_led_state().scroll_lock) { rgb_matrix_set_color(2, RGB_RED); } - switch (get_highest_layer(layer_state)) - { + switch (get_highest_layer(layer_state)) { case 1: rgb_matrix_set_color(3, RGB_CYAN); - break; + break; case 2: rgb_matrix_set_color(3, RGB_MAGENTA); - break; + break; case 3: rgb_matrix_set_color(3, RGB_YELLOW); - break; + break; } return true; }