fix e75 pin bug and add zhou75 solder version

keyboards/yandrstudio/Eureka75/f401/board.h

@@ -18,8 +18,9 @@
 #include_next "board.h"
 
 
+
 #undef STM32_HSECLK
-#define STM32_HSECLK 16000000
+#define STM32_HSECLK 8000000
 
 
 #define BOARD_YANDR_BIU_F401

keyboards/yandrstudio/Eureka75/f401/config.h

@@ -22,8 +22,8 @@
 #define MATRIX_COLS 15
 
 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
-#define MATRIX_COL_PINS { A13, A14, A15, A0, A1, A2, A3, B12, B13, B14, B15, B4, A8, A9, A10}
-#define MATRIX_ROW_PINS { A5, A6, A7, B0, B4, B1}
+#define MATRIX_COL_PINS { C13, C14, C15, A0, A1, A2, A3, B12, B13, B14, B15, B4, A8, A9, A10}
+#define MATRIX_ROW_PINS { A5, A6, A7, B0, A4, B1}
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
@@ -84,6 +84,6 @@
 #define ENCODERS_PAD_A { B7 }
 #define ENCODERS_PAD_B { B6 }
 
-#define ENCODER_RESOLUTIONS { 4 }
+#define ENCODER_RESOLUTIONS { 2 }
 
 #endif

keyboards/yandrstudio/Eureka75/f401/mcuconf.h

@@ -60,7 +60,7 @@
 #define STM32_CLOCK48_REQUIRED TRUE
 #define STM32_SW STM32_SW_PLL
 #define STM32_PLLSRC STM32_PLLSRC_HSE
-#define STM32_PLLM_VALUE 16
+#define STM32_PLLM_VALUE 8
 #define STM32_PLLN_VALUE 192
 #define STM32_PLLP_VALUE 4
 #define STM32_PLLQ_VALUE 4

keyboards/yandrstudio/Eureka75/keymaps/default/keymap.c

@@ -19,12 +19,12 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  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_MUTE,
+ 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_SPC,
  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_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_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_END,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_VOLU, KC_VOLD, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_LEFT, KC_DOWN, KC_RGHT),
+ 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_VOLU, KC_VOLD, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_LEFT, KC_DOWN, KC_RIGHT),
 
  LAYOUT(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
- LAYOUT(
+ LAYOUT(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
 

keyboards/yandrstudio/Eureka75/keymaps/via/keymap.c

@@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  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_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_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_END,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_NO,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_NO, KC_NO, KC_NO),
+ 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_VOLU, KC_VOLD, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_LEFT, KC_DOWN, KC_RIGHT),
 
  LAYOUT(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

keyboards/yandrstudio/Eureka75/readme.md

@@ -2,7 +2,7 @@ Eureka75 version 1.0
 ===
 
 A 75% keys keyboard with rgb (keys).
-This keyboard use 16mhz HSE and STM32F401 as MCU.
+This keyboard use 8mhz HSE and STM32F401 as MCU.
 
 Keyboard Maintainer: https://github.com/jiaxin96
 Hardware Supported: Eureka75

keyboards/yandrstudio/Eureka75/rules.mk

@@ -5,8 +5,8 @@ BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
 KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
 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
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes # USB Nkey Rollover
 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in

keyboards/yandrstudio/WS69v2/keymaps/via/keymap.c

@@ -27,4 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-;
+
+void keyboard_post_init_user(void) {
+ eeconfig_init();
+}

keyboards/yandrstudio/WS69v2/readme.md

@@ -10,6 +10,6 @@ Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
- make yandrstudio/WS69v2:default
+ make yandrstudio/WS69v2:via
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

keyboards/yandrstudio/readme.md

@@ -1,26 +1,26 @@
-# Keyboard Firmware of Y&R Studio
+# Keyboard Firmwares of Y&R Studio
 
 ## Studio overview
 
 A creative coder.
 
 > Jason Ren (Biu)
 
-## Keyboard Firmware and Utils
+## Keyboard Firmwares and Utils
 
-### Keyboard Released by Y&R Studio Itself
+### Keyboards Released by Y&R Studio Itself
 | NAME | VENDOR_ID | PRODUCT_ID | FEATURES | COMMERCIALIZATION |
 | ------------- | --------- | ---------- | ------------------------------------- | ----------------- |
 | rainbow65 | 0xAA96 | 0xAA00 | OLED, RGB, ENCODER | ✓ |
 | cool87 | 0xAA96 | 0xAA01 | 32u4 | ✗ |
-| sb65p | 0xAA96 | 0xAA02 | 2.4G Split Keyboard  | ✗ |
+| sb65p | 0xAA96 | 0xAA02 | 2.4G Single mode Split Keyboard | ✗ |
 | r65ble | 0xAA96 | 0xAA03 | BLE 5.0 Dual mod version of rainbow65 | ✗ |
 | whiteMouse28T | 0xAA96 | 0xAA04 | External EEPROM (95256), For Test | ✗ |
 | m60ble | 0xAA96 | 0xAA05 | BLE 5.0 Dual mode, RGB | ? |
 
 
 
-### Keyboard Completed with Y&R Studio Participation
+### Keyboards Completed with Y&R Studio Participation
 | NAME | VENDOR_ID | PRODUCT_ID | FEATURES | COMMERCIALIZATION |
 | ------------ | --------- | ---------- | ------------------------- | ----------------- |
 | nlhhkb | 0xAA96 | 0xAAA0 | 32u4 | ? |

keyboards/yandrstudio/zhou75/hotswap/f401/board.h

@@ -0,0 +1,25 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
+
+
+#define BOARD_YANDR_BIU_F401

keyboards/yandrstudio/zhou75/hotswap/f401/chconf.h

@@ -0,0 +1,36 @@
+/* Copyright 2020 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 <http:https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_ST_RESOLUTION 16
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
+

keyboards/yandrstudio/zhou75/hotswap/f401/config.h

@@ -0,0 +1,90 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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:https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
+#define MATRIX_COL_PINS { A6, A3, A7, B0, B1, B10, A2, B13, C13, C15, A15, B3, B4, B6, B9}
+#define MATRIX_ROW_PINS { A9, A8, B15, B14, A1, C14}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+
+/* RGN Matrix */
+#ifdef RGB_MATRIX_ENABLE
+
+# define RGB_DI_PIN B5
+# define RGBLED_NUM 81
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+# define RGBLIGHT_VAL_STEP 15
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true
+# define RGB_MATRIX_CENTER { 32, 96 }
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGBLIGHT_ANIMATIONS
+
+// # define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
+
+#endif
+
+
+#ifdef RGBLIGHT_ENABLE
+
+# define RGB_DI_PIN B5
+# define RGBLED_NUM 81
+# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGBLIGHT_LIMIT_VAL 150
+# define RGBLIGHT_ANIMATIONS
+# define RGBLIGHT_SLEEP
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+
+
+// # define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
+
+#endif
+
+
+
+#ifdef ENCODER_ENABLE
+
+#define ENCODERS_PAD_A { B7, A4 }
+#define ENCODERS_PAD_B { B8, A5 }
+
+#define ENCODER_RESOLUTIONS { 4, 4 }
+
+#endif