From 184c2e35affd51abcfa74bdc90564058b6a39a41 Mon Sep 17 00:00:00 2001 From: Alin Marin Elena Date: Tue, 10 Aug 2021 21:59:01 +0100 Subject: add support for m65 and simple 5x13 ortholinear (#12315) * add support for m65 and simple 5x13 ortholinear * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov * updates as per @sigprof review plus reformat * pins all now are defined at microcontroller level * profuct id defined at microcontroller level * put leds on when _ADJ is on * add danish keymap * make default uk centric iso as per readme * default is now iso generic, uk is its own business * add license * update imgur links to reflect the layout * leds for _ADJ layer now do not prevent the other layers leds to get on * Update keyboards/m65/keymaps/uk/keymap.c Co-authored-by: Ryan * Update keyboards/m65/keymaps/dk/keymap.c Co-authored-by: Ryan * Update keyboards/m65/keymaps/uk/readme.md Co-authored-by: Ryan * Update keyboards/m65/readme.md Co-authored-by: Ryan * add support for gd32f303cct6 by we act in rev2 * Revert "add support for gd32f303cct6 by we act in rev2" This reverts commit 4ad3834925508b79f2ff9fd5526dfc39f07fa3bc. * Update keyboards/m65/rev1/rules.mk Co-authored-by: Joel Challis * Update keyboards/m65/keymaps/dk/readme.md Co-authored-by: Ryan * Update keyboards/m65/keymaps/uk/readme.md Co-authored-by: Ryan * Update keyboards/m65/keymaps/default/readme.md Co-authored-by: Ryan * remove empty hal * add capslock * Update keyboards/m65/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/m65/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Alin M Elena Co-authored-by: Sergey Vlasov Co-authored-by: Ryan Co-authored-by: Joel Challis Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/m65/rev1/chconf.h | 29 +++++++++++++++++++++++++++++ keyboards/m65/rev1/config.h | 32 ++++++++++++++++++++++++++++++++ keyboards/m65/rev1/mcuconf.h | 27 +++++++++++++++++++++++++++ keyboards/m65/rev1/readme.md | 0 keyboards/m65/rev1/rules.mk | 22 ++++++++++++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 keyboards/m65/rev1/chconf.h create mode 100644 keyboards/m65/rev1/config.h create mode 100644 keyboards/m65/rev1/mcuconf.h create mode 100644 keyboards/m65/rev1/readme.md create mode 100644 keyboards/m65/rev1/rules.mk (limited to 'keyboards/m65/rev1') diff --git a/keyboards/m65/rev1/chconf.h b/keyboards/m65/rev1/chconf.h new file mode 100644 index 0000000000..8c43fb2697 --- /dev/null +++ b/keyboards/m65/rev1/chconf.h @@ -0,0 +1,29 @@ +/* Copyright 2021 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_TIMEDELTA 0 + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#include_next + diff --git a/keyboards/m65/rev1/config.h b/keyboards/m65/rev1/config.h new file mode 100644 index 0000000000..090210f254 --- /dev/null +++ b/keyboards/m65/rev1/config.h @@ -0,0 +1,32 @@ +/* +Copyright 2021 Alin M Elena + +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 DEVICE_VER 0x0001 +#define PRODUCT_ID 0x6060 + +#define LED_NUM_LOCK_PIN B12 +#define LED_SCROLL_LOCK_PIN B13 +#define LED_CAPS_LOCK_PIN C13 + +// 0 1 2 3 4 +#define MATRIX_ROW_PINS { B11, B0, B1, A2, A3 } +// 0 1 2 3 4 5 6 7 8 9 10 11 12 +#define MATRIX_COL_PINS {A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } + +#define UNUSED_PINS diff --git a/keyboards/m65/rev1/mcuconf.h b/keyboards/m65/rev1/mcuconf.h new file mode 100644 index 0000000000..20df276a5a --- /dev/null +++ b/keyboards/m65/rev1/mcuconf.h @@ -0,0 +1,27 @@ +/* Copyright 2021 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/m65/rev1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 FALSE diff --git a/keyboards/m65/rev1/readme.md b/keyboards/m65/rev1/readme.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/m65/rev1/rules.mk b/keyboards/m65/rev1/rules.mk new file mode 100644 index 0000000000..00f4b5d358 --- /dev/null +++ b/keyboards/m65/rev1/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = STM32F103 + +# Bootloader selection +BOOTLOADER = stm32duino + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration +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 +# 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 = yes # USB Nkey 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 -- cgit v1.2.3 From 477365912de93ad5d5b55c27f7861ad254c275b4 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 12 Aug 2021 13:03:40 -0700 Subject: Fix some additional bootmagic settings (#13979) --- keyboards/m65/rev1/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/m65/rev1') diff --git a/keyboards/m65/rev1/rules.mk b/keyboards/m65/rev1/rules.mk index 00f4b5d358..575048f2b7 100644 --- a/keyboards/m65/rev1/rules.mk +++ b/keyboards/m65/rev1/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = stm32duino # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug -- cgit v1.2.3