From 559c9ef518a954a9ee447317f83401a9ef3351fb Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Wed, 6 Sep 2023 13:25:30 +0200 Subject: [PATCH 01/24] initial commit test firmware --- keyboards/tweetydabird/chameleon/config.h | 22 ++++ keyboards/tweetydabird/chameleon/info.json | 122 ++++++++++++++++++ .../chameleon/keymaps/default/keymap.c | 33 +++++ keyboards/tweetydabird/chameleon/readme.md | 28 ++++ keyboards/tweetydabird/chameleon/rules.mk | 1 + 5 files changed, 206 insertions(+) create mode 100644 keyboards/tweetydabird/chameleon/config.h create mode 100644 keyboards/tweetydabird/chameleon/info.json create mode 100644 keyboards/tweetydabird/chameleon/keymaps/default/keymap.c create mode 100644 keyboards/tweetydabird/chameleon/readme.md create mode 100644 keyboards/tweetydabird/chameleon/rules.mk diff --git a/keyboards/tweetydabird/chameleon/config.h b/keyboards/tweetydabird/chameleon/config.h new file mode 100644 index 000000000000..2dfab0f806de --- /dev/null +++ b/keyboards/tweetydabird/chameleon/config.h @@ -0,0 +1,22 @@ +// Copyright 2023 Markus Knutsson (@TweetyDaBird) +// 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 WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json new file mode 100644 index 000000000000..61dc85cbe727 --- /dev/null +++ b/keyboards/tweetydabird/chameleon/info.json @@ -0,0 +1,122 @@ +{ + "manufacturer": "Tweetys Wild Thinking", + "keyboard_name": "Chameleon (QMK)", + "maintainer": "TweetyDaBird", + "bootloader": "rp2040", + "bootmagic": { + "matrix": [0, 0] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, + {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, + {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, + {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["GP15", "GP14", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP29", "GP22", "GP21", "GP24", "GP13", "GP1", "GP11", "GP2", "GP12", "GP8"] + }, + "processor": "RP2040", + "rgblight": { + "led_count": 8, + "sleep": true, + "layers": { + "enabled": true + }, + "animations": { + "alternating": true, + "breathing": true, + "rainbow_mood": true + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP20" + }, + "url": "https://lectronz.com/stores/tweetys-wild-thinking", + "usb": { + "device_version": "1.0.0", + "pid": "0x23B0", + "vid": "0xFEED", + "force_nkro": true + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 5], "x": 5, "y": 4}, + {"matrix": [9, 5], "x": 6, "y": 4}, + {"matrix": [9, 4], "x": 7, "y": 4}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c new file mode 100644 index 000000000000..366f5a197c3e --- /dev/null +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌──────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ A │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ Del │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bksp│ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Esc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Ent │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ AltGr│ CTRL│ ALT │ Win │ ⇓ │Space│Space│ ⇑ │ ← │ ↓ │ ↑ │ → │ + * └──────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [0] = LAYOUT_ortho_5x12( + KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, KC_A, KC_SPC, KC_SPC, KC_A, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md new file mode 100644 index 000000000000..b0511d762d4e --- /dev/null +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -0,0 +1,28 @@ +# Chameleon + +![chameleon](imgur.com image replace me!) + +* Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts * + +* Keyboard Maintainer: [TweetyDaBird](https://github.com/TweetyDaBird) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: [Lectronz Store](https://lectronz.com/stores/tweetys-wild-thinking) +* Hardware Design: [GitHub](https://github.com/TweetyDaBird/Chameleon) + +Make example for this keyboard (after setting up your build environment): + + make tweetydabird/chameleon:default + +Flashing example for this keyboard: + + make tweetydabird/chameleon: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 (top left) and plug in the keyboard +* **Physical reset/boot buttons**: Briefly press the buttons on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/tweetydabird/chameleon/rules.mk b/keyboards/tweetydabird/chameleon/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/tweetydabird/chameleon/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From f1775e82fa1d97876786b518b1b18f069146e52a Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Wed, 6 Sep 2023 13:25:30 +0200 Subject: [PATCH 02/24] initial commit Chameleon test firmware --- keyboards/tweetydabird/chameleon/config.h | 22 ++++ keyboards/tweetydabird/chameleon/info.json | 122 ++++++++++++++++++ .../chameleon/keymaps/default/keymap.c | 33 +++++ keyboards/tweetydabird/chameleon/readme.md | 28 ++++ keyboards/tweetydabird/chameleon/rules.mk | 1 + 5 files changed, 206 insertions(+) create mode 100644 keyboards/tweetydabird/chameleon/config.h create mode 100644 keyboards/tweetydabird/chameleon/info.json create mode 100644 keyboards/tweetydabird/chameleon/keymaps/default/keymap.c create mode 100644 keyboards/tweetydabird/chameleon/readme.md create mode 100644 keyboards/tweetydabird/chameleon/rules.mk diff --git a/keyboards/tweetydabird/chameleon/config.h b/keyboards/tweetydabird/chameleon/config.h new file mode 100644 index 000000000000..2dfab0f806de --- /dev/null +++ b/keyboards/tweetydabird/chameleon/config.h @@ -0,0 +1,22 @@ +// Copyright 2023 Markus Knutsson (@TweetyDaBird) +// 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 WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json new file mode 100644 index 000000000000..61dc85cbe727 --- /dev/null +++ b/keyboards/tweetydabird/chameleon/info.json @@ -0,0 +1,122 @@ +{ + "manufacturer": "Tweetys Wild Thinking", + "keyboard_name": "Chameleon (QMK)", + "maintainer": "TweetyDaBird", + "bootloader": "rp2040", + "bootmagic": { + "matrix": [0, 0] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, + {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, + {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, + {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["GP15", "GP14", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP29", "GP22", "GP21", "GP24", "GP13", "GP1", "GP11", "GP2", "GP12", "GP8"] + }, + "processor": "RP2040", + "rgblight": { + "led_count": 8, + "sleep": true, + "layers": { + "enabled": true + }, + "animations": { + "alternating": true, + "breathing": true, + "rainbow_mood": true + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP20" + }, + "url": "https://lectronz.com/stores/tweetys-wild-thinking", + "usb": { + "device_version": "1.0.0", + "pid": "0x23B0", + "vid": "0xFEED", + "force_nkro": true + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 5], "x": 5, "y": 4}, + {"matrix": [9, 5], "x": 6, "y": 4}, + {"matrix": [9, 4], "x": 7, "y": 4}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c new file mode 100644 index 000000000000..366f5a197c3e --- /dev/null +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌──────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ A │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ Del │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bksp│ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Esc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Ent │ + * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ AltGr│ CTRL│ ALT │ Win │ ⇓ │Space│Space│ ⇑ │ ← │ ↓ │ ↑ │ → │ + * └──────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [0] = LAYOUT_ortho_5x12( + KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, KC_A, KC_SPC, KC_SPC, KC_A, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md new file mode 100644 index 000000000000..b0511d762d4e --- /dev/null +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -0,0 +1,28 @@ +# Chameleon + +![chameleon](imgur.com image replace me!) + +* Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts * + +* Keyboard Maintainer: [TweetyDaBird](https://github.com/TweetyDaBird) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: [Lectronz Store](https://lectronz.com/stores/tweetys-wild-thinking) +* Hardware Design: [GitHub](https://github.com/TweetyDaBird/Chameleon) + +Make example for this keyboard (after setting up your build environment): + + make tweetydabird/chameleon:default + +Flashing example for this keyboard: + + make tweetydabird/chameleon: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 (top left) and plug in the keyboard +* **Physical reset/boot buttons**: Briefly press the buttons on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/tweetydabird/chameleon/rules.mk b/keyboards/tweetydabird/chameleon/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/tweetydabird/chameleon/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From b538eb5b808336b1adbf57ee0194a7ca79e02051 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Mon, 18 Sep 2023 18:44:02 +0200 Subject: [PATCH 03/24] fleshed out keymap --- keyboards/tweetydabird/chameleon/info.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 61dc85cbe727..76f5f8ad023b 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -23,7 +23,8 @@ "mousekey": true, "nkro": true, "encoder": true, - "rgblight": true + "rgblight": true, + "tri_layer": true }, "matrix_pins": { "cols": ["GP15", "GP14", "GP6", "GP5", "GP4", "GP3"], @@ -119,4 +120,4 @@ ] } } -} \ No newline at end of file +} From 0454ea7b3c3ac6f9ed79233e9c459c708c226124 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Mon, 18 Sep 2023 18:45:03 +0200 Subject: [PATCH 04/24] modified: keyboards/tweetydabird/chameleon/keymaps/default/keymap.c --- .../chameleon/keymaps/default/keymap.c | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index 366f5a197c3e..7e5ffb04fa78 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -18,16 +18,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └──────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ [0] = LAYOUT_ortho_5x12( - KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSPC, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, KC_A, KC_SPC, KC_SPC, KC_A, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, TG(1), KC_SPC, KC_SPC, TG(2), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ), + [1] = LAYOUT_ortho_5x12( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + ), + [2] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + ), + [3] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif From 81ca06789413ad31bf31d8b8de521cac6e8627bf Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Mon, 18 Sep 2023 18:53:46 +0200 Subject: [PATCH 05/24] fix keymap --- keyboards/tweetydabird/chameleon/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index 7e5ffb04fa78..efebf1a56aa3 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -29,21 +29,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_ortho_5x12( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT_ortho_5x12( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From d10e43bab2b424dff523190ede0103d58ef03ae9 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Sat, 7 Oct 2023 19:29:47 +0000 Subject: [PATCH 06/24] tweaked --- keyboards/tweetydabird/chameleon/info.json | 10 +++++----- .../tweetydabird/chameleon/keymaps/default/keymap.c | 2 +- keyboards/tweetydabird/chameleon/readme.md | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 76f5f8ad023b..1bcc42111115 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -9,10 +9,10 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, - {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, - {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, - {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} + {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, + {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, + {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, + {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} ] }, "features": { @@ -22,7 +22,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "encoder": true, + "encoder": true, "rgblight": true, "tri_layer": true }, diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index efebf1a56aa3..ab2261a4fbc3 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index b0511d762d4e..357b243b0e19 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -24,5 +24,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left) and plug in the keyboard -* **Physical reset/boot buttons**: Briefly press the buttons on the back of the PCB -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Physical reset/boot buttons**: Hold the 'BOOT' button and briefly press 'RESET' on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if available on your keymap From d16631b820f50210b8e6114f96fb8897989a804d Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 09:34:54 +0100 Subject: [PATCH 07/24] Minor tweak --- keyboards/tweetydabird/chameleon/config.h | 16 -------------- .../chameleon/keymaps/default/keymap.c | 22 +++++++++---------- keyboards/tweetydabird/chameleon/readme.md | 2 +- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/config.h b/keyboards/tweetydabird/chameleon/config.h index 2dfab0f806de..ba31336014e8 100644 --- a/keyboards/tweetydabird/chameleon/config.h +++ b/keyboards/tweetydabird/chameleon/config.h @@ -3,20 +3,4 @@ #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 WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index ab2261a4fbc3..3b943994985a 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -5,17 +5,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - * ┌──────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ A │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ Del │ - * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bksp│ - * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ Esc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ - * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Ent │ - * ├──────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ AltGr│ CTRL│ ALT │ Win │ ⇓ │Space│Space│ ⇑ │ ← │ ↓ │ ↑ │ → │ - * └──────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ + * │ Esc │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ Del │ + * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bksp │ + * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ + * │ Esc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ + * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ + * │ Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Ent │ + * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ + * │ AltGr│ CTRL │ ALT │ Win │ Lower│ Space│ Space│ Raise│ ← │ ↓ │ ↑ │ → │ + * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘ */ [0] = LAYOUT_ortho_5x12( KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index 357b243b0e19..e0e5856ad7f1 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -5,7 +5,7 @@ * Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts * * Keyboard Maintainer: [TweetyDaBird](https://github.com/TweetyDaBird) -* Hardware Supported: *The PCBs, controllers supported* +* Hardware Supported: Chameleon 46-60 key PCB * Hardware Availability: [Lectronz Store](https://lectronz.com/stores/tweetys-wild-thinking) * Hardware Design: [GitHub](https://github.com/TweetyDaBird/Chameleon) From 6f01a1434169dd1049d2503f49e5e6e7062af48e Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 10:37:12 +0100 Subject: [PATCH 08/24] Fixed keymap error --- keyboards/tweetydabird/chameleon/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index 3b943994985a..c190ea446880 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘ */ [0] = LAYOUT_ortho_5x12( - KC_A, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, From f9d07a194189b442bbd8473efe06e026aeaac203 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 15:27:11 +0100 Subject: [PATCH 09/24] Update keyboards/tweetydabird/chameleon/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c index c190ea446880..90f77a629831 100644 --- a/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c +++ b/keyboards/tweetydabird/chameleon/keymaps/default/keymap.c @@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif From af5e491be08a87110c946fc32eebba485cbe79aa Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 15:27:28 +0100 Subject: [PATCH 10/24] Update keyboards/tweetydabird/chameleon/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index e0e5856ad7f1..f52bae418149 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -2,7 +2,7 @@ ![chameleon](imgur.com image replace me!) -* Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts * +Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts. * Keyboard Maintainer: [TweetyDaBird](https://github.com/TweetyDaBird) * Hardware Supported: Chameleon 46-60 key PCB From ba736ff2d23b6ee71332a8ff5ba0bc3750af4c1b Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 15:27:54 +0100 Subject: [PATCH 11/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 1bcc42111115..4628c072514e 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -51,8 +51,7 @@ "usb": { "device_version": "1.0.0", "pid": "0x23B0", - "vid": "0xFEED", - "force_nkro": true + "vid": "0xFEED" }, "layouts": { "LAYOUT_ortho_5x12": { From a3b9f9093fd70ee96aafbb38f8466589d3860ef2 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 15:28:03 +0100 Subject: [PATCH 12/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 4628c072514e..7bca34cc65d0 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -3,9 +3,6 @@ "keyboard_name": "Chameleon (QMK)", "maintainer": "TweetyDaBird", "bootloader": "rp2040", - "bootmagic": { - "matrix": [0, 0] - }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ From 018101f22184fd840bfc5a718f3ff717b22c8827 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 15:28:10 +0100 Subject: [PATCH 13/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 7bca34cc65d0..4df9bfefa2ce 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -14,8 +14,6 @@ }, "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true, From 9ee36ea00189c595985d8e6d28f9d5e414b39ffc Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 15:31:45 +0100 Subject: [PATCH 14/24] Add image link to readme --- keyboards/tweetydabird/chameleon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index f52bae418149..e28b40490ef2 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -1,6 +1,6 @@ # Chameleon -![chameleon](imgur.com image replace me!) +![chameleon](https://lectronz.com/lectronz/active_storage/representations/redirect/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBBalFoIiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--4be3beffa89240abba6874d8ef242fc7b0b10994/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaDdCem9MWm05eWJXRjBTU0lKU2xCRlJ3WTZCa1ZVT2hSeVpYTnBlbVZmZEc5ZmJHbHRhWFJiQjJrQ3dBTnBBb0FDIiwiZXhwIjpudWxsLCJwdXIiOiJ2YXJpYXRpb24ifX0=--3e445397da8bf51b531321877b7934091a51a638/IMG_1311.JPEG) Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts. From 3a89a8d175ab76a253e3844da0914bf502581412 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 15:35:02 +0100 Subject: [PATCH 15/24] Format info.json --- keyboards/tweetydabird/chameleon/info.json | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 4df9bfefa2ce..4768462e9ad1 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -4,20 +4,20 @@ "maintainer": "TweetyDaBird", "bootloader": "rp2040", "diode_direction": "COL2ROW", - "encoder": { + "encoder": { "rotary": [ - {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, - {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, - {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, - {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} + {"pin_a": "GP18", "pin_b": "GP19", "resolution": 2}, + {"pin_a": "GP27", "pin_b": "GP0", "resolution": 2}, + {"pin_a": "GP17", "pin_b": "GP16", "resolution": 2}, + {"pin_a": "GP10", "pin_b": "GP9", "resolution": 2} ] }, "features": { "bootmagic": true, + "encoder": true, "extrakey": true, "mousekey": true, "nkro": true, - "encoder": true, "rgblight": true, "tri_layer": true }, @@ -26,21 +26,17 @@ "rows": ["GP29", "GP22", "GP21", "GP24", "GP13", "GP1", "GP11", "GP2", "GP12", "GP8"] }, "processor": "RP2040", - "rgblight": { - "led_count": 8, - "sleep": true, - "layers": { - "enabled": true - }, + "rgblight": { "animations": { "alternating": true, "breathing": true, "rainbow_mood": true - } - }, - "ws2812": { - "driver": "vendor", - "pin": "GP20" + }, + "layers": { + "enabled": true + }, + "led_count": 8, + "sleep": true }, "url": "https://lectronz.com/stores/tweetys-wild-thinking", "usb": { @@ -48,6 +44,10 @@ "pid": "0x23B0", "vid": "0xFEED" }, + "ws2812": { + "driver": "vendor", + "pin": "GP20" + }, "layouts": { "LAYOUT_ortho_5x12": { "layout": [ @@ -114,4 +114,4 @@ ] } } -} +} \ No newline at end of file From be365748ece0fe31dafe513042c8019172fa36b2 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 20:02:37 +0100 Subject: [PATCH 16/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Duncan Sutherland --- keyboards/tweetydabird/chameleon/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 4768462e9ad1..0064043de4d9 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -48,6 +48,7 @@ "driver": "vendor", "pin": "GP20" }, + "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { "layout": [ From 45bec42355c2f9e8c7cfe03f3f638d2e88e09c21 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 21:18:51 +0100 Subject: [PATCH 17/24] Stab in the dark on adding multiple layouts --- keyboards/tweetydabird/chameleon/info.json | 513 ++++++++++++++++++++- 1 file changed, 512 insertions(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 0064043de4d9..27f5afe625e5 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -48,8 +48,65 @@ "driver": "vendor", "pin": "GP20" }, - "community_layouts": ["ortho_5x12"], + "community_layouts": ["ortho_5x12", "ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC", + "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" + }, "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] + }, "LAYOUT_ortho_5x12": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -113,6 +170,460 @@ {"matrix": [9, 1], "x": 10, "y": 4}, {"matrix": [9, 0], "x": 11, "y": 4} ] + }, + "LAYOUT_planck_1x2uC": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] + }, + "LAYOUT_planck_1x2uL": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] + }, + "LAYOUT_planck_1x2uR": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] + }, + "LAYOUT_planck_2x2u": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] + }, + "LAYOUT_preonic_1x2uC": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [9, 4], "x": 7, "y": 4}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_preonic_1x2uL": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 5], "x": 5, "y": 4}, + {"matrix": [9, 5], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_preonic_1x2uR": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 6, "y": 4}, + {"matrix": [9, 4], "x": 7, "y": 4}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_preonic_2x2u": { + "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": [1, 5], "x": 6, "y": 0}, + {"matrix": [1, 4], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 5], "x": 6, "y": 1}, + {"matrix": [3, 4], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 1], "x": 10, "y": 1}, + {"matrix": [3, 0], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 5], "x": 6, "y": 2}, + {"matrix": [5, 4], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 1], "x": 10, "y": 2}, + {"matrix": [5, 0], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] } } } \ No newline at end of file From cc2b23e8fbf4ae2a0ff12ddc02bc066dd7c96b5b Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Thu, 9 Nov 2023 21:27:28 +0100 Subject: [PATCH 18/24] Imgur link --- keyboards/tweetydabird/chameleon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index e28b40490ef2..0d7d6d882e73 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -1,6 +1,6 @@ # Chameleon -![chameleon](https://lectronz.com/lectronz/active_storage/representations/redirect/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBBalFoIiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--4be3beffa89240abba6874d8ef242fc7b0b10994/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaDdCem9MWm05eWJXRjBTU0lKU2xCRlJ3WTZCa1ZVT2hSeVpYTnBlbVZmZEc5ZmJHbHRhWFJiQjJrQ3dBTnBBb0FDIiwiZXhwIjpudWxsLCJwdXIiOiJ2YXJpYXRpb24ifX0=--3e445397da8bf51b531321877b7934091a51a638/IMG_1311.JPEG) +![chameleon](https://imgur.com/a/WNtE4U6) Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts. From f8b73863a96d93eaea76906d86acb6f452dc1f1f Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 21:47:41 +0100 Subject: [PATCH 19/24] Update keyboards/tweetydabird/chameleon/readme.md Co-authored-by: Duncan Sutherland --- keyboards/tweetydabird/chameleon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index 0d7d6d882e73..a6297d6e50c1 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -1,6 +1,6 @@ # Chameleon -![chameleon](https://imgur.com/a/WNtE4U6) +![chameleon](https://i.imgur.com/BEAzgK8h.jpeg) Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts. From cf6fa5bfa4a63b48d86f66d038a540858ae484a6 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Thu, 9 Nov 2023 21:56:10 +0100 Subject: [PATCH 20/24] Apply suggestions from code review Co-authored-by: Duncan Sutherland --- keyboards/tweetydabird/chameleon/info.json | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 27f5afe625e5..84407709be2e 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -49,11 +49,6 @@ "pin": "GP20" }, "community_layouts": ["ortho_5x12", "ortho_4x12", "planck_mit"], - "layout_aliases": { - "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", - "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC", - "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" - }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ @@ -171,7 +166,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_planck_1x2uC": { + "LAYOUT_planck_mit": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -222,7 +217,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_planck_1x2uL": { + "LAYOUT_ortho_4x12_1x2uL": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -273,7 +268,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_planck_1x2uR": { + "LAYOUT_ortho_4x12_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -324,7 +319,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_planck_2x2u": { + "LAYOUT_ortho_4x12_2x2u": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -374,7 +369,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_preonic_1x2uC": { + "LAYOUT_ortho_5x12_1x2uC": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -437,7 +432,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_preonic_1x2uL": { + "LAYOUT_ortho_5x12_1x2uL": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -500,7 +495,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_preonic_1x2uR": { + "LAYOUT_ortho_5x12_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -563,7 +558,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_preonic_2x2u": { + "LAYOUT_ortho_5x12_2x2u": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -626,4 +621,4 @@ ] } } -} \ No newline at end of file +} From 19376b06b9af3872864992ad8ea31dfd7e966c5e Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Fri, 10 Nov 2023 20:50:04 +0100 Subject: [PATCH 21/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Duncan Sutherland --- keyboards/tweetydabird/chameleon/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index 84407709be2e..e53b7f9b9de3 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -432,7 +432,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_ortho_5x12_1x2uL": { + "LAYOUT_preonic_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -495,7 +495,7 @@ {"matrix": [9, 0], "x": 11, "y": 4} ] }, - "LAYOUT_ortho_5x12_1x2uR": { + "LAYOUT_preonic_1x2uL": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From af7d1ced97085903e914e632bcaadcc5cfb8df11 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Fri, 10 Nov 2023 20:50:14 +0100 Subject: [PATCH 22/24] Update keyboards/tweetydabird/chameleon/info.json Co-authored-by: Duncan Sutherland --- keyboards/tweetydabird/chameleon/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index e53b7f9b9de3..bab4215bfa08 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -217,7 +217,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_ortho_4x12_1x2uL": { + "LAYOUT_ortho_4x12_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -268,7 +268,7 @@ {"matrix": [7, 0], "x": 11, "y": 3} ] }, - "LAYOUT_ortho_4x12_1x2uR": { + "LAYOUT_ortho_4x12_1x2uL": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From 4ea76cb18aefad6f03b60decbd7253632e4ec484 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Sat, 11 Nov 2023 11:43:33 +0100 Subject: [PATCH 23/24] Updated readme --- keyboards/tweetydabird/chameleon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/readme.md b/keyboards/tweetydabird/chameleon/readme.md index a6297d6e50c1..0d8693c8ff11 100644 --- a/keyboards/tweetydabird/chameleon/readme.md +++ b/keyboards/tweetydabird/chameleon/readme.md @@ -2,7 +2,7 @@ ![chameleon](https://i.imgur.com/BEAzgK8h.jpeg) -Chameleon is a 46-60 Key Grid Ortho Keyboard with optional 5x12 or 4x12 layouts. +Chameleon is a 46-60 Key Grid Ortho Keyboard that can be built as both 5x12 and 4x12 with several optional bottom row layouts. * Keyboard Maintainer: [TweetyDaBird](https://github.com/TweetyDaBird) * Hardware Supported: Chameleon 46-60 key PCB From 774fa8391382ddf3359bd2a26d6a629f2edeea7c Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Sun, 12 Nov 2023 21:33:42 +0100 Subject: [PATCH 24/24] Update info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/chameleon/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/info.json index bab4215bfa08..f6ee51d5bbd0 100644 --- a/keyboards/tweetydabird/chameleon/info.json +++ b/keyboards/tweetydabird/chameleon/info.json @@ -1,6 +1,6 @@ { "manufacturer": "Tweetys Wild Thinking", - "keyboard_name": "Chameleon (QMK)", + "keyboard_name": "Chameleon", "maintainer": "TweetyDaBird", "bootloader": "rp2040", "diode_direction": "COL2ROW",