Merge 3d124db008 into 85a7627641

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

keyboards/mwstudio/cover65/config.h

@@ -0,0 +1,23 @@
+/* Copyright 2023 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 WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 2

keyboards/mwstudio/cover65/halconf.h

@@ -0,0 +1,22 @@
+/* Copyright 2023 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>
+

keyboards/mwstudio/cover65/info.json

@@ -0,0 +1,118 @@
+{
+    "manufacturer": "MWStudio",
+    "keyboard_name": "Cover65",
+    "maintainer": "TW59420",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": 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",
+     "ws2812": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "led_count": 21
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6510",
+        "vid": "0x7BA1",
+        "force_nkro": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "A8", "pin_b": "A9" }
+        ]
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 1 },
+                { "matrix": [0, 1], "x": 1, "y": 1 },
+                { "matrix": [0, 2], "x": 2, "y": 1 },
+                { "matrix": [0, 3], "x": 3, "y": 1 },
+                { "matrix": [0, 4], "x": 4, "y": 1 },
+                { "matrix": [0, 5], "x": 5, "y": 1 },
+                { "matrix": [0, 6], "x": 6, "y": 1 },
+                { "matrix": [0, 7], "x": 7, "y": 1 },
+                { "matrix": [0, 8], "x": 8, "y": 1 },
+                { "matrix": [0, 9], "x": 9, "y": 1 },
+                { "matrix": [0, 10], "x": 10, "y": 1 },
+                { "matrix": [0, 11], "x": 11, "y": 1 },
+                { "matrix": [0, 12], "x": 12, "y": 1 },
+                { "matrix": [0, 13], "x": 13, "y": 1, "w": 2 },
+                { "matrix": [0, 14], "x": 15, "y": 1 },
+
+                { "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5 },
+                { "matrix": [1, 1], "x": 1.5, "y": 2 },
+                { "matrix": [1, 2], "x": 2.5, "y": 2 },
+                { "matrix": [1, 3], "x": 3.5, "y": 2 },
+                { "matrix": [1, 4], "x": 4.5, "y": 2 },
+                { "matrix": [1, 5], "x": 5.5, "y": 2 },
+                { "matrix": [1, 6], "x": 6.5, "y": 2 },
+                { "matrix": [1, 7], "x": 7.5, "y": 2 },
+                { "matrix": [1, 8], "x": 8.5, "y": 2 },
+                { "matrix": [1, 9], "x": 9.5, "y": 2 },
+                { "matrix": [1, 10], "x": 10.5, "y": 2 },
+                { "matrix": [1, 11], "x": 11.5, "y": 2 },
+                { "matrix": [1, 12], "x": 12.5, "y": 2 },
+                { "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5 },
+                { "matrix": [1, 14], "x": 15, "y": 2 },
+
+                { "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75 },
+                { "matrix": [2, 1], "x": 1.75, "y": 3 },
+                { "matrix": [2, 2], "x": 2.75, "y": 3 },
+                { "matrix": [2, 3], "x": 3.75, "y": 3 },
+                { "matrix": [2, 4], "x": 4.75, "y": 3 },
+                { "matrix": [2, 5], "x": 5.75, "y": 3 },
+                { "matrix": [2, 6], "x": 6.75, "y": 3 },
+                { "matrix": [2, 7], "x": 7.75, "y": 3 },
+                { "matrix": [2, 8], "x": 8.75, "y": 3 },
+                { "matrix": [2, 9], "x": 9.75, "y": 3 },
+                { "matrix": [2, 10], "x": 10.75, "y": 3 },
+                { "matrix": [2, 11], "x": 11.75, "y": 3 },
+                { "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25 },
+                { "matrix": [2, 14], "x": 15, "y": 3 },
+
+                { "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25 },
+                { "matrix": [3, 2], "x": 2.25, "y": 4 },
+                { "matrix": [3, 3], "x": 3.25, "y": 4 },
+                { "matrix": [3, 4], "x": 4.25, "y": 4 },
+                { "matrix": [3, 5], "x": 5.25, "y": 4 },
+                { "matrix": [3, 6], "x": 6.25, "y": 4 },
+                { "matrix": [3, 7], "x": 7.25, "y": 4 },
+                { "matrix": [3, 8], "x": 8.25, "y": 4 },
+                { "matrix": [3, 9], "x": 9.25, "y": 4 },
+                { "matrix": [3, 10], "x": 10.25, "y": 4 },
+                { "matrix": [3, 11], "x": 11.25, "y": 4 },
+                { "matrix": [3, 12], "x": 12.25, "y": 4, "w":1.75},
+                { "matrix": [3, 13], "x": 14, "y": 4 },
+                { "matrix": [3, 14], "x": 15, "y": 4 },
+
+                { "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25 },
+                { "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25 },
+                { "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25 },
+                { "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25 },
+                { "matrix": [4, 10], "x": 10, "y": 5, "w": 1.25 },
+                { "matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25 },
+                { "matrix": [4, 12], "x": 13, "y": 5 },
+                { "matrix": [4, 13], "x": 14, "y": 5 },
+                { "matrix": [4, 14], "x": 15, "y": 5 }
+            ]
+        }
+    }
+}

keyboards/mwstudio/cover65/keymaps/default/keymap.c

@@ -0,0 +1,35 @@
+/* Copyright 2023 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_65_ansi_blocker(
+        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_DEL,
+        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_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPACE,                            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [1] = LAYOUT_65_ansi_blocker(
+        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_SAI,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
+        _______, _______, _______,                            _______,                            RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};

keyboards/mwstudio/cover65/keymaps/via/keymap.c

@@ -0,0 +1,42 @@
+/* Copyright 2023 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_65_ansi_blocker(
+        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_DEL,
+        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_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPACE,                            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [1] = LAYOUT_65_ansi_blocker(
+        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_SAI,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
+        _______, _______, _______,                            _______,                            RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+};
+#endif

keyboards/mwstudio/cover65/keymaps/via/rules.mk

@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/mwstudio/cover65/mcuconf.h

@@ -0,0 +1,23 @@
+/* Copyright 2023 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
+
+

keyboards/mwstudio/cover65/readme.md

@@ -0,0 +1,22 @@
+# Cover65
+
+![Cover65](https://i.imgur.com/m1EFfOUh.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/cover65:default
+
+Flashing example for this keyboard:
+
+    make mwstudio/cover65: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

keyboards/mwstudio/cover65/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank

tmk_core/protocol/usb_descriptor.c

@@ -281,7 +281,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
             HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
             HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x10),
-            HID_RI_UNIT(8, 0x33),          // Inch, English Linear
+            HID_RI_UNIT(8, 0x13),          // Inch, English Linear
             HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
         HID_RI_END_COLLECTION(0),

tmk_core/protocol/vusb/vusb.c

@@ -659,7 +659,7 @@ const PROGMEM uchar shared_hid_report[] = {
     0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
     0x95, 0x02,       //     Report Count (2)
     0x75, 0x10,       //     Report Size (16)
-    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x65, 0x13,       //     Unit (Inch, English Linear)
     0x55, 0x0E,       //     Unit Exponent (-2)
     0x81, 0x02,       //     Input (Data, Variable, Absolute)
     0xC0,             //   End Collection