From 489a2ef7f8e83baba591cec56106ecc6a8b6df4b Mon Sep 17 00:00:00 2001 From: hulahermit Date: Sun, 5 Mar 2023 18:03:33 -0500 Subject: [PATCH 01/10] First commit On branch pteropus Changes to be committed: new file: keyboards/pteropus/config.h new file: keyboards/pteropus/info.json new file: keyboards/pteropus/keymaps/default/keymap.c new file: keyboards/pteropus/readme.md new file: keyboards/pteropus/rules.mk --- keyboards/pteropus/config.h | 20 ++++++ keyboards/pteropus/info.json | 68 +++++++++++++++++++++ keyboards/pteropus/keymaps/default/keymap.c | 39 ++++++++++++ keyboards/pteropus/readme.md | 27 ++++++++ keyboards/pteropus/rules.mk | 1 + 5 files changed, 155 insertions(+) create mode 100644 keyboards/pteropus/config.h create mode 100644 keyboards/pteropus/info.json create mode 100644 keyboards/pteropus/keymaps/default/keymap.c create mode 100644 keyboards/pteropus/readme.md create mode 100644 keyboards/pteropus/rules.mk diff --git a/keyboards/pteropus/config.h b/keyboards/pteropus/config.h new file mode 100644 index 000000000000..9eb41087765c --- /dev/null +++ b/keyboards/pteropus/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Chi-Han Yang (@hulahermit) +// 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 diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json new file mode 100644 index 000000000000..9659f37faf93 --- /dev/null +++ b/keyboards/pteropus/info.json @@ -0,0 +1,68 @@ +{ + "manufacturer": "Chi-Han Yang", + "keyboard_name": "pteropus", + "maintainer": "hulahermit", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B10", "B2", "B1", "B0"] + }, + "processor": "STM32F072", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0.25 }, + { "matrix": [0, 1], "x": 1, "y": 0.125 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0.125 }, + { "matrix": [0, 4], "x": 4, "y": 0.25 }, + { "matrix": [0, 5], "x": 8, "y": 0.25 }, + { "matrix": [0, 6], "x": 9, "y": 0.125 }, + { "matrix": [0, 7], "x": 10, "y": 0 }, + { "matrix": [0, 8], "x": 11, "y": 0.125 }, + { "matrix": [0, 9], "x": 12, "y": 0.25 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.125 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1.125 }, + { "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "matrix": [1, 5], "x": 8, "y": 1.25 }, + { "matrix": [1, 6], "x": 9, "y": 1.125 }, + { "matrix": [1, 7], "x": 10, "y": 1 }, + { "matrix": [1, 8], "x": 11, "y": 1.125 }, + { "matrix": [1, 9], "x": 12, "y": 1.25 }, + { "matrix": [2, 0], "x": 0, "y": 1.25 }, + { "matrix": [2, 1], "x": 1, "y": 1.125 }, + { "matrix": [2, 2], "x": 2, "y": 1 }, + { "matrix": [2, 3], "x": 3, "y": 1.125 }, + { "matrix": [2, 4], "x": 4, "y": 1.25 }, + { "matrix": [2, 5], "x": 8, "y": 1.25 }, + { "matrix": [2, 6], "x": 9, "y": 1.125 }, + { "matrix": [2, 7], "x": 10, "y": 1 }, + { "matrix": [2, 8], "x": 11, "y": 1.125 }, + { "matrix": [2, 9], "x": 12, "y": 1.25 }, + { "matrix": [3, 2], "x": 3, "y": 3.25 }, + { "matrix": [3, 3], "x": 4, "y": 3.5 }, + { "matrix": [3, 4], "x": 5, "y": 3.75 }, + { "matrix": [3, 5], "x": 7, "y": 3.75 }, + { "matrix": [3, 6], "x": 8, "y": 3.5 }, + { "matrix": [3, 7], "x": 9, "y": 3.25 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/pteropus/keymaps/default/keymap.c b/keyboards/pteropus/keymaps/default/keymap.c new file mode 100644 index 000000000000..e98d29943eb8 --- /dev/null +++ b/keyboards/pteropus/keymaps/default/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ + * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ + * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ + * ┌───┐ ┌───┐ + * │GUI├───┐ ┌───┤Alt│ + * └───┤Bsp├───┐ ┌───┤Ent├───┘ + * └───┤ │ │ ├───┘ + * └───┘ └───┘ + */ + // [0] = LAYOUT_SPLIT_3x5_3( + // KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + // KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + // KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + // KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + // ) +#define LAYOUT( + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, + K32, K33, K34, K35, K36, K37 + ) + { + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, + {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19}, + {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29}, + {KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO}, + } +}; diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md new file mode 100644 index 000000000000..66084da1d317 --- /dev/null +++ b/keyboards/pteropus/readme.md @@ -0,0 +1,27 @@ +# pteropus + +![pteropus](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Chi-Han Yang](https://github.com/hulahermit) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make pteropus:default + +Flashing example for this keyboard: + + make pteropus:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/pteropus/rules.mk b/keyboards/pteropus/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/pteropus/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5ca0e69573068ae72e267b1f45e1f906a7d2f3c3 Mon Sep 17 00:00:00 2001 From: Chi-Han Yang Date: Thu, 9 Mar 2023 11:57:51 -0500 Subject: [PATCH 02/10] Add miryoku layout --- .../keymaps/manna-harbour_miryoku/config.h | 2 +- keyboards/pteropus/config.h | 20 ---------------- keyboards/pteropus/info.json | 2 +- keyboards/pteropus/keymaps/default/keymap.c | 24 +++++-------------- .../keymaps/manna-harbour_miryoku/config.h | 21 ++++++++++++++++ .../keymaps/manna-harbour_miryoku/keymap.c | 4 ++++ 6 files changed, 33 insertions(+), 40 deletions(-) delete mode 100644 keyboards/pteropus/config.h create mode 100644 keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h create mode 100644 keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h index 935444af1b75..cd56c7e4c7a9 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h @@ -9,7 +9,7 @@ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ -N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ + K32, K33, K34, K35, K36, K37\ ) \ LAYOUT_charybdis_3x5( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ diff --git a/keyboards/pteropus/config.h b/keyboards/pteropus/config.h deleted file mode 100644 index 9eb41087765c..000000000000 --- a/keyboards/pteropus/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Chi-Han Yang (@hulahermit) -// 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 diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json index 9659f37faf93..fa8fb11e4239 100644 --- a/keyboards/pteropus/info.json +++ b/keyboards/pteropus/info.json @@ -24,7 +24,7 @@ "vid": "0xFEED" }, "layouts": { - "LAYOUT": { + "LAYOUT_split_3x5_3": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0.25 }, { "matrix": [0, 1], "x": 1, "y": 0.125 }, diff --git a/keyboards/pteropus/keymaps/default/keymap.c b/keyboards/pteropus/keymaps/default/keymap.c index e98d29943eb8..460295f41cfa 100644 --- a/keyboards/pteropus/keymaps/default/keymap.c +++ b/keyboards/pteropus/keymaps/default/keymap.c @@ -18,22 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┤ │ │ ├───┘ * └───┘ └───┘ */ - // [0] = LAYOUT_SPLIT_3x5_3( - // KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - // KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - // KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - // KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT - // ) -#define LAYOUT( - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, - K32, K33, K34, K35, K36, K37 - ) - { - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19}, - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29}, - {KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO}, - } + [0] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + ), }; diff --git a/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h b/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h new file mode 100644 index 000000000000..07bab9cd8e4d --- /dev/null +++ b/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h @@ -0,0 +1,21 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . + +#pragma once + +#define XXX KC_NO + +#define LAYOUT_miryoku(\ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ + N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ +)\ +LAYOUT_split_3x5_3(\ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ + K32, K33, K34, K35, K36, K37\ +) diff --git a/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c new file mode 100644 index 000000000000..dbab7f982043 --- /dev/null +++ b/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// 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 . From 780538294fe1d9eb1c4e1e71fca0895c9e6a82cb Mon Sep 17 00:00:00 2001 From: hulahermit Date: Thu, 16 Mar 2023 08:40:32 -0400 Subject: [PATCH 03/10] Add readme.md --- keyboards/pteropus/readme.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md index 66084da1d317..81d7841bf983 100644 --- a/keyboards/pteropus/readme.md +++ b/keyboards/pteropus/readme.md @@ -1,27 +1,28 @@ -# pteropus +# pteropus keyboard -![pteropus](imgur.com image replace me!) +![pteropus](https://i.imgur.com/5AACuSX.jpg) -*A short description of the keyboard/project* +Another Miryoku inspired 36-key non-split keyboard -* Keyboard Maintainer: [Chi-Han Yang](https://github.com/hulahermit) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [hulahermit](https://github.com/hulahermit) +* Hardware Supported: Embeded type-c connector with STM32F072 microcontroller +* Hardware Availability: [pteropus](https://github.com/hulahermit/pteropus_keyboard) Make example for this keyboard (after setting up your build environment): make pteropus:default + make pteropus:manna-harbour_miryoku // for Miryoku layout Flashing example for this keyboard: make pteropus:default:flash + make pteropus:manna-harbour_miryoku:flash // for Miryoku layout 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: +Enter the bootloader: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset and boot button**: Briefly press the button on the back of the PCB * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From f0af10014bcb169cba36f651de49580239699310 Mon Sep 17 00:00:00 2001 From: hulahermit Date: Thu, 16 Mar 2023 09:27:18 -0400 Subject: [PATCH 04/10] Update the image link in info.json --- keyboards/pteropus/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json index fa8fb11e4239..bf54abb78527 100644 --- a/keyboards/pteropus/info.json +++ b/keyboards/pteropus/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "Chi-Han Yang", + "manufacturer": "hulahermit", "keyboard_name": "pteropus", "maintainer": "hulahermit", "bootloader": "stm32-dfu", From 5917f9ec3ceba58dbd4d542a11a07f19d4da404e Mon Sep 17 00:00:00 2001 From: hulahermit Date: Thu, 16 Mar 2023 09:30:11 -0400 Subject: [PATCH 05/10] Update readme.md --- keyboards/pteropus/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md index 81d7841bf983..3149f5986bd6 100644 --- a/keyboards/pteropus/readme.md +++ b/keyboards/pteropus/readme.md @@ -1,6 +1,6 @@ # pteropus keyboard -![pteropus](https://i.imgur.com/5AACuSX.jpg) +![pteropus](https://i.imgur.com/5AACuSXh.jpg) Another Miryoku inspired 36-key non-split keyboard From 4cdd10a7fd0a6f7e06e360db0a77708aed659da6 Mon Sep 17 00:00:00 2001 From: hulahermit Date: Thu, 16 Mar 2023 10:29:50 -0400 Subject: [PATCH 06/10] Undo the change made to config.h for bastardkb --- .../charybdis/3x5/keymaps/manna-harbour_miryoku/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h index cd56c7e4c7a9..1709436790c7 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h @@ -9,7 +9,7 @@ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K32, K33, K34, K35, K36, K37\ +N30, N31 K32, K33, K34, K35, K36, K37, N38, N39 \ ) \ LAYOUT_charybdis_3x5( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ From 35c08111ecab85264513f73eebc1b6b504708a2e Mon Sep 17 00:00:00 2001 From: hulahermit Date: Thu, 16 Mar 2023 10:33:00 -0400 Subject: [PATCH 07/10] Correct the previous update. --- .../charybdis/3x5/keymaps/manna-harbour_miryoku/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h index 1709436790c7..935444af1b75 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h @@ -9,7 +9,7 @@ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ -N30, N31 K32, K33, K34, K35, K36, K37, N38, N39 \ +N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ ) \ LAYOUT_charybdis_3x5( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ From f4bf49234ef20fb811ae7156ab7560409718203c Mon Sep 17 00:00:00 2001 From: Chi-Han Yang Date: Thu, 16 Mar 2023 13:24:47 -0400 Subject: [PATCH 08/10] update info.json and remove miryoku keymap. --- keyboards/pteropus/info.json | 1 + .../keymaps/manna-harbour_miryoku/config.h | 21 ------------------- .../keymaps/manna-harbour_miryoku/keymap.c | 4 ---- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h delete mode 100644 keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json index bf54abb78527..019b6c752623 100644 --- a/keyboards/pteropus/info.json +++ b/keyboards/pteropus/info.json @@ -23,6 +23,7 @@ "pid": "0x0000", "vid": "0xFEED" }, + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h b/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h deleted file mode 100644 index 07bab9cd8e4d..000000000000 --- a/keyboards/pteropus/keymaps/manna-harbour_miryoku/config.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -#pragma once - -#define XXX KC_NO - -#define LAYOUT_miryoku(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ - N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ -)\ -LAYOUT_split_3x5_3(\ -K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ -K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ -K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ - K32, K33, K34, K35, K36, K37\ -) diff --git a/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c deleted file mode 100644 index dbab7f982043..000000000000 --- a/keyboards/pteropus/keymaps/manna-harbour_miryoku/keymap.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// 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 . From 0599b983045e88c8d4be940759cc7bae0bb38a58 Mon Sep 17 00:00:00 2001 From: hulahermit <36484223+hulahermit@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:01:08 -0400 Subject: [PATCH 09/10] Update keyboards/pteropus/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/pteropus/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md index 3149f5986bd6..e685bcedfafe 100644 --- a/keyboards/pteropus/readme.md +++ b/keyboards/pteropus/readme.md @@ -11,12 +11,12 @@ Another Miryoku inspired 36-key non-split keyboard Make example for this keyboard (after setting up your build environment): make pteropus:default - make pteropus:manna-harbour_miryoku // for Miryoku layout + make pteropus:manna-harbour_miryoku Flashing example for this keyboard: make pteropus:default:flash - make pteropus:manna-harbour_miryoku:flash // for Miryoku layout + make pteropus:manna-harbour_miryoku:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 29dc43fc1346381b8a099055bd5f5f3e478a9efd Mon Sep 17 00:00:00 2001 From: hulahermit <36484223+hulahermit@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:03:00 -0400 Subject: [PATCH 10/10] Update keyboards/pteropus/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/pteropus/readme.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md index e685bcedfafe..7471e08e8ba4 100644 --- a/keyboards/pteropus/readme.md +++ b/keyboards/pteropus/readme.md @@ -24,5 +24,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader: -* **Physical reset and boot button**: Briefly press the button on the back of the PCB -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Bootmagic reset**: Hold down the top-left key and plug in the keyboard. +* **Physical reset**: Hold the `BOOT` button down, then press the `RESET` button. Alternately, plug the keyboard in while holding down the `BOOT` button. + The `BOOT` button can be released after a few seconds. +* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymap, but you may assign this key in any keymaps you create.