From f1455bdfe48f614144bdd2e9c24b014bda66e287 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:48:55 -0600 Subject: [PATCH 01/15] Adding the Bento Box macropad --- keyboards/synthandkeys/bento_box/config.h | 27 ++++++++ keyboards/synthandkeys/bento_box/info.json | 54 +++++++++++++++ .../bento_box/keymaps/default/keymap.c | 66 +++++++++++++++++++ keyboards/synthandkeys/bento_box/readme.md | 26 ++++++++ keyboards/synthandkeys/bento_box/rules.mk | 4 ++ 5 files changed, 177 insertions(+) create mode 100644 keyboards/synthandkeys/bento_box/config.h create mode 100644 keyboards/synthandkeys/bento_box/info.json create mode 100644 keyboards/synthandkeys/bento_box/keymaps/default/keymap.c create mode 100644 keyboards/synthandkeys/bento_box/readme.md create mode 100644 keyboards/synthandkeys/bento_box/rules.mk diff --git a/keyboards/synthandkeys/bento_box/config.h b/keyboards/synthandkeys/bento_box/config.h new file mode 100644 index 000000000000..a8a83dfee63e --- /dev/null +++ b/keyboards/synthandkeys/bento_box/config.h @@ -0,0 +1,27 @@ +// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define NUMBER_OF_ENCODERS 3 +#define ENCODERS_PAD_A { B2, A13, A15} +#define ENCODERS_PAD_B { B1, A14, B3} + +#define BOOTMAGIC_LITE_ROW 2 +#define BOOTMAGIC_LITE_COLUMN 0 + +/* + * 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 diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json new file mode 100644 index 000000000000..f362794de8cb --- /dev/null +++ b/keyboards/synthandkeys/bento_box/info.json @@ -0,0 +1,54 @@ +{ + "manufacturer": "Synth-and-Keys", + "keyboard_name": "bento_box", + "maintainer": "Synth-and-Keys", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + [null, null, null, "A9", "A8"], + [null, "B10", null, "B9", "B6"], + ["B0","A5","A2", null, null], + ["A7","A4","A1","B8","B5"], + ["A6","A3","A0","B7","B4"] + ] + }, + "processor": "STM32F072", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "matrix": [1, 1], "x": 1, "y": 0.5}, + { "matrix": [1, 3], "x": 3.5, "y": 1}, + { "matrix": [1, 4], "x": 4.5, "y": 1}, + { "matrix": [2, 0], "x": 0, "y": 2}, + { "matrix": [2, 1], "x": 1, "y": 2}, + { "matrix": [2, 2], "x": 2, "y": 2}, + { "matrix": [3, 0], "x": 0, "y": 3}, + { "matrix": [3, 1], "x": 1, "y": 3}, + { "matrix": [3, 2], "x": 2, "y": 3}, + { "matrix": [3, 3], "x": 3.5, "y": 2.5}, + { "matrix": [3, 4], "x": 4.5, "y": 2.5}, + { "matrix": [4, 0], "x": 0, "y": 4}, + { "matrix": [4, 1], "x": 1, "y": 4}, + { "matrix": [4, 2], "x": 2, "y": 4}, + { "matrix": [4, 3], "x": 3.5, "y": 3.5, "h": 1.5}, + { "matrix": [4, 4], "x": 4.5, "y": 3.5, "h": 1.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c new file mode 100644 index 000000000000..8fe0cc6b10ca --- /dev/null +++ b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c @@ -0,0 +1,66 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ---------------------------------------------------------------- + * | | | | Ctrl+0 | GUI+Shift+S | + * ---------------------------------------------------------------- + * | | Mute | | Copy | Paste | + * ---------------------------------------------------------------- + * | Prev | Pause | Next | | | + * ---------------------------------------------------------------- + * | Home | Up | End | Ctrl+T | Ctrl+W | + * ---------------------------------------------------------------- + * | Left | Down | Right | Shift+Alt+Tab | Alt+Tab | + * ---------------------------------------------------------------- + */ + [0] = LAYOUT( + (C(KC_0)), (G(S(KC_S))), + KC_MUTE, (C(KC_C)), (C(KC_V)), + KC_MPRV, KC_MPLY, KC_MNXT, + KC_HOME, KC_UP, KC_END, (C(KC_T)), (C(KC_W)), + KC_LEFT, KC_DOWN, KC_RIGHT, (S(C(KC_TAB))), (C(KC_TAB)) + ) +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { +/* MAIN ENCODER */ + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } +/* TOP LEFT*/ + else if (index == 1) { + if (clockwise) { + tap_code16(C(KC_EQUAL)); + } else { + tap_code16(C(KC_MINUS)); + } + } +/* TOP RIGHT*/ + else if (index == 2) { + if (clockwise) { + tap_code16(C(KC_Y)); + } else { + tap_code16(C(KC_Z)); + } + } + return true; +} + + /* LAYER TEMPLATE + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + */ \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md new file mode 100644 index 000000000000..0e7fc7393def --- /dev/null +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -0,0 +1,26 @@ +# bento_box + +![bento_box](https://imgur.com/a/udxikUT) + +The Bento Box is a 15-key, 3-encoder macropad running on QMK. + +* Keyboard Maintainer: [Synth-and-Keys](https://github.com/Synth-and-Keys) +* Hardware Supported: Bento Box PCB +* Hardware Availability: https://www.etsy.com/shop/SynthandKeys + +Make example for this keyboard (after setting up your build environment): + + make bento_box:default + +Flashing example for this keyboard: + + make bento_box: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 2 ways: + +* **Bootmagic reset**: Hold down the top left key in the group of 9 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 diff --git a/keyboards/synthandkeys/bento_box/rules.mk b/keyboards/synthandkeys/bento_box/rules.mk new file mode 100644 index 000000000000..afdc3fd479ff --- /dev/null +++ b/keyboards/synthandkeys/bento_box/rules.mk @@ -0,0 +1,4 @@ +ENCODER_ENABLE = yes +BOOTMAGIC_ENABLE = yes +BOOTLOADER = stm32-dfu +MCU = STM32F072 \ No newline at end of file From dbdaa11633bbe5953225328eedd635196a17293d Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:26:00 -0600 Subject: [PATCH 02/15] Add files via upload --- keyboards/synthandkeys/bento_box/info.json | 14 +++++++++++++- .../bento_box/keymaps/default/keymap.c | 3 +++ keyboards/synthandkeys/bento_box/readme.md | 4 ++-- keyboards/synthandkeys/bento_box/rules.mk | 5 +---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index f362794de8cb..629c204d4462 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -5,11 +5,13 @@ "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { + "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "encoder": true }, "matrix_pins": { "direct": [ @@ -20,6 +22,16 @@ ["A6","A3","A0","B7","B4"] ] }, + "encoder": { + "rotary": [ + { "pin_a": "B2", "pin_b": "B1" }, + { "pin_a": "A13", "pin_b": "A14" }, + { "pin_a": "A15", "pin_b": "B3" } + ] + }, + "bootmagic": { + "matrix": [2, 0] + }, "processor": "STM32F072", "url": "", "usb": { diff --git a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c index 8fe0cc6b10ca..8d1f3c01c5d3 100644 --- a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c +++ b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md index 0e7fc7393def..f1f0dd98aee7 100644 --- a/keyboards/synthandkeys/bento_box/readme.md +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -10,11 +10,11 @@ The Bento Box is a 15-key, 3-encoder macropad running on QMK. Make example for this keyboard (after setting up your build environment): - make bento_box:default + make synthandkeys/bento_box:default Flashing example for this keyboard: - make bento_box:default:flash + make synthandkeys/bento_box:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/synthandkeys/bento_box/rules.mk b/keyboards/synthandkeys/bento_box/rules.mk index afdc3fd479ff..7ff128fa692e 100644 --- a/keyboards/synthandkeys/bento_box/rules.mk +++ b/keyboards/synthandkeys/bento_box/rules.mk @@ -1,4 +1 @@ -ENCODER_ENABLE = yes -BOOTMAGIC_ENABLE = yes -BOOTLOADER = stm32-dfu -MCU = STM32F072 \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 93439ac0636312528d28953e360537fbb17ef4c6 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:26:41 -0600 Subject: [PATCH 03/15] Delete config.h --- keyboards/synthandkeys/bento_box/config.h | 27 ----------------------- 1 file changed, 27 deletions(-) delete mode 100644 keyboards/synthandkeys/bento_box/config.h diff --git a/keyboards/synthandkeys/bento_box/config.h b/keyboards/synthandkeys/bento_box/config.h deleted file mode 100644 index a8a83dfee63e..000000000000 --- a/keyboards/synthandkeys/bento_box/config.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define NUMBER_OF_ENCODERS 3 -#define ENCODERS_PAD_A { B2, A13, A15} -#define ENCODERS_PAD_B { B1, A14, B3} - -#define BOOTMAGIC_LITE_ROW 2 -#define BOOTMAGIC_LITE_COLUMN 0 - -/* - * 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 From 9b178988bbd4ff7fbc89cec0758d5df0202b2f53 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:29:27 -0600 Subject: [PATCH 04/15] Small Updates to readme --- keyboards/synthandkeys/bento_box/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md index f1f0dd98aee7..e2b21234ce10 100644 --- a/keyboards/synthandkeys/bento_box/readme.md +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -1,6 +1,6 @@ -# bento_box +# synthandkeys/bento_box -![bento_box](https://imgur.com/a/udxikUT) +![synthandkeys/bento_box](https://i.imgur.com/J8NkYO8.jpeg) The Bento Box is a 15-key, 3-encoder macropad running on QMK. From 27ad63f4fd46eda57497783ff6cc480a57279d68 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:31:11 -0600 Subject: [PATCH 05/15] Add files via upload --- keyboards/synthandkeys/bento_box/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md index e2b21234ce10..8aa70161e5b2 100644 --- a/keyboards/synthandkeys/bento_box/readme.md +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -23,4 +23,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: * **Bootmagic reset**: Hold down the top left key in the group of 9 and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset button**: Hold down the reset button on the back of the PCB for 5 seconds and release From 9775f590eb55b2e39930aab5347386aac1792c4f Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Sat, 22 Apr 2023 14:10:37 -0600 Subject: [PATCH 06/15] Revision updates. Adding bento_box.c --- keyboards/synthandkeys/bento_box/bento_box.c | 30 +++++++++++++++++++ .../bento_box/keymaps/default/keymap.c | 28 ----------------- keyboards/synthandkeys/bento_box/readme.md | 2 +- 3 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 keyboards/synthandkeys/bento_box/bento_box.c diff --git a/keyboards/synthandkeys/bento_box/bento_box.c b/keyboards/synthandkeys/bento_box/bento_box.c new file mode 100644 index 000000000000..c1061baae9bf --- /dev/null +++ b/keyboards/synthandkeys/bento_box/bento_box.c @@ -0,0 +1,30 @@ +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } +/*Main Encoder*/ + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } +/* TOP LEFT*/ + else if (index == 1) { + if (clockwise) { + tap_code16(C(KC_EQUAL)); + } else { + tap_code16(C(KC_MINUS)); + } + } +/* TOP RIGHT*/ + else if (index == 2) { + if (clockwise) { + tap_code16(C(KC_Y)); + } else { + tap_code16(C(KC_Z)); + } + } + return true; +} +#endif \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c index 8d1f3c01c5d3..39ca4ddc0a2b 100644 --- a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c +++ b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c @@ -26,34 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool encoder_update_user(uint8_t index, bool clockwise) { -/* MAIN ENCODER */ - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } -/* TOP LEFT*/ - else if (index == 1) { - if (clockwise) { - tap_code16(C(KC_EQUAL)); - } else { - tap_code16(C(KC_MINUS)); - } - } -/* TOP RIGHT*/ - else if (index == 2) { - if (clockwise) { - tap_code16(C(KC_Y)); - } else { - tap_code16(C(KC_Z)); - } - } - return true; -} - /* LAYER TEMPLATE * ------------------------------------ * | | | | | | diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md index 8aa70161e5b2..b07a4f2de718 100644 --- a/keyboards/synthandkeys/bento_box/readme.md +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -1,6 +1,6 @@ # synthandkeys/bento_box -![synthandkeys/bento_box](https://i.imgur.com/J8NkYO8.jpeg) +![synthandkeys/bento_box](https://i.imgur.com/J8NkYO8h.jpeg) The Bento Box is a 15-key, 3-encoder macropad running on QMK. From aa25faeb96804d8de8036f25cda88f3c61d58c61 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Sun, 23 Apr 2023 18:49:24 -0600 Subject: [PATCH 07/15] Revising keyboard.c --- keyboards/synthandkeys/bento_box/bento_box.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/synthandkeys/bento_box/bento_box.c b/keyboards/synthandkeys/bento_box/bento_box.c index c1061baae9bf..b7cbedbadcc6 100644 --- a/keyboards/synthandkeys/bento_box/bento_box.c +++ b/keyboards/synthandkeys/bento_box/bento_box.c @@ -1,3 +1,8 @@ +// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } From dcdfee508cb2d456e9284066296fb246a800b169 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:14:42 -0600 Subject: [PATCH 08/15] Formatting changes --- keyboards/synthandkeys/bento_box/bento_box.c | 10 +-- keyboards/synthandkeys/bento_box/info.json | 71 +++++++++++--------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/bento_box.c b/keyboards/synthandkeys/bento_box/bento_box.c index b7cbedbadcc6..e073ba6d98c5 100644 --- a/keyboards/synthandkeys/bento_box/bento_box.c +++ b/keyboards/synthandkeys/bento_box/bento_box.c @@ -5,8 +5,10 @@ #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } -/*Main Encoder*/ + if (!encoder_update_user(index, clockwise)) { + return false; + } + /*Main Encoder*/ if (index == 0) { if (clockwise) { tap_code(KC_VOLU); @@ -14,7 +16,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { tap_code(KC_VOLD); } } -/* TOP LEFT*/ + /* TOP LEFT*/ else if (index == 1) { if (clockwise) { tap_code16(C(KC_EQUAL)); @@ -22,7 +24,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { tap_code16(C(KC_MINUS)); } } -/* TOP RIGHT*/ + /* TOP RIGHT*/ else if (index == 2) { if (clockwise) { tap_code16(C(KC_Y)); diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index 629c204d4462..61219d940989 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -3,35 +3,44 @@ "keyboard_name": "bento_box", "maintainer": "Synth-and-Keys", "bootloader": "stm32-dfu", + "bootmagic": { + "matrix": [2, 0] + }, "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + { + "pin_a": "B2", + "pin_b": "B1" + }, + { + "pin_a": "A13", + "pin_b": "A14" + }, + { + "pin_a": "A15", + "pin_b": "B3" + } + ] + }, "features": { "bootmagic": true, "command": false, "console": false, + "encoder": true, "extrakey": true, "mousekey": true, - "nkro": true, - "encoder": true + "nkro": true }, "matrix_pins": { "direct": [ [null, null, null, "A9", "A8"], [null, "B10", null, "B9", "B6"], - ["B0","A5","A2", null, null], - ["A7","A4","A1","B8","B5"], - ["A6","A3","A0","B7","B4"] + ["B0", "A5", "A2", null, null], + ["A7", "A4", "A1", "B8", "B5"], + ["A6", "A3", "A0", "B7", "B4"] ] }, - "encoder": { - "rotary": [ - { "pin_a": "B2", "pin_b": "B1" }, - { "pin_a": "A13", "pin_b": "A14" }, - { "pin_a": "A15", "pin_b": "B3" } - ] - }, - "bootmagic": { - "matrix": [2, 0] - }, "processor": "STM32F072", "url": "", "usb": { @@ -44,22 +53,22 @@ "layout": [ { "matrix": [0, 3], "x": 3.5, "y": 0 }, { "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "matrix": [1, 1], "x": 1, "y": 0.5}, - { "matrix": [1, 3], "x": 3.5, "y": 1}, - { "matrix": [1, 4], "x": 4.5, "y": 1}, - { "matrix": [2, 0], "x": 0, "y": 2}, - { "matrix": [2, 1], "x": 1, "y": 2}, - { "matrix": [2, 2], "x": 2, "y": 2}, - { "matrix": [3, 0], "x": 0, "y": 3}, - { "matrix": [3, 1], "x": 1, "y": 3}, - { "matrix": [3, 2], "x": 2, "y": 3}, - { "matrix": [3, 3], "x": 3.5, "y": 2.5}, - { "matrix": [3, 4], "x": 4.5, "y": 2.5}, - { "matrix": [4, 0], "x": 0, "y": 4}, - { "matrix": [4, 1], "x": 1, "y": 4}, - { "matrix": [4, 2], "x": 2, "y": 4}, - { "matrix": [4, 3], "x": 3.5, "y": 3.5, "h": 1.5}, - { "matrix": [4, 4], "x": 4.5, "y": 3.5, "h": 1.5} + { "matrix": [1, 1], "x": 1, "y": 0.5 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3.5, "y": 2.5 }, + { "matrix": [3, 4], "x": 4.5, "y": 2.5 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "x": 2, "y": 4 }, + { "h": 1.5, "matrix": [4, 3], "x": 3.5, "y": 3.5 }, + { "h": 1.5, "matrix": [4, 4], "x": 4.5, "y": 3.5 } ] } } From bfec6a30b881952333cf85609991a3db45226124 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:19:50 -0600 Subject: [PATCH 09/15] More formatting changes --- keyboards/synthandkeys/bento_box/bento_box.c | 72 ++++----- keyboards/synthandkeys/bento_box/info.json | 148 +++++++++---------- keyboards/synthandkeys/bento_box/readme.md | 52 +++---- 3 files changed, 136 insertions(+), 136 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/bento_box.c b/keyboards/synthandkeys/bento_box/bento_box.c index e073ba6d98c5..5ef0678f5ec5 100644 --- a/keyboards/synthandkeys/bento_box/bento_box.c +++ b/keyboards/synthandkeys/bento_box/bento_box.c @@ -1,37 +1,37 @@ -// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "quantum.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - /*Main Encoder*/ - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - /* TOP LEFT*/ - else if (index == 1) { - if (clockwise) { - tap_code16(C(KC_EQUAL)); - } else { - tap_code16(C(KC_MINUS)); - } - } - /* TOP RIGHT*/ - else if (index == 2) { - if (clockwise) { - tap_code16(C(KC_Y)); - } else { - tap_code16(C(KC_Z)); - } - } - return true; -} +// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + /*Main Encoder*/ + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + /* TOP LEFT*/ + else if (index == 1) { + if (clockwise) { + tap_code16(C(KC_EQUAL)); + } else { + tap_code16(C(KC_MINUS)); + } + } + /* TOP RIGHT*/ + else if (index == 2) { + if (clockwise) { + tap_code16(C(KC_Y)); + } else { + tap_code16(C(KC_Z)); + } + } + return true; +} #endif \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index 61219d940989..5c9aeec8d2ed 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -1,75 +1,75 @@ -{ - "manufacturer": "Synth-and-Keys", - "keyboard_name": "bento_box", - "maintainer": "Synth-and-Keys", - "bootloader": "stm32-dfu", - "bootmagic": { - "matrix": [2, 0] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - { - "pin_a": "B2", - "pin_b": "B1" - }, - { - "pin_a": "A13", - "pin_b": "A14" - }, - { - "pin_a": "A15", - "pin_b": "B3" - } - ] - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "direct": [ - [null, null, null, "A9", "A8"], - [null, "B10", null, "B9", "B6"], - ["B0", "A5", "A2", null, null], - ["A7", "A4", "A1", "B8", "B5"], - ["A6", "A3", "A0", "B7", "B4"] - ] - }, - "processor": "STM32F072", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "matrix": [1, 1], "x": 1, "y": 0.5 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3.5, "y": 2.5 }, - { "matrix": [3, 4], "x": 4.5, "y": 2.5 }, - { "matrix": [4, 0], "x": 0, "y": 4 }, - { "matrix": [4, 1], "x": 1, "y": 4 }, - { "matrix": [4, 2], "x": 2, "y": 4 }, - { "h": 1.5, "matrix": [4, 3], "x": 3.5, "y": 3.5 }, - { "h": 1.5, "matrix": [4, 4], "x": 4.5, "y": 3.5 } - ] - } - } +{ + "manufacturer": "Synth-and-Keys", + "keyboard_name": "bento_box", + "maintainer": "Synth-and-Keys", + "bootloader": "stm32-dfu", + "bootmagic": { + "matrix": [2, 0] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + { + "pin_a": "B2", + "pin_b": "B1" + }, + { + "pin_a": "A13", + "pin_b": "A14" + }, + { + "pin_a": "A15", + "pin_b": "B3" + } + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + [null, null, null, "A9", "A8"], + [null, "B10", null, "B9", "B6"], + ["B0", "A5", "A2", null, null], + ["A7", "A4", "A1", "B8", "B5"], + ["A6", "A3", "A0", "B7", "B4"] + ] + }, + "processor": "STM32F072", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "matrix": [1, 1], "x": 1, "y": 0.5 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3.5, "y": 2.5 }, + { "matrix": [3, 4], "x": 4.5, "y": 2.5 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "x": 2, "y": 4 }, + { "h": 1.5, "matrix": [4, 3], "x": 3.5, "y": 3.5 }, + { "h": 1.5, "matrix": [4, 4], "x": 4.5, "y": 3.5 } + ] + } + } } \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md index b07a4f2de718..32ce47a01374 100644 --- a/keyboards/synthandkeys/bento_box/readme.md +++ b/keyboards/synthandkeys/bento_box/readme.md @@ -1,26 +1,26 @@ -# synthandkeys/bento_box - -![synthandkeys/bento_box](https://i.imgur.com/J8NkYO8h.jpeg) - -The Bento Box is a 15-key, 3-encoder macropad running on QMK. - -* Keyboard Maintainer: [Synth-and-Keys](https://github.com/Synth-and-Keys) -* Hardware Supported: Bento Box PCB -* Hardware Availability: https://www.etsy.com/shop/SynthandKeys - -Make example for this keyboard (after setting up your build environment): - - make synthandkeys/bento_box:default - -Flashing example for this keyboard: - - make synthandkeys/bento_box: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 2 ways: - -* **Bootmagic reset**: Hold down the top left key in the group of 9 and plug in the keyboard -* **Physical reset button**: Hold down the reset button on the back of the PCB for 5 seconds and release +# synthandkeys/bento_box + +![synthandkeys/bento_box](https://i.imgur.com/J8NkYO8h.jpeg) + +The Bento Box is a 15-key, 3-encoder macropad running on QMK. + +* Keyboard Maintainer: [Synth-and-Keys](https://github.com/Synth-and-Keys) +* Hardware Supported: Bento Box PCB +* Hardware Availability: https://www.etsy.com/shop/SynthandKeys + +Make example for this keyboard (after setting up your build environment): + + make synthandkeys/bento_box:default + +Flashing example for this keyboard: + + make synthandkeys/bento_box: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 2 ways: + +* **Bootmagic reset**: Hold down the top left key in the group of 9 and plug in the keyboard +* **Physical reset button**: Hold down the reset button on the back of the PCB for 5 seconds and release From 5f013b478c3a956f476b788fdc5b9a5257bbbdac Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Tue, 9 May 2023 20:33:30 -0600 Subject: [PATCH 10/15] Small changes to info.json --- keyboards/synthandkeys/bento_box/info.json | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index 5c9aeec8d2ed..b93f3adca22d 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -9,18 +9,9 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - { - "pin_a": "B2", - "pin_b": "B1" - }, - { - "pin_a": "A13", - "pin_b": "A14" - }, - { - "pin_a": "A15", - "pin_b": "B3" - } + {"pin_a": "B2","pin_b": "B1"}, + {"pin_a": "A13","pin_b": "A14"}, + {"pin_a": "A15","pin_b": "B3"} ] }, "features": { @@ -67,8 +58,8 @@ { "matrix": [4, 0], "x": 0, "y": 4 }, { "matrix": [4, 1], "x": 1, "y": 4 }, { "matrix": [4, 2], "x": 2, "y": 4 }, - { "h": 1.5, "matrix": [4, 3], "x": 3.5, "y": 3.5 }, - { "h": 1.5, "matrix": [4, 4], "x": 4.5, "y": 3.5 } + { "matrix": [4, 3], "x": 3.5, "y": 3.5, "h": 1.5}, + { "matrix": [4, 4], "x": 4.5, "y": 3.5, "h": 1.5} ] } } From a205e58db1a4d595e46f1ec119108b7daa292281 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:53:50 -0600 Subject: [PATCH 11/15] Changes to Info and Keymap --- keyboards/synthandkeys/bento_box/info.json | 6 ++-- keyboards/synthandkeys/bento_box/keymap.c | 41 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 keyboards/synthandkeys/bento_box/keymap.c diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index b93f3adca22d..546ff5c8eda0 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -25,9 +25,9 @@ }, "matrix_pins": { "direct": [ - [null, null, null, "A9", "A8"], - [null, "B10", null, "B9", "B6"], - ["B0", "A5", "A2", null, null], + ["A9", "A8"], + ["B9", "B6"], + ["B0", "A5", "A2"], ["A7", "A4", "A1", "B8", "B5"], ["A6", "A3", "A0", "B7", "B4"] ] diff --git a/keyboards/synthandkeys/bento_box/keymap.c b/keyboards/synthandkeys/bento_box/keymap.c new file mode 100644 index 000000000000..bf8f26984bf8 --- /dev/null +++ b/keyboards/synthandkeys/bento_box/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ---------------------------------------------------------------- + * | | | | Ctrl+0 | GUI+Shift+S | + * ---------------------------------------------------------------- + * | | Mute | | Copy | Paste | + * ---------------------------------------------------------------- + * | Prev | Pause | Next | | | + * ---------------------------------------------------------------- + * | Home | Up | End | Ctrl+T | Ctrl+W | + * ---------------------------------------------------------------- + * | Left | Down | Right | Shift+Alt+Tab | Alt+Tab | + * ---------------------------------------------------------------- + */ + [0] = LAYOUT( + C(KC_0), G(S(KC_S)), + KC_MUTE, C(KC_C), C(KC_V), + KC_MPRV, KC_MPLY, KC_MNXT, + KC_HOME, KC_UP, KC_END, C(KC_T), C(KC_W), + KC_LEFT, KC_DOWN, KC_RIGHT, S(C(KC_TAB)), C(KC_TAB) + ) +}; + + /* LAYER TEMPLATE + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + * | | | | | | + * ------------------------------------ + */ \ No newline at end of file From 01a8565c94197dcf1de80e4d305fe7d7306dc6b3 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:54:35 -0600 Subject: [PATCH 12/15] Delete keymap.c --- keyboards/synthandkeys/bento_box/keymap.c | 41 ----------------------- 1 file changed, 41 deletions(-) delete mode 100644 keyboards/synthandkeys/bento_box/keymap.c diff --git a/keyboards/synthandkeys/bento_box/keymap.c b/keyboards/synthandkeys/bento_box/keymap.c deleted file mode 100644 index bf8f26984bf8..000000000000 --- a/keyboards/synthandkeys/bento_box/keymap.c +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2023 Synth-and-Keys (@Synth-and-Keys) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ---------------------------------------------------------------- - * | | | | Ctrl+0 | GUI+Shift+S | - * ---------------------------------------------------------------- - * | | Mute | | Copy | Paste | - * ---------------------------------------------------------------- - * | Prev | Pause | Next | | | - * ---------------------------------------------------------------- - * | Home | Up | End | Ctrl+T | Ctrl+W | - * ---------------------------------------------------------------- - * | Left | Down | Right | Shift+Alt+Tab | Alt+Tab | - * ---------------------------------------------------------------- - */ - [0] = LAYOUT( - C(KC_0), G(S(KC_S)), - KC_MUTE, C(KC_C), C(KC_V), - KC_MPRV, KC_MPLY, KC_MNXT, - KC_HOME, KC_UP, KC_END, C(KC_T), C(KC_W), - KC_LEFT, KC_DOWN, KC_RIGHT, S(C(KC_TAB)), C(KC_TAB) - ) -}; - - /* LAYER TEMPLATE - * ------------------------------------ - * | | | | | | - * ------------------------------------ - * | | | | | | - * ------------------------------------ - * | | | | | | - * ------------------------------------ - * | | | | | | - * ------------------------------------ - * | | | | | | - * ------------------------------------ - */ \ No newline at end of file From 9462a6b9dca6add681d4e01c0213e9483dda1db5 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:54:51 -0600 Subject: [PATCH 13/15] Add files via upload --- keyboards/synthandkeys/bento_box/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c index 39ca4ddc0a2b..bf8f26984bf8 100644 --- a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c +++ b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c @@ -18,11 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ---------------------------------------------------------------- */ [0] = LAYOUT( - (C(KC_0)), (G(S(KC_S))), - KC_MUTE, (C(KC_C)), (C(KC_V)), + C(KC_0), G(S(KC_S)), + KC_MUTE, C(KC_C), C(KC_V), KC_MPRV, KC_MPLY, KC_MNXT, - KC_HOME, KC_UP, KC_END, (C(KC_T)), (C(KC_W)), - KC_LEFT, KC_DOWN, KC_RIGHT, (S(C(KC_TAB))), (C(KC_TAB)) + KC_HOME, KC_UP, KC_END, C(KC_T), C(KC_W), + KC_LEFT, KC_DOWN, KC_RIGHT, S(C(KC_TAB)), C(KC_TAB) ) }; From 580deeafb3d52ee26168ac219087c076491d32b3 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Fri, 21 Jul 2023 14:57:11 -0600 Subject: [PATCH 14/15] Add files via upload --- keyboards/synthandkeys/bento_box/info.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index 546ff5c8eda0..11d112493689 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -25,11 +25,9 @@ }, "matrix_pins": { "direct": [ - ["A9", "A8"], - ["B9", "B6"], - ["B0", "A5", "A2"], - ["A7", "A4", "A1", "B8", "B5"], - ["A6", "A3", "A0", "B7", "B4"] + ["A9", "A8", "B9", "B6", "B0", "A5"], + ["A2", "A7", "A4", "A1", "B8", "B5"], + ["A6", "A3", "A0", "B7", "B4", null] ] }, "processor": "STM32F072", From 20d3fe2269a3d8f285d45ae90264b738fde34347 Mon Sep 17 00:00:00 2001 From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com> Date: Fri, 21 Jul 2023 19:07:15 -0600 Subject: [PATCH 15/15] Add files via upload --- keyboards/synthandkeys/bento_box/info.json | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json index 11d112493689..3cdc7a587083 100644 --- a/keyboards/synthandkeys/bento_box/info.json +++ b/keyboards/synthandkeys/bento_box/info.json @@ -25,9 +25,9 @@ }, "matrix_pins": { "direct": [ - ["A9", "A8", "B9", "B6", "B0", "A5"], - ["A2", "A7", "A4", "A1", "B8", "B5"], - ["A6", "A3", "A0", "B7", "B4", null] + [ "A9", "A8", "B10", "B9", "B6", "B0"], + [ "A5", "A2", "A7", "A4", "A1", "B8"], + [ "B5", "A6", "A3", "A0", "B7", "B4"] ] }, "processor": "STM32F072", @@ -40,24 +40,24 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "matrix": [1, 1], "x": 1, "y": 0.5 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3.5, "y": 2.5 }, - { "matrix": [3, 4], "x": 4.5, "y": 2.5 }, - { "matrix": [4, 0], "x": 0, "y": 4 }, - { "matrix": [4, 1], "x": 1, "y": 4 }, - { "matrix": [4, 2], "x": 2, "y": 4 }, - { "matrix": [4, 3], "x": 3.5, "y": 3.5, "h": 1.5}, - { "matrix": [4, 4], "x": 4.5, "y": 3.5, "h": 1.5} + { "matrix": [0, 0], "x": 3.5, "y": 0 }, + { "matrix": [0, 1], "x": 4.5, "y": 0 }, + { "matrix": [0, 2], "x": 1, "y": 0.5 }, + { "matrix": [0, 3], "x": 3.5, "y": 1 }, + { "matrix": [0, 4], "x": 4.5, "y": 1 }, + { "matrix": [0, 5], "x": 0, "y": 2 }, + { "matrix": [1, 0], "x": 1, "y": 2 }, + { "matrix": [1, 1], "x": 2, "y": 2 }, + { "matrix": [1, 2], "x": 0, "y": 3 }, + { "matrix": [1, 3], "x": 1, "y": 3 }, + { "matrix": [1, 4], "x": 2, "y": 3 }, + { "matrix": [1, 5], "x": 3.5, "y": 2.5 }, + { "matrix": [2, 0], "x": 4.5, "y": 2.5 }, + { "matrix": [2, 1], "x": 0, "y": 4 }, + { "matrix": [2, 2], "x": 1, "y": 4 }, + { "matrix": [2, 3], "x": 2, "y": 4 }, + { "matrix": [2, 4], "x": 3.5, "y": 3.5, "h": 1.5}, + { "matrix": [2, 5], "x": 4.5, "y": 3.5, "h": 1.5} ] } }