From 4e443b52f5ba3dab777609dd76aa842b127ef207 Mon Sep 17 00:00:00 2001 From: harky <23428162+zykrah@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:17:15 +1000 Subject: [PATCH 1/6] Initial PizzaPad firmware --- keyboards/idyllic/pizzapad/keyboard.json | 30 ++++++++++++++++ keyboards/idyllic/pizzapad/via/keymap.c | 46 ++++++++++++++++++++++++ keyboards/idyllic/pizzapad/via/rules.mk | 1 + 3 files changed, 77 insertions(+) create mode 100644 keyboards/idyllic/pizzapad/keyboard.json create mode 100644 keyboards/idyllic/pizzapad/via/keymap.c create mode 100644 keyboards/idyllic/pizzapad/via/rules.mk diff --git a/keyboards/idyllic/pizzapad/keyboard.json b/keyboards/idyllic/pizzapad/keyboard.json new file mode 100644 index 000000000000..981162c7988f --- /dev/null +++ b/keyboards/idyllic/pizzapad/keyboard.json @@ -0,0 +1,30 @@ +{ + "manufacturer": "Zykrah", + "keyboard_name": "Pizza Pad", + "maintainer": "zykrah", + "usb": { + "vid": "0x7A79", + "pid": "0x5050", + "device_version": "0.0.1" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["GP6", "GP29", "GP28"], + "cols": ["GP1", "GP0", "GP7"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/idyllic/pizzapad/via/keymap.c b/keyboards/idyllic/pizzapad/via/keymap.c new file mode 100644 index 000000000000..940b3dcab0d0 --- /dev/null +++ b/keyboards/idyllic/pizzapad/via/keymap.c @@ -0,0 +1,46 @@ +/* +Copyright 2022 Zykrah + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; diff --git a/keyboards/idyllic/pizzapad/via/rules.mk b/keyboards/idyllic/pizzapad/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/idyllic/pizzapad/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From d28e8e1284e713599d8deb05eae152069d927926 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:00:15 +1100 Subject: [PATCH 2/6] Updated files to conform to PR checklist --- keyboards/idyllic/pizzapad/default/keymap.c | 20 +++++++++ keyboards/idyllic/pizzapad/keyboard.json | 34 +++++++-------- keyboards/idyllic/pizzapad/readme.md | 27 ++++++++++++ keyboards/idyllic/pizzapad/via/keymap.c | 46 --------------------- keyboards/idyllic/pizzapad/via/rules.mk | 1 - 5 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 keyboards/idyllic/pizzapad/default/keymap.c create mode 100644 keyboards/idyllic/pizzapad/readme.md delete mode 100644 keyboards/idyllic/pizzapad/via/keymap.c delete mode 100644 keyboards/idyllic/pizzapad/via/rules.mk diff --git a/keyboards/idyllic/pizzapad/default/keymap.c b/keyboards/idyllic/pizzapad/default/keymap.c new file mode 100644 index 000000000000..ef34e8a8caa1 --- /dev/null +++ b/keyboards/idyllic/pizzapad/default/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2024 Zykrah (@zykrah) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3 + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; diff --git a/keyboards/idyllic/pizzapad/keyboard.json b/keyboards/idyllic/pizzapad/keyboard.json index 981162c7988f..1d18324d8948 100644 --- a/keyboards/idyllic/pizzapad/keyboard.json +++ b/keyboards/idyllic/pizzapad/keyboard.json @@ -2,29 +2,29 @@ "manufacturer": "Zykrah", "keyboard_name": "Pizza Pad", "maintainer": "zykrah", - "usb": { - "vid": "0x7A79", - "pid": "0x5050", - "device_version": "0.0.1" - }, "diode_direction": "COL2ROW", "matrix_pins": { - "rows": ["GP6", "GP29", "GP28"], - "cols": ["GP1", "GP0", "GP7"] + "cols": ["GP1", "GP0", "GP7"], + "rows": ["GP6", "GP29", "GP28"] + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x5050", + "vid": "0x7A79" }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2} ] } } -} \ No newline at end of file +} diff --git a/keyboards/idyllic/pizzapad/readme.md b/keyboards/idyllic/pizzapad/readme.md new file mode 100644 index 000000000000..23e62b71a7ca --- /dev/null +++ b/keyboards/idyllic/pizzapad/readme.md @@ -0,0 +1,27 @@ +# Pizza Pad PCB + +![Pizza Pad PCB](https://i.imgur.com/eJLuaZYh.jpg) + +A 3x3 PCB designed for the Idyllic Pretty Pad. + +* Keyboard Maintainer: Zykrah +* Hardware Supported: Pizza Pad PCB (using a SEEED XIAO RP2040) +* Hardware Availability: [Mechstock](https://mechstock.com.au/) + +Make example for this keyboard (after setting up your build environment): + + make idyllic/pizzapad:default + +Flashing example for this keyboard: + + make idyllic/pizzapad:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press both the `BOOT` and `RESET` buttons at the same time +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/idyllic/pizzapad/via/keymap.c b/keyboards/idyllic/pizzapad/via/keymap.c deleted file mode 100644 index 940b3dcab0d0..000000000000 --- a/keyboards/idyllic/pizzapad/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2022 Zykrah - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ), - - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ), - -}; diff --git a/keyboards/idyllic/pizzapad/via/rules.mk b/keyboards/idyllic/pizzapad/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/idyllic/pizzapad/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From 4664809a9eb909547310ee95de5b2a41b0a04417 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:38:22 +1100 Subject: [PATCH 3/6] Fix default keymap location --- keyboards/idyllic/pizzapad/{ => keymaps}/default/keymap.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/idyllic/pizzapad/{ => keymaps}/default/keymap.c (100%) diff --git a/keyboards/idyllic/pizzapad/default/keymap.c b/keyboards/idyllic/pizzapad/keymaps/default/keymap.c similarity index 100% rename from keyboards/idyllic/pizzapad/default/keymap.c rename to keyboards/idyllic/pizzapad/keymaps/default/keymap.c From 256537b90acf4a1aba0c122e7975fda1451fa1a2 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:56:35 +1100 Subject: [PATCH 4/6] Update keyboard.json --- keyboards/idyllic/pizzapad/keyboard.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/idyllic/pizzapad/keyboard.json b/keyboards/idyllic/pizzapad/keyboard.json index 1d18324d8948..959ca92c28d3 100644 --- a/keyboards/idyllic/pizzapad/keyboard.json +++ b/keyboards/idyllic/pizzapad/keyboard.json @@ -2,7 +2,12 @@ "manufacturer": "Zykrah", "keyboard_name": "Pizza Pad", "maintainer": "zykrah", + "processor": "RP2040", + "bootloader": "rp2040", "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "matrix_pins": { "cols": ["GP1", "GP0", "GP7"], "rows": ["GP6", "GP29", "GP28"] From f40f5d9564cfd3de3efce1b4944e727d4b9d4331 Mon Sep 17 00:00:00 2001 From: Danny Tan <23428162+zykrah@users.noreply.github.com> Date: Thu, 7 Nov 2024 01:15:37 +1100 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Joel Challis --- keyboards/idyllic/pizzapad/keyboard.json | 3 ++- keyboards/idyllic/pizzapad/keymaps/default/keymap.c | 10 ++-------- keyboards/idyllic/pizzapad/readme.md | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/keyboards/idyllic/pizzapad/keyboard.json b/keyboards/idyllic/pizzapad/keyboard.json index 959ca92c28d3..638db198227e 100644 --- a/keyboards/idyllic/pizzapad/keyboard.json +++ b/keyboards/idyllic/pizzapad/keyboard.json @@ -17,8 +17,9 @@ "pid": "0x5050", "vid": "0x7A79" }, + "community_layouts": ["ortho_3x3"], "layouts": { - "LAYOUT": { + "LAYOUT_ortho_3x3": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/idyllic/pizzapad/keymaps/default/keymap.c b/keyboards/idyllic/pizzapad/keymaps/default/keymap.c index ef34e8a8caa1..f774fdaaf1ec 100644 --- a/keyboards/idyllic/pizzapad/keymaps/default/keymap.c +++ b/keyboards/idyllic/pizzapad/keymaps/default/keymap.c @@ -5,16 +5,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_3x3( KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_P1, KC_P2, KC_P3 - ), - - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ), + ) }; diff --git a/keyboards/idyllic/pizzapad/readme.md b/keyboards/idyllic/pizzapad/readme.md index 23e62b71a7ca..04098cb522dd 100644 --- a/keyboards/idyllic/pizzapad/readme.md +++ b/keyboards/idyllic/pizzapad/readme.md @@ -1,6 +1,6 @@ # Pizza Pad PCB -![Pizza Pad PCB](https://i.imgur.com/eJLuaZYh.jpg) +![Pizza Pad PCB](https://i.imgur.com/eJLuaZY.jpg) A 3x3 PCB designed for the Idyllic Pretty Pad. From e77f6d01e529ec402e2685de1b03bf17356a2e4e Mon Sep 17 00:00:00 2001 From: Danny Tan <23428162+zykrah@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:15:14 +1100 Subject: [PATCH 6/6] Update keyboards/idyllic/pizzapad/keymaps/default/keymap.c Co-authored-by: jack --- keyboards/idyllic/pizzapad/keymaps/default/keymap.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/keyboards/idyllic/pizzapad/keymaps/default/keymap.c b/keyboards/idyllic/pizzapad/keymaps/default/keymap.c index f774fdaaf1ec..333b33bc0b40 100644 --- a/keyboards/idyllic/pizzapad/keymaps/default/keymap.c +++ b/keyboards/idyllic/pizzapad/keymaps/default/keymap.c @@ -4,11 +4,9 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_ortho_3x3( - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3 - ) - + [0] = LAYOUT_ortho_3x3( + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3 + ) };