diff options
| author | mechlovin <57231893+mechlovin@users.noreply.github.com> | 2021-08-17 11:49:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 04:49:40 +1000 |
| commit | 7794e97f32fb9dcb07e7fa928cde08691b257fbe (patch) | |
| tree | 4600bb1f04219329599a6cb9e58f15b40ebde60c | |
| parent | 705774f7bfe13face6a276cee276d43411bb1693 (diff) | |
| download | qmk_firmware-7794e97f32fb9dcb07e7fa928cde08691b257fbe.tar.gz qmk_firmware-7794e97f32fb9dcb07e7fa928cde08691b257fbe.zip | |
Add mechlovin9 rev2 PCB (#12767)
* Add mechlovin9 rev2 PCB
Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
* update
* change bootloader and bootmagic button
* Add mechlovin9 rev2 PCB
Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
25 files changed, 274 insertions, 15 deletions
diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h index 576a78510d..99da5a2a1a 100644 --- a/keyboards/mechlovin/hannah65/hannah65.h +++ b/keyboards/mechlovin/hannah65/hannah65.h @@ -20,6 +20,4 @@ #if defined(KEYBOARD_mechlovin_hannah65_rev1) # include "rev1.h" -#elif defined(KEYBOARD_mechlovin_hannah65_mechlovin9) -# include "mechlovin9.h" #endif
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/mechlovin9/config.h b/keyboards/mechlovin/hannah65/mechlovin9/config.h deleted file mode 100644 index 68097bd623..0000000000 --- a/keyboards/mechlovin/hannah65/mechlovin9/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0001 -#define PRODUCTION Mechlovin9
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/config.h b/keyboards/mechlovin/hannah65/rev1/config.h deleted file mode 100644 index 8d90908c20..0000000000 --- a/keyboards/mechlovin/hannah65/rev1/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0x6500 -#define DEVICE_VER 0x0001 -#define PRODUCTION Hannah65
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/haus/config.h b/keyboards/mechlovin/hannah65/rev1/haus/config.h new file mode 100644 index 0000000000..4d517ef475 --- /dev/null +++ b/keyboards/mechlovin/hannah65/rev1/haus/config.h @@ -0,0 +1,22 @@ +/* +Copyright 2021 Mechlovin' Studio + +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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define PRODUCT_ID 0x6500 +#define DEVICE_VER 0x0001 +#define PRODUCTION Haus Rev. 1
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/haus/readme.md b/keyboards/mechlovin/hannah65/rev1/haus/readme.md new file mode 100644 index 0000000000..5f937bf20d --- /dev/null +++ b/keyboards/mechlovin/hannah65/rev1/haus/readme.md @@ -0,0 +1,23 @@ +# Haus + + + +A Haus PCB, Rev.1 + +* Keyboard Maintainer: [Hand Engineering](https://www.reddit.com/r/MechanicalKeyboards/comments/hzcavx/haus_by_hand_engineering/) +* Hardware Supported: Haus PCB rev.1, STM32F303. +* Hardware Availability: Haus Keyboard. + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/hannah65/rev1/haus:default + +Flashing example for this keyboard: + + make mechlovin/hannah65/rev1/haus:flash + + + +**Reset Key:** To put the Haus PCB into bootloader, push reset swith on the bottom of the PCB. + +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/mechlovin/hannah65/mechlovin9/rules.mk b/keyboards/mechlovin/hannah65/rev1/haus/rules.mk index e69de29bb2..e69de29bb2 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/rules.mk +++ b/keyboards/mechlovin/hannah65/rev1/haus/rules.mk diff --git a/keyboards/mechlovin/hannah65/rev1/readme.md b/keyboards/mechlovin/hannah65/rev1/readme.md new file mode 100644 index 0000000000..d8179f56fd --- /dev/null +++ b/keyboards/mechlovin/hannah65/rev1/readme.md @@ -0,0 +1,19 @@ +# hannah65 rev1 + + + +A 65% PCB, compatible with E6.5, Kyuu,... + +* Keyboard Maintainer: [Team Mechlovin](https://github.com/mechlovin) +* Hardware Supported: Hannah65, STM32F303 +* Hardware Availability: [Mechlovin Store](https://mechlovin.studio) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/hannah65/rev1:default + +Flashing example for this keyboard: + + make mechlovin/hannah65/rev1: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/mechlovin/hannah65/rev1/rules.mk b/keyboards/mechlovin/hannah65/rev1/rules.mk index e69de29bb2..ae9bc176a4 100644 --- a/keyboards/mechlovin/hannah65/rev1/rules.mk +++ b/keyboards/mechlovin/hannah65/rev1/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk index dd687d30da..fabf13249e 100644 --- a/keyboards/mechlovin/hannah65/rules.mk +++ b/keyboards/mechlovin/hannah65/rules.mk @@ -22,4 +22,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -DEFAULT_FOLDER = mechlovin/hannah65/rev1 +DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h new file mode 100644 index 0000000000..669d79ac91 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/config.h @@ -0,0 +1,30 @@ + +/* +Copyright 2021 Mechlovin' Studio + +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 <http://www.gnu.org/licenses/>. +*/ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4D4C +#define MANUFACTURER Mechlovin Studio + +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define DIODE_DIRECTION COL2ROW +#define BACKLIGHT_LEVELS 3 diff --git a/keyboards/mechlovin/hannah65/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index 24585920a2..24585920a2 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json diff --git a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/default/keymap.c b/keyboards/mechlovin/mechlovin9/keymaps/default/keymap.c index 97a2c80723..97a2c80723 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/default/keymap.c +++ b/keyboards/mechlovin/mechlovin9/keymaps/default/keymap.c diff --git a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/default/readme.md b/keyboards/mechlovin/mechlovin9/keymaps/default/readme.md index 324467b059..324467b059 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/default/readme.md +++ b/keyboards/mechlovin/mechlovin9/keymaps/default/readme.md diff --git a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/via/keymap.c b/keyboards/mechlovin/mechlovin9/keymaps/via/keymap.c index 0fae908c24..0fae908c24 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/via/keymap.c +++ b/keyboards/mechlovin/mechlovin9/keymaps/via/keymap.c diff --git a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/via/rules.mk b/keyboards/mechlovin/mechlovin9/keymaps/via/rules.mk index 036bd6d1c3..036bd6d1c3 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/keymaps/via/rules.mk +++ b/keyboards/mechlovin/mechlovin9/keymaps/via/rules.mk diff --git a/keyboards/mechlovin/mechlovin9/mechlovin9.c b/keyboards/mechlovin/mechlovin9/mechlovin9.c new file mode 100644 index 0000000000..a5a8b6c0fe --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/mechlovin9.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Mechlovin' Studio + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "mechlovin9.h" diff --git a/keyboards/mechlovin/hannah65/mechlovin9/mechlovin9.h b/keyboards/mechlovin/mechlovin9/mechlovin9.h index 4aebaad0f3..c7d65e05f4 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/mechlovin9.h +++ b/keyboards/mechlovin/mechlovin9/mechlovin9.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Team Mechlovin +/* Copyright 2021 Mechlovin' Studio * * 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 diff --git a/keyboards/mechlovin/hannah65/mechlovin9/readme.md b/keyboards/mechlovin/mechlovin9/readme.md index aa6bdc1cad..55dead19c4 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/readme.md +++ b/keyboards/mechlovin/mechlovin9/readme.md @@ -10,6 +10,8 @@ A 65% PCB, compatible with Kyuu. Make example for this keyboard (after setting up your build environment): - make mechlovin/hannah65/mechlovin9:default + make mechlovin/mechlovin9/rev1:default 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). + +**Reset Key:** To put the mechlovin9 PCB into bootloader, hold ESC and plug cable.
\ No newline at end of file diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h new file mode 100644 index 0000000000..2a9c335d73 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -0,0 +1,42 @@ +/* +Copyright 2021 Mechlovin' Studio + +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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define PRODUCT_ID 0x6509 +#define DEVICE_VER 0x0001 +#define PRODUCT Mechlovin9 + +/* + * 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 MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } +#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } + +#define LED_CAPS_LOCK_PIN B9 + +#define BACKLIGHT_PIN B8 +#define BACKLIGHT_BREATHING +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 3
\ No newline at end of file diff --git a/keyboards/mechlovin/mechlovin9/rev1/readme.md b/keyboards/mechlovin/mechlovin9/rev1/readme.md new file mode 100644 index 0000000000..55dead19c4 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/readme.md @@ -0,0 +1,17 @@ +# mechlovin9 + + + +A 65% PCB, compatible with Kyuu. + +* Keyboard Maintainer: [Team Mechlovin](https://github.com/mechlovin) +* Hardware Supported: Kyuu Keyboard. +* Hardware Availability: [Reddit GB](https://www.reddit.com/r/mechmarket/comments/i61par/gb_mechlovin_9_a_kyuu_65_keyboard_compatible_pcb/) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/mechlovin9/rev1:default + +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). + +**Reset Key:** To put the mechlovin9 PCB into bootloader, hold ESC and plug cable.
\ No newline at end of file diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk new file mode 100644 index 0000000000..38261a4f06 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/rules.mk @@ -0,0 +1,10 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Build Options +# change yes to no to disable +# +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h new file mode 100644 index 0000000000..ed11fafa83 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/config.h @@ -0,0 +1,44 @@ +/* +Copyright 2020 Team Mechlovin' + +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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define PRODUCT_ID 0x6509 +#define DEVICE_VER 0x0002 +#define PRODUCT Mechlovin9 Rev2 + +/* + * 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 MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } +#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 } + +#define LED_CAPS_LOCK_PIN A7 + +#define BACKLIGHT_PIN D4 +#define BACKLIGHT_BREATHING + +/* Bootmagic Lite key configuration */ + #define BOOTMAGIC_LITE_ROW 0 + #define BOOTMAGIC_LITE_COLUMN 13 diff --git a/keyboards/mechlovin/mechlovin9/rev2/readme.md b/keyboards/mechlovin/mechlovin9/rev2/readme.md new file mode 100644 index 0000000000..55dead19c4 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/readme.md @@ -0,0 +1,17 @@ +# mechlovin9 + + + +A 65% PCB, compatible with Kyuu. + +* Keyboard Maintainer: [Team Mechlovin](https://github.com/mechlovin) +* Hardware Supported: Kyuu Keyboard. +* Hardware Availability: [Reddit GB](https://www.reddit.com/r/mechmarket/comments/i61par/gb_mechlovin_9_a_kyuu_65_keyboard_compatible_pcb/) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/mechlovin9/rev1:default + +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). + +**Reset Key:** To put the mechlovin9 PCB into bootloader, hold ESC and plug cable.
\ No newline at end of file diff --git a/keyboards/mechlovin/mechlovin9/rev2/rules.mk b/keyboards/mechlovin/mechlovin9/rev2/rules.mk new file mode 100644 index 0000000000..77a26616fb --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/rules.mk @@ -0,0 +1,9 @@ +# MCU name +MCU = atmega32a + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = bootloadHID + diff --git a/keyboards/mechlovin/mechlovin9/rules.mk b/keyboards/mechlovin/mechlovin9/rules.mk new file mode 100644 index 0000000000..8b16113e87 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rules.mk @@ -0,0 +1,18 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = mechlovin/mechlovin9/rev1
\ No newline at end of file |