Merge remote-tracking branch 'origin/master' into develop

9 files changed, 279 insertions, 0 deletions

diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
new file mode 100644
index 0000000000..eb9fb1c473
--- /dev/null
+++ b/keyboards/mwstudio/mw660/config.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * 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"
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define FORCE_NKRO
+
+
+#define RGB_DI_PIN B8
+#define DRIVER_LED_TOTAL 34
+#define RGBLED_NUM 34
+
+#define WS2812_PWM_DRIVER PWMD4               // default: PWMD2
+#define WS2812_PWM_CHANNEL 3                  // default: 2
+//#define WS2812_PWM_COMPLEMENTARY_OUTPUT       // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
+#define WS2812_PWM_PAL_MODE 1                 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 2  
\ No newline at end of file
diff --git a/keyboards/mwstudio/mw660/halconf.h b/keyboards/mwstudio/mw660/halconf.h
new file mode 100644
index 0000000000..0af31c5735
--- /dev/null
+++ b/keyboards/mwstudio/mw660/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * 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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
new file mode 100644
index 0000000000..7e7b9609ff
--- /dev/null
+++ b/keyboards/mwstudio/mw660/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "MWStudio",
+    "keyboard_name": "MW660",
+    "maintainer": "TW59420",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ],
+        "rows": ["A3", "A4", "A5", "A6", "A2" ]
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6601",
+        "vid": "0x7BA1"
+    },
+    "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": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
+                { "matrix": [1, 14], "x": 15.25, "y": 1 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                { "matrix": [3, 2], "x": 2.25, "y": 3},
+                { "matrix": [3, 3], "x": 3.25, "y": 3},
+                { "matrix": [3, 4], "x": 4.25, "y": 3},
+                { "matrix": [3, 5], "x": 5.25, "y": 3},
+                { "matrix": [3, 6], "x": 6.25, "y": 3},
+                { "matrix": [3, 7], "x": 7.25, "y": 3},
+                { "matrix": [3, 8], "x": 8.25, "y": 3},
+                { "matrix": [3, 9], "x": 9.25, "y": 3},
+                { "matrix": [3, 10], "x": 10.25, "y": 3},
+                { "matrix": [3, 11], "x": 11.25, "y": 3},
+                { "matrix": [3, 12], "x": 12.25, "y": 3, "w":2},
+                { "matrix": [3, 13], "x": 14.25, "y": 3},
+
+                { "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                { "matrix": [4, 1], "x": 1.5, "y": 4},
+                { "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                { "matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+                { "matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                { "matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                { "matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.5},
+                { "matrix": [4, 11], "x": 11.75, "y": 4},
+                { "matrix": [4, 12], "x": 13.25, "y": 4},
+                { "matrix": [4, 13], "x": 14.25, "y": 4},
+                { "matrix": [4, 14], "x": 15.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw660/keymaps/default/keymap.c b/keyboards/mwstudio/mw660/keymaps/default/keymap.c
new file mode 100644
index 0000000000..237469c6ee
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * 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 QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+        KC_ESC,  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_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_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_SPACE,                  KC_SPACE,          KC_SPACE,         KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_HUI,
+        RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, 
+        _______, _______, _______, _______,                   _______,          _______,          RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
diff --git a/keyboards/mwstudio/mw660/keymaps/via/keymap.c b/keyboards/mwstudio/mw660/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f77fb773a2
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * 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 QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+        KC_ESC,  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_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_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_SPACE,                  KC_SPACE,          KC_SPACE,         KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_HUI,
+        RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, 
+        _______, _______, _______, _______,                   _______,          _______,          RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/mwstudio/mw660/keymaps/via/rules.mk b/keyboards/mwstudio/mw660/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mwstudio/mw660/mcuconf.h b/keyboards/mwstudio/mw660/mcuconf.h
new file mode 100644
index 0000000000..75d5b91837
--- /dev/null
+++ b/keyboards/mwstudio/mw660/mcuconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+
diff --git a/keyboards/mwstudio/mw660/readme.md b/keyboards/mwstudio/mw660/readme.md
new file mode 100644
index 0000000000..8cfba1a52a
--- /dev/null
+++ b/keyboards/mwstudio/mw660/readme.md
@@ -0,0 +1,22 @@
+# MW660
+
+![MW660](https://i.imgur.com/kJx0mpih.png)
+
+Support STM32F103 keyboard.
+
+* Keyboard Maintainer: [TW59420](https://github.com/TW59420)
+* Hardware Supported: STM32F103
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mwstudio/mw660:default 
+
+Flashing example for this keyboard:
+
+    make mwstudio/mw660: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
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/mwstudio/mw660/rules.mk b/keyboards/mwstudio/mw660/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/mwstudio/mw660/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank