From f2f1c5ce87a0b6a0e3d7a1cae473e0fc4489187b Mon Sep 17 00:00:00 2001 From: KD-MM2 Date: Thu, 14 Jul 2022 17:40:24 +0900 Subject: [PATCH 01/11] add promicro87 --- keyboards/promicro87/config.h | 35 ++++++ keyboards/promicro87/info.json | 100 ++++++++++++++++++ keyboards/promicro87/keymaps/default/keymap.c | 17 +++ keyboards/promicro87/promicro87.c | 4 + keyboards/promicro87/promicro87.h | 24 +++++ keyboards/promicro87/readme.md | 35 ++++++ keyboards/promicro87/rules.mk | 21 ++++ 7 files changed, 236 insertions(+) create mode 100644 keyboards/promicro87/config.h create mode 100644 keyboards/promicro87/info.json create mode 100644 keyboards/promicro87/keymaps/default/keymap.c create mode 100644 keyboards/promicro87/promicro87.c create mode 100644 keyboards/promicro87/promicro87.h create mode 100644 keyboards/promicro87/readme.md create mode 100644 keyboards/promicro87/rules.mk diff --git a/keyboards/promicro87/config.h b/keyboards/promicro87/config.h new file mode 100644 index 000000000000..42efb75a305b --- /dev/null +++ b/keyboards/promicro87/config.h @@ -0,0 +1,35 @@ +// Copyright 2022 CAO THAI DUONG (@KD-MM2) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER KD-MM2 +#define PRODUCT promicro87 + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 18 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define DIODE_DIRECTION ROW2COL + +#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } +#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 } + +#define LED_CAPS_LOCK_PIN D5 +#define LED_PIN_ON_STATE 0 diff --git a/keyboards/promicro87/info.json b/keyboards/promicro87/info.json new file mode 100644 index 000000000000..12957d042322 --- /dev/null +++ b/keyboards/promicro87/info.json @@ -0,0 +1,100 @@ +{ + "manufacturer": "KD-MM2", + "keyboard_name": "promicro87", + "maintainer": "KD-MM2", + "url": "", + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "K00 (B0,D3)", "x": 0, "y": 0 }, + { "label": "K02 (B0,D1)", "x": 2, "y": 0 }, + { "label": "K03 (B0,D0)", "x": 3, "y": 0 }, + { "label": "K04 (B0,D4)", "x": 4, "y": 0 }, + { "label": "K05 (B0,C6)", "x": 5, "y": 0 }, + { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 }, + { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 }, + { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 }, + { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 }, + { "label": "K0B (B0,D5)", "x": 11, "y": 0 }, + { "label": "K0C (B0,D6)", "x": 12, "y": 0 }, + { "label": "K0D (B0,C7)", "x": 13, "y": 0 }, + { "label": "K0E (B0,E2)", "x": 14, "y": 0 }, + { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 }, + { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 }, + { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 }, + { "label": "K10 (B1,D3)", "x": 0, "y": 1 }, + { "label": "K11 (B1,D2)", "x": 1, "y": 1 }, + { "label": "K12 (B1,D1)", "x": 2, "y": 1 }, + { "label": "K13 (B1,D0)", "x": 3, "y": 1 }, + { "label": "K14 (B1,D4)", "x": 4, "y": 1 }, + { "label": "K15 (B1,C6)", "x": 5, "y": 1 }, + { "label": "K16 (B1,D7)", "x": 6, "y": 1 }, + { "label": "K17 (B1,E6)", "x": 7, "y": 1 }, + { "label": "K18 (B1,B7)", "x": 8, "y": 1 }, + { "label": "K19 (B1,F0)", "x": 9, "y": 1 }, + { "label": "K1A (B1,F1)", "x": 10, "y": 1 }, + { "label": "K1B (B1,D5)", "x": 11, "y": 1 }, + { "label": "K1C (B1,D6)", "x": 12, "y": 1 }, + { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 }, + { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 }, + { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 }, + { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 }, + { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 }, + { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 }, + { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 }, + { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 }, + { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 }, + { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 }, + { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 }, + { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 }, + { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 }, + { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 }, + { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 }, + { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 }, + { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 }, + { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 }, + { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 }, + { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 }, + { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 }, + { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 }, + { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 }, + { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 }, + { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 }, + { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 }, + { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 }, + { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 }, + { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 }, + { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 }, + { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 }, + { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 }, + { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 }, + { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 }, + { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 }, + { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 }, + { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 }, + { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 }, + { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 }, + { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 }, + { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 }, + { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 }, + { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 }, + { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 }, + { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 }, + { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 }, + { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 }, + { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 }, + { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 }, + { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 }, + { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 }, + { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 }, + { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 }, + { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 }, + { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 }, + { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 }, + { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 }, + { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 } + ] + } + } + +} \ No newline at end of file diff --git a/keyboards/promicro87/keymaps/default/keymap.c b/keyboards/promicro87/keymaps/default/keymap.c new file mode 100644 index 000000000000..168ed08628a2 --- /dev/null +++ b/keyboards/promicro87/keymaps/default/keymap.c @@ -0,0 +1,17 @@ +// Copyright 2022 CAO THAI DUONG (@KD-MM2) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + +}; diff --git a/keyboards/promicro87/promicro87.c b/keyboards/promicro87/promicro87.c new file mode 100644 index 000000000000..2d10fd6f42d4 --- /dev/null +++ b/keyboards/promicro87/promicro87.c @@ -0,0 +1,4 @@ +// Copyright 2022 CAO THAI DUONG (@KD-MM2) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "promicro87.h" diff --git a/keyboards/promicro87/promicro87.h b/keyboards/promicro87/promicro87.h new file mode 100644 index 000000000000..7de32eaa8c49 --- /dev/null +++ b/keyboards/promicro87/promicro87.h @@ -0,0 +1,24 @@ +// Copyright 2022 CAO THAI DUONG (@KD-MM2) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT( \ + K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \ + K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H \ +) { \ + { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \ + { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ + { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \ + { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \ + { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \ +} diff --git a/keyboards/promicro87/readme.md b/keyboards/promicro87/readme.md new file mode 100644 index 000000000000..a992284eb48c --- /dev/null +++ b/keyboards/promicro87/readme.md @@ -0,0 +1,35 @@ +# Pro Micro 87 keys + +![promicro87](https://i.imgur.com/DLqdtAW.jpeg) + +Repaired from 87 keys keyboard using a Pro Micro + +* Keyboard Maintainer: [KD-MM2](https://github.com/KD-MM2) +* Hardware Supported: Pro Micro(need to solder more pins) or any board with ATMega32u4 +* Hardware Availability: N/A (private board, might open source) + +First, if you have Pro Micro + Checkout these image for more: ![Pin map](https://i.imgur.com/SvZ9rGQ.jpeg) ![Usabled Pins](https://i.imgur.com/Nr4cWP5.jpeg) + Keymaps/Handwiring: ![Handwiring](https://i.imgur.com/G1izHd6.png) +If you have 25 GPIOs board, there is nothing to do. + +Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/promicro87/config.h#L34), +and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/promicro87/config.h#L35) + +Make example for this keyboard (after setting up your build environment): + + make promicro87:default + +Flashing example for this keyboard: + + make promicro87: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**: Plug cable, open QMK Toolbox and short RST pin and GND pin, then you will see it in flashmode +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/promicro87/rules.mk b/keyboards/promicro87/rules.mk new file mode 100644 index 000000000000..802d0e2b9e36 --- /dev/null +++ b/keyboards/promicro87/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + + From 8364773e02d164d99f89d676195fb961451403ef Mon Sep 17 00:00:00 2001 From: KD-MM2 Date: Fri, 15 Jul 2022 07:38:42 +0900 Subject: [PATCH 02/11] renamed --- keyboards/{promicro87 => hwpm87}/config.h | 2 +- .../{promicro87/promicro87.c => hwpm87/hwpm87.c} | 2 +- .../{promicro87/promicro87.h => hwpm87/hwpm87.h} | 0 keyboards/{promicro87 => hwpm87}/info.json | 0 .../{promicro87 => hwpm87}/keymaps/default/keymap.c | 0 keyboards/{promicro87 => hwpm87}/readme.md | 12 ++++++------ keyboards/{promicro87 => hwpm87}/rules.mk | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename keyboards/{promicro87 => hwpm87}/config.h (96%) rename keyboards/{promicro87/promicro87.c => hwpm87/hwpm87.c} (78%) rename keyboards/{promicro87/promicro87.h => hwpm87/hwpm87.h} (100%) rename keyboards/{promicro87 => hwpm87}/info.json (100%) rename keyboards/{promicro87 => hwpm87}/keymaps/default/keymap.c (100%) rename keyboards/{promicro87 => hwpm87}/readme.md (85%) rename keyboards/{promicro87 => hwpm87}/rules.mk (100%) diff --git a/keyboards/promicro87/config.h b/keyboards/hwpm87/config.h similarity index 96% rename from keyboards/promicro87/config.h rename to keyboards/hwpm87/config.h index 42efb75a305b..1bfbb97f614e 100644 --- a/keyboards/promicro87/config.h +++ b/keyboards/hwpm87/config.h @@ -10,7 +10,7 @@ #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 #define MANUFACTURER KD-MM2 -#define PRODUCT promicro87 +#define PRODUCT HWPM87 /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/promicro87/promicro87.c b/keyboards/hwpm87/hwpm87.c similarity index 78% rename from keyboards/promicro87/promicro87.c rename to keyboards/hwpm87/hwpm87.c index 2d10fd6f42d4..9edc09c97151 100644 --- a/keyboards/promicro87/promicro87.c +++ b/keyboards/hwpm87/hwpm87.c @@ -1,4 +1,4 @@ // Copyright 2022 CAO THAI DUONG (@KD-MM2) // SPDX-License-Identifier: GPL-2.0-or-later -#include "promicro87.h" +#include "hwpm87.h" diff --git a/keyboards/promicro87/promicro87.h b/keyboards/hwpm87/hwpm87.h similarity index 100% rename from keyboards/promicro87/promicro87.h rename to keyboards/hwpm87/hwpm87.h diff --git a/keyboards/promicro87/info.json b/keyboards/hwpm87/info.json similarity index 100% rename from keyboards/promicro87/info.json rename to keyboards/hwpm87/info.json diff --git a/keyboards/promicro87/keymaps/default/keymap.c b/keyboards/hwpm87/keymaps/default/keymap.c similarity index 100% rename from keyboards/promicro87/keymaps/default/keymap.c rename to keyboards/hwpm87/keymaps/default/keymap.c diff --git a/keyboards/promicro87/readme.md b/keyboards/hwpm87/readme.md similarity index 85% rename from keyboards/promicro87/readme.md rename to keyboards/hwpm87/readme.md index a992284eb48c..681702f10505 100644 --- a/keyboards/promicro87/readme.md +++ b/keyboards/hwpm87/readme.md @@ -1,6 +1,6 @@ -# Pro Micro 87 keys +# Handwired 87 keys -![promicro87](https://i.imgur.com/DLqdtAW.jpeg) +![hwpm87](https://i.imgur.com/DLqdtAW.jpeg) Repaired from 87 keys keyboard using a Pro Micro @@ -13,16 +13,16 @@ First, if you have Pro Micro Keymaps/Handwiring: ![Handwiring](https://i.imgur.com/G1izHd6.png) If you have 25 GPIOs board, there is nothing to do. -Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/promicro87/config.h#L34), -and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/promicro87/config.h#L35) +Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/hwpm87/config.h#L34), +and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/hwpm87/config.h#L35) Make example for this keyboard (after setting up your build environment): - make promicro87:default + make hwpm87:default Flashing example for this keyboard: - make promicro87:default:flash + make hwpm87: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/promicro87/rules.mk b/keyboards/hwpm87/rules.mk similarity index 100% rename from keyboards/promicro87/rules.mk rename to keyboards/hwpm87/rules.mk From 0d80f4d4b7a4c16cfa36699b2cba415eb4308d3a Mon Sep 17 00:00:00 2001 From: KD-MM2 Date: Fri, 15 Jul 2022 07:49:25 +0900 Subject: [PATCH 03/11] move to handwired folder --- keyboards/{ => handwired}/hwpm87/config.h | 0 keyboards/{ => handwired}/hwpm87/hwpm87.c | 0 keyboards/{ => handwired}/hwpm87/hwpm87.h | 0 keyboards/{ => handwired}/hwpm87/info.json | 0 keyboards/{ => handwired}/hwpm87/keymaps/default/keymap.c | 0 keyboards/{ => handwired}/hwpm87/readme.md | 0 keyboards/{ => handwired}/hwpm87/rules.mk | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => handwired}/hwpm87/config.h (100%) rename keyboards/{ => handwired}/hwpm87/hwpm87.c (100%) rename keyboards/{ => handwired}/hwpm87/hwpm87.h (100%) rename keyboards/{ => handwired}/hwpm87/info.json (100%) rename keyboards/{ => handwired}/hwpm87/keymaps/default/keymap.c (100%) rename keyboards/{ => handwired}/hwpm87/readme.md (100%) rename keyboards/{ => handwired}/hwpm87/rules.mk (100%) diff --git a/keyboards/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h similarity index 100% rename from keyboards/hwpm87/config.h rename to keyboards/handwired/hwpm87/config.h diff --git a/keyboards/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c similarity index 100% rename from keyboards/hwpm87/hwpm87.c rename to keyboards/handwired/hwpm87/hwpm87.c diff --git a/keyboards/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h similarity index 100% rename from keyboards/hwpm87/hwpm87.h rename to keyboards/handwired/hwpm87/hwpm87.h diff --git a/keyboards/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json similarity index 100% rename from keyboards/hwpm87/info.json rename to keyboards/handwired/hwpm87/info.json diff --git a/keyboards/hwpm87/keymaps/default/keymap.c b/keyboards/handwired/hwpm87/keymaps/default/keymap.c similarity index 100% rename from keyboards/hwpm87/keymaps/default/keymap.c rename to keyboards/handwired/hwpm87/keymaps/default/keymap.c diff --git a/keyboards/hwpm87/readme.md b/keyboards/handwired/hwpm87/readme.md similarity index 100% rename from keyboards/hwpm87/readme.md rename to keyboards/handwired/hwpm87/readme.md diff --git a/keyboards/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk similarity index 100% rename from keyboards/hwpm87/rules.mk rename to keyboards/handwired/hwpm87/rules.mk From 03f5ff1ea910ab9d88120c8a25554fd48bc3e486 Mon Sep 17 00:00:00 2001 From: KD-MM2 Date: Fri, 15 Jul 2022 08:01:34 +0900 Subject: [PATCH 04/11] update readme.md --- keyboards/handwired/hwpm87/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/hwpm87/readme.md b/keyboards/handwired/hwpm87/readme.md index 681702f10505..11bba2e9a945 100644 --- a/keyboards/handwired/hwpm87/readme.md +++ b/keyboards/handwired/hwpm87/readme.md @@ -13,8 +13,8 @@ First, if you have Pro Micro Keymaps/Handwiring: ![Handwiring](https://i.imgur.com/G1izHd6.png) If you have 25 GPIOs board, there is nothing to do. -Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/hwpm87/config.h#L34), -and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/6e0c35b06e69f37c115b0d6dc52596b06e0ec0d9/keyboards/hwpm87/config.h#L35) +Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/hwpm87/keyboards/hwpm87/config.h#L34), +and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/hwpm87/keyboards/hwpm87/config.h#L35) Make example for this keyboard (after setting up your build environment): From 09e87d9475bb53cd84cd20b705e5220b2910d3dc Mon Sep 17 00:00:00 2001 From: KD-MM2 <57068549+KD-MM2@users.noreply.github.com> Date: Mon, 18 Jul 2022 00:38:23 +0900 Subject: [PATCH 05/11] Update info.json --- keyboards/handwired/hwpm87/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 12957d042322..9a9eb3926381 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -1,6 +1,6 @@ { "manufacturer": "KD-MM2", - "keyboard_name": "promicro87", + "keyboard_name": "hwpm87", "maintainer": "KD-MM2", "url": "", "layouts": { @@ -97,4 +97,4 @@ } } -} \ No newline at end of file +} From 6d0bda6f2b22b67ae3c7d4a60c558dc3fa875b1c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 20 Jul 2022 18:21:24 +0100 Subject: [PATCH 06/11] Update keyboards/handwired/hwpm87/readme.md Co-authored-by: Drashna Jaelre --- keyboards/handwired/hwpm87/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/hwpm87/readme.md b/keyboards/handwired/hwpm87/readme.md index 11bba2e9a945..6e2b2f7c1d13 100644 --- a/keyboards/handwired/hwpm87/readme.md +++ b/keyboards/handwired/hwpm87/readme.md @@ -1,6 +1,6 @@ # Handwired 87 keys -![hwpm87](https://i.imgur.com/DLqdtAW.jpeg) +![hwpm87](https://i.imgur.com/DLqdtAWh.jpeg) Repaired from 87 keys keyboard using a Pro Micro From 4e506338ee84475c5c1831f3ce323f0de5e9448d Mon Sep 17 00:00:00 2001 From: KD-MM2 <57068549+KD-MM2@users.noreply.github.com> Date: Thu, 21 Jul 2022 05:53:56 +0900 Subject: [PATCH 07/11] Update keyboards/handwired/hwpm87/readme.md Co-authored-by: Joel Challis --- keyboards/handwired/hwpm87/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/hwpm87/readme.md b/keyboards/handwired/hwpm87/readme.md index 6e2b2f7c1d13..f0f4b3db2e71 100644 --- a/keyboards/handwired/hwpm87/readme.md +++ b/keyboards/handwired/hwpm87/readme.md @@ -18,11 +18,11 @@ and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](http Make example for this keyboard (after setting up your build environment): - make hwpm87:default + make handwired/hwpm87:default Flashing example for this keyboard: - make hwpm87:default:flash + make handwired/hwpm87:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 4bc6c2dde24570ed0774c15ebb4d33eaded521f6 Mon Sep 17 00:00:00 2001 From: KD-MM2 Date: Sat, 23 Jul 2022 07:17:55 +0900 Subject: [PATCH 08/11] add MO(Fn like) layout, media control keycode --- keyboards/handwired/hwpm87/keymaps/default/keymap.c | 13 +++++++++++-- keyboards/handwired/hwpm87/rules.mk | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/keyboards/handwired/hwpm87/keymaps/default/keymap.c b/keyboards/handwired/hwpm87/keymaps/default/keymap.c index 168ed08628a2..850acd202509 100644 --- a/keyboards/handwired/hwpm87/keymaps/default/keymap.c +++ b/keyboards/handwired/hwpm87/keymaps/default/keymap.c @@ -5,13 +5,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT( /* BASE Layer */ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), + [1] = LAYOUT( /* MO(Fn) Layer */ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_LNG2, KC_LNG1, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ) + }; diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk index 802d0e2b9e36..ed36df5d5f2e 100644 --- a/keyboards/handwired/hwpm87/rules.mk +++ b/keyboards/handwired/hwpm87/rules.mk @@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow From 71d9508374951a1af685e9c10eb5d1d33628e48e Mon Sep 17 00:00:00 2001 From: Cao Thai Duong <57068549+KD-MM2@users.noreply.github.com> Date: Tue, 9 Aug 2022 08:14:14 +0900 Subject: [PATCH 09/11] Update keyboards/handwired/hwpm87/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/handwired/hwpm87/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk index ed36df5d5f2e..7f42dae592e5 100644 --- a/keyboards/handwired/hwpm87/rules.mk +++ b/keyboards/handwired/hwpm87/rules.mk @@ -15,7 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output From 748c7c08a0791b676b37a3162dea3b587af9e5d9 Mon Sep 17 00:00:00 2001 From: Cao Thai Duong <57068549+KD-MM2@users.noreply.github.com> Date: Wed, 10 Aug 2022 21:10:26 +0700 Subject: [PATCH 10/11] Update keyboards/handwired/hwpm87/config.h Co-authored-by: Drashna Jaelre --- keyboards/handwired/hwpm87/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h index 1bfbb97f614e..60ef15ab44ee 100644 --- a/keyboards/handwired/hwpm87/config.h +++ b/keyboards/handwired/hwpm87/config.h @@ -5,12 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KD-MM2 -#define PRODUCT HWPM87 /* key matrix size */ #define MATRIX_ROWS 6 From 0b98bf7ce2d486abf6f8f232b8cd9cc82761a53b Mon Sep 17 00:00:00 2001 From: Cao Thai Duong <57068549+KD-MM2@users.noreply.github.com> Date: Wed, 10 Aug 2022 21:10:52 +0700 Subject: [PATCH 11/11] Update keyboards/handwired/hwpm87/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/hwpm87/info.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 9a9eb3926381..90d8ad397cf9 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -3,6 +3,11 @@ "keyboard_name": "hwpm87", "maintainer": "KD-MM2", "url": "", + "usb": { + "vid": "0xFEED", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [