From 2ce5192c5d93a6950f703c89b6c45dc64a76b98e Mon Sep 17 00:00:00 2001 From: JX <572673807@qq.com> Date: Sun, 29 Aug 2021 22:57:58 +0800 Subject: [PATCH] update local file --- keyboards/yandrstudio/Eureka75/f401/matrix.c | 12 +- keyboards/yandrstudio/Eureka75/readme.md | 6 +- keyboards/yandrstudio/M69/M69.h | 2 +- keyboards/yandrstudio/M69/config.h | 2 +- .../yandrstudio/M69/hotswap/f401/matrix.c | 12 +- .../yandrstudio/M69/keymaps/default/keymap.c | 2 +- .../yandrstudio/M69/keymaps/via/keymap.c | 2 +- keyboards/yandrstudio/M69/readme.md | 4 +- keyboards/yandrstudio/M69/rules.mk | 2 +- .../yandrstudio/M69/solder/f401/matrix.c | 12 +- keyboards/yandrstudio/boy40ble/f401/matrix.c | 12 +- keyboards/yandrstudio/boyPad/f401/matrix.c | 12 +- keyboards/yandrstudio/m60ble/f401/matrix.c | 12 +- keyboards/yandrstudio/readme.md | 12 +- keyboards/yandrstudio/tdcq64_2s/f401/matrix.c | 12 +- keyboards/yandrstudio/tdcq68/f401/matrix.c | 12 +- .../yandrstudio/whiteMouse28T/f401/matrix.c | 12 +- keyboards/yandrstudio/whiteMouse28T/readme.md | 2 +- .../yandrstudio/whiteMouse69/f401/config.h | 4 +- .../yandrstudio/whiteMouse69/f401/matrix.c | 12 +- keyboards/yandrstudio/whiteMouse69/readme.md | 8 +- keyboards/yandrstudio/yp87ble/f401/matrix.c | 12 +- keyboards/yandrstudio/yp980ble/f401/matrix.c | 12 +- keyboards/yandrstudio/zhou65/config.h | 8 +- keyboards/yandrstudio/zhou65/f401/matrix.c | 12 +- .../{zhou65bak => zhou65}/info-via.json | 0 keyboards/yandrstudio/zhou65/zhou65.h | 24 +- keyboards/yandrstudio/zhou65bak/config.h | 43 ---- keyboards/yandrstudio/zhou65bak/f401/board.h | 25 -- keyboards/yandrstudio/zhou65bak/f401/chconf.h | 34 --- keyboards/yandrstudio/zhou65bak/f401/config.h | 33 --- .../zhou65bak/f401/eep/eeprom_stm32.c | 217 ---------------- .../zhou65bak/f401/eep/eeprom_stm32_custom.h | 104 -------- .../zhou65bak/f401/eep/flash_stm32.c | 223 ----------------- .../yandrstudio/zhou65bak/f401/halconf.h | 33 --- keyboards/yandrstudio/zhou65bak/f401/matrix.c | 236 ------------------ .../yandrstudio/zhou65bak/f401/mcuconf.h | 81 ------ keyboards/yandrstudio/zhou65bak/f401/rules.mk | 17 -- keyboards/yandrstudio/zhou65bak/info.json | 12 - .../zhou65bak/keymaps/default/keymap.c | 32 --- .../zhou65bak/keymaps/via/keymap.c | 32 --- .../zhou65bak/keymaps/via/rules.mk | 1 - keyboards/yandrstudio/zhou65bak/readme.md | 16 -- keyboards/yandrstudio/zhou65bak/rules.mk | 14 -- keyboards/yandrstudio/zhou65bak/zhou65.c | 17 -- keyboards/yandrstudio/zhou65bak/zhou65.h | 32 --- keyboards/yandrstudio/zhou75/f401/matrix.c | 4 +- .../yandrstudio/zhou75/hotswap/f401/matrix.c | 12 +- .../yandrstudio/zhou75/solder/f401/matrix.c | 12 +- 49 files changed, 73 insertions(+), 1391 deletions(-) rename keyboards/yandrstudio/{zhou65bak => zhou65}/info-via.json (100%) delete mode 100644 keyboards/yandrstudio/zhou65bak/config.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/board.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/chconf.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/config.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32.c delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32_custom.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/eep/flash_stm32.c delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/halconf.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/matrix.c delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/mcuconf.h delete mode 100644 keyboards/yandrstudio/zhou65bak/f401/rules.mk delete mode 100644 keyboards/yandrstudio/zhou65bak/info.json delete mode 100644 keyboards/yandrstudio/zhou65bak/keymaps/default/keymap.c delete mode 100644 keyboards/yandrstudio/zhou65bak/keymaps/via/keymap.c delete mode 100644 keyboards/yandrstudio/zhou65bak/keymaps/via/rules.mk delete mode 100644 keyboards/yandrstudio/zhou65bak/readme.md delete mode 100644 keyboards/yandrstudio/zhou65bak/rules.mk delete mode 100644 keyboards/yandrstudio/zhou65bak/zhou65.c delete mode 100644 keyboards/yandrstudio/zhou65bak/zhou65.h diff --git a/keyboards/yandrstudio/Eureka75/f401/matrix.c b/keyboards/yandrstudio/Eureka75/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/Eureka75/f401/matrix.c +++ b/keyboards/yandrstudio/Eureka75/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/Eureka75/readme.md b/keyboards/yandrstudio/Eureka75/readme.md index 9ac2bddc6a69..c835a752b453 100644 --- a/keyboards/yandrstudio/Eureka75/readme.md +++ b/keyboards/yandrstudio/Eureka75/readme.md @@ -1,16 +1,16 @@ -Eureka75 version 1.0 +eureka75 version 1.0 === A 75% keys keyboard with rgb (keys). This keyboard use 8mhz HSE and STM32F401 as MCU. Keyboard Maintainer: https://github.com/jiaxin96 -Hardware Supported: Eureka75 +Hardware Supported: eureka75 Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard Make example for this keyboard (after setting up your build environment): - make yandrstudio/Eureka75/f401:default + make yandrstudio/eureka75/f401:default 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. diff --git a/keyboards/yandrstudio/M69/M69.h b/keyboards/yandrstudio/M69/M69.h index 43d5c105bea9..e70ce9390785 100644 --- a/keyboards/yandrstudio/M69/M69.h +++ b/keyboards/yandrstudio/M69/M69.h @@ -15,7 +15,7 @@ */ #pragma once -#if defined(KEYBOARD_yandrstudio_M69_solder) +#if defined(KEYBOARD_yandrstudio_m69_solder) #include "solder.h" #else #include "hotswap.h" diff --git a/keyboards/yandrstudio/M69/config.h b/keyboards/yandrstudio/M69/config.h index 6e9a0e37cd36..cd0e884bd7fa 100644 --- a/keyboards/yandrstudio/M69/config.h +++ b/keyboards/yandrstudio/M69/config.h @@ -20,7 +20,7 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0xAA96 #define DEVICE_VER 0x0001 -#define MANUFACTURER JasonRen biu +#define MANUFACTURER JasonRen biu-Y&R #define PRODUCT M69 // enable the nkro when using the VIA. diff --git a/keyboards/yandrstudio/M69/hotswap/f401/matrix.c b/keyboards/yandrstudio/M69/hotswap/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/M69/hotswap/f401/matrix.c +++ b/keyboards/yandrstudio/M69/hotswap/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/M69/keymaps/default/keymap.c b/keyboards/yandrstudio/M69/keymaps/default/keymap.c index 5896db3a6c46..1b47a594d2dd 100644 --- a/keyboards/yandrstudio/M69/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/M69/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -#if defined(KEYBOARD_yandrstudio_M69_solder) +#if defined(KEYBOARD_yandrstudio_m69_solder) LAYOUT_solder( 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_PSCR, KC_SLCK, KC_PAUS, 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_DEL, KC_INS, KC_HOME, KC_PGUP, diff --git a/keyboards/yandrstudio/M69/keymaps/via/keymap.c b/keyboards/yandrstudio/M69/keymaps/via/keymap.c index 5896db3a6c46..1b47a594d2dd 100644 --- a/keyboards/yandrstudio/M69/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/M69/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -#if defined(KEYBOARD_yandrstudio_M69_solder) +#if defined(KEYBOARD_yandrstudio_m69_solder) LAYOUT_solder( 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_PSCR, KC_SLCK, KC_PAUS, 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_DEL, KC_INS, KC_HOME, KC_PGUP, diff --git a/keyboards/yandrstudio/M69/readme.md b/keyboards/yandrstudio/M69/readme.md index 01d5393a4557..f14d21ab097c 100644 --- a/keyboards/yandrstudio/M69/readme.md +++ b/keyboards/yandrstudio/M69/readme.md @@ -12,10 +12,10 @@ Make example for this keyboard (after setting up your build environment): for solder version: - make yandrstudio/M69/solder/f401:default + make yandrstudio/m69/solder/f401:default for hotswap version: - make yandrstudio/M69/hotswap/f401:default + make yandrstudio/m69/hotswap/f401:default 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. diff --git a/keyboards/yandrstudio/M69/rules.mk b/keyboards/yandrstudio/M69/rules.mk index d66f30982d8e..56aa23e5d7a2 100644 --- a/keyboards/yandrstudio/M69/rules.mk +++ b/keyboards/yandrstudio/M69/rules.mk @@ -12,4 +12,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in -DEFAULT_FOLDER = yandrstudio/M69/solder +DEFAULT_FOLDER = yandrstudio/m69/solder diff --git a/keyboards/yandrstudio/M69/solder/f401/matrix.c b/keyboards/yandrstudio/M69/solder/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/M69/solder/f401/matrix.c +++ b/keyboards/yandrstudio/M69/solder/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/boy40ble/f401/matrix.c b/keyboards/yandrstudio/boy40ble/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/boy40ble/f401/matrix.c +++ b/keyboards/yandrstudio/boy40ble/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/boyPad/f401/matrix.c b/keyboards/yandrstudio/boyPad/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/boyPad/f401/matrix.c +++ b/keyboards/yandrstudio/boyPad/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/m60ble/f401/matrix.c b/keyboards/yandrstudio/m60ble/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/m60ble/f401/matrix.c +++ b/keyboards/yandrstudio/m60ble/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/readme.md b/keyboards/yandrstudio/readme.md index 178270e2c240..967d18df46f3 100644 --- a/keyboards/yandrstudio/readme.md +++ b/keyboards/yandrstudio/readme.md @@ -15,7 +15,7 @@ A creative coder. | cool87 | 0xAA96 | 0xAA01 | 32u4 | ✗ | | 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 | ✗ | +| whitemouse28t | 0xAA96 | 0xAA04 | External EEPROM (95256), For Test | ✗ | | m60ble | 0xAA96 | 0xAA05 | BLE 5.0 Dual mode, RGB | ? | @@ -27,15 +27,15 @@ A creative coder. | tdcq68 | 0xAA96 | 0xAAA1 | F401, RGB | ✗ | | tdcq64_2s | 0xAA96 | 0xAAA2 | F401, RGB | ✗ | | yp980ble | 0xAA96 | 0xAAA3 | BLE 5.0 Dual mode | ? | -| whiteMouse69 | 0xAA96 | 0xAAA4 | F401, RGB | ✓ | +| whitemouse69 | 0xAA96 | 0xAAA4 | F401, RGB | ✓ | | x | 0xAA96 | 0xAAA5 | x | x | -| M69 | 0xAA96 | 0xAAA6 | F401,80%, RGB, Hotswap | ✓ | -| M69 | 0xAA96 | 0xAAB6 | F401,80%, RGB, Solder | ✓ | +| m69 | 0xAA96 | 0xAAA6 | F401,80%, RGB, Hotswap | ✓ | +| m69 | 0xAA96 | 0xAAB6 | F401,80%, RGB, Solder | ✓ | | zhou75 | 0xAA96 | 0xAAA7 | F401, ENCODER, Hotswap | ✓ | | zhou75 | 0xAA96 | 0xAAB7 | F401, ENCODER, Solder | ✓ | | yp87ble | 0xAA96 | 0xAAA8 | BLE 5.0 Dual mode | ? | -| hotdox76V2 | 0xAA96 | 0xAAA9 | 32u4, Split KB, OLED, RGB | ✓ | -| Eureka75 | 0xAA96 | 0xAAAA | F401,ENCODER | ✓ | +| hotdox76v2 | 0xAA96 | 0xAAA9 | 32u4, Split KB, OLED, RGB | ✓ | +| eureka75 | 0xAA96 | 0xAAAA | F401,ENCODER | ✓ | | boy40ble | 0xAA96 | 0xAAAB | BLE 5.0 Dual mode | ✗ | | boyPad | 0xAA96 | 0xAAAC | F401 | ✗ | | zhou65 | 0xAA96 | 0xAAAD | F401 | ✗ | diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/matrix.c b/keyboards/yandrstudio/tdcq64_2s/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/tdcq64_2s/f401/matrix.c +++ b/keyboards/yandrstudio/tdcq64_2s/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/tdcq68/f401/matrix.c b/keyboards/yandrstudio/tdcq68/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/tdcq68/f401/matrix.c +++ b/keyboards/yandrstudio/tdcq68/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/whiteMouse28T/f401/matrix.c b/keyboards/yandrstudio/whiteMouse28T/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/whiteMouse28T/f401/matrix.c +++ b/keyboards/yandrstudio/whiteMouse28T/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/whiteMouse28T/readme.md b/keyboards/yandrstudio/whiteMouse28T/readme.md index 27a4fab5d65a..db0b14879190 100644 --- a/keyboards/yandrstudio/whiteMouse28T/readme.md +++ b/keyboards/yandrstudio/whiteMouse28T/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/whiteMouse28T/f401:default + make yandrstudio/whitemouse28t/f401:default 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. diff --git a/keyboards/yandrstudio/whiteMouse69/f401/config.h b/keyboards/yandrstudio/whiteMouse69/f401/config.h index 5fe3d13b3ca2..5f4e8037b989 100644 --- a/keyboards/yandrstudio/whiteMouse69/f401/config.h +++ b/keyboards/yandrstudio/whiteMouse69/f401/config.h @@ -40,7 +40,7 @@ # define WS2812_SPI SPID2 // default: SPID1 # define WS2812_SPI_MOSI_PAL_MODE 5 # define WS2812_SPI_USE_CIRCULAR_BUFFER -// # define WS2812_SPI_DIVISOR 8 +# define WS2812_SPI_DIVISOR 8 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 # define RGBLIGHT_VAL_STEP 15 @@ -69,7 +69,7 @@ # define WS2812_SPI SPID2 // default: SPID1 # define WS2812_SPI_MOSI_PAL_MODE 5 # define WS2812_SPI_USE_CIRCULAR_BUFFER -// # define WS2812_SPI_DIVISOR 8 +# define WS2812_SPI_DIVISOR 8 diff --git a/keyboards/yandrstudio/whiteMouse69/f401/matrix.c b/keyboards/yandrstudio/whiteMouse69/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/whiteMouse69/f401/matrix.c +++ b/keyboards/yandrstudio/whiteMouse69/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/whiteMouse69/readme.md b/keyboards/yandrstudio/whiteMouse69/readme.md index a03906c9db86..07761db7255c 100644 --- a/keyboards/yandrstudio/whiteMouse69/readme.md +++ b/keyboards/yandrstudio/whiteMouse69/readme.md @@ -1,22 +1,22 @@ -whiteMouse69 +whitemouse69 === A 69 keys keyboard (60%) with rgb (keys). This keyboard use 8mhz HSE STM32F401 and STM32F103 as MCU. Keyboard Maintainer: https://github.com/jiaxin96 -Hardware Supported: whiteMouse69 +Hardware Supported: whitemouse69 Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard Make example for this keyboard (after setting up your build environment): for stm32f401 version: - make yandrstudio/whiteMouse69/f401:default + make yandrstudio/whitemouse69/f401:default for stm32f103 version: - make yandrstudio/whiteMouse69/f103:default + make yandrstudio/whitemouse69/f103:default 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. diff --git a/keyboards/yandrstudio/yp87ble/f401/matrix.c b/keyboards/yandrstudio/yp87ble/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/yp87ble/f401/matrix.c +++ b/keyboards/yandrstudio/yp87ble/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/yp980ble/f401/matrix.c b/keyboards/yandrstudio/yp980ble/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/yp980ble/f401/matrix.c +++ b/keyboards/yandrstudio/yp980ble/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 2efdebba590d..e29b13ae8f5e 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -25,15 +25,19 @@ #define PRODUCT zhou65 #define DESCRIPTION STM32 based 65%. -/* enable the nkro when using the VIA. */ +// enable the nkro when using the VIA. #define FORCE_NKRO -/* fix VIA RGB_light */ +// fix VIA RGB_light #define VIA_HAS_BROKEN_KEYCODES +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 1 +// #define DEBUG_MATRIX_SCAN_RATE + #define USB_POLLING_INTERVAL_MS 1 #define QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/yandrstudio/zhou65/f401/matrix.c b/keyboards/yandrstudio/zhou65/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/zhou65/f401/matrix.c +++ b/keyboards/yandrstudio/zhou65/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/zhou65bak/info-via.json b/keyboards/yandrstudio/zhou65/info-via.json similarity index 100% rename from keyboards/yandrstudio/zhou65bak/info-via.json rename to keyboards/yandrstudio/zhou65/info-via.json diff --git a/keyboards/yandrstudio/zhou65/zhou65.h b/keyboards/yandrstudio/zhou65/zhou65.h index 2f22710f469d..276849908e75 100644 --- a/keyboards/yandrstudio/zhou65/zhou65.h +++ b/keyboards/yandrstudio/zhou65/zhou65.h @@ -17,16 +17,16 @@ #include "quantum.h" -#define LAYOUT(\ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,\ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214,\ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314,\ - K400, K401, K402, K405, K409, K410, K412, K413, K414\ -) {\ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 },\ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 },\ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 },\ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 },\ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 }\ +#define LAYOUT( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ + K400, K401, K402, K405, K409, K410, K412, K413, K414 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \ + { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \ } diff --git a/keyboards/yandrstudio/zhou65bak/config.h b/keyboards/yandrstudio/zhou65bak/config.h deleted file mode 100644 index e29b13ae8f5e..000000000000 --- a/keyboards/yandrstudio/zhou65bak/config.h +++ /dev/null @@ -1,43 +0,0 @@ -/* 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 . - */ -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAA96 -#define PRODUCT_ID 0xAAAD -#define DEVICE_VER 0x0001 -#define MANUFACTURER lkaill-Y&R -#define PRODUCT zhou65 -#define DESCRIPTION STM32 based 65%. - -// enable the nkro when using the VIA. -#define FORCE_NKRO - -// fix VIA RGB_light -#define VIA_HAS_BROKEN_KEYCODES - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 1 - -// #define DEBUG_MATRIX_SCAN_RATE - -#define USB_POLLING_INTERVAL_MS 1 -#define QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/yandrstudio/zhou65bak/f401/board.h b/keyboards/yandrstudio/zhou65bak/f401/board.h deleted file mode 100644 index 5a8d0273fef4..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/board.h +++ /dev/null @@ -1,25 +0,0 @@ -/* 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 . - */ -#pragma once - -#include_next "board.h" - - -#undef STM32_HSECLK -#define STM32_HSECLK 8000000 - - -#define BOARD_UCHEN_F401 diff --git a/keyboards/yandrstudio/zhou65bak/f401/chconf.h b/keyboards/yandrstudio/zhou65bak/f401/chconf.h deleted file mode 100644 index 4820db8dcbeb..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/chconf.h +++ /dev/null @@ -1,34 +0,0 @@ -/* 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 . - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#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 - diff --git a/keyboards/yandrstudio/zhou65bak/f401/config.h b/keyboards/yandrstudio/zhou65bak/f401/config.h deleted file mode 100644 index d5214b75d0f7..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* 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 . - */ -#pragma once - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 } -#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -#define LED_CAPS_LOCK_PIN A15 -#define LED_PIN_ON_STATE 0 - diff --git a/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32.c b/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32.c deleted file mode 100644 index 12071a21291e..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32.c +++ /dev/null @@ -1,217 +0,0 @@ -/* - * This software is experimental and a work in progress. - * Under no circumstances should these files be used in relation to any critical system(s). - * Use of these files is at your own risk. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * This files are free to use from http://engsta.com/stm32-flash-memory-eeprom-emulator/ by - * Artur F. - * - * Modifications for QMK and STM32F303 by Yiancar - * update for STM32F4 support and the the flashing algorithm by yulei - * Adjust the file structure to custom EEPROM_DRIVER by jiaxin96 for support stm32f401cc - */ - -#include -#include -#include "eeprom_stm32_custom.h" -#include "eeprom_driver.h" -/***************************************************************************** - * Allows to use the internal flash to store non volatile data. To initialize - * the functionality use the EEPROM_Init() function. Be sure that by reprogramming - * of the controller just affected pages will be deleted. In other case the non - * volatile data will be lost. - ******************************************************************************/ - -/* Private macro -------------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ -/* Functions -----------------------------------------------------------------*/ - -#define IS_VALID_ADDRESS(x) ((x) < FEE_MAX_BYTES) - -uint8_t DataBuf[FEE_MAX_BYTES]; -static void EEPROM_Backup(void); -static FLASH_Status EEPROM_Restore(void); -static uint32_t EEPROM_FindValidAddress(void); -static void EEPROM_Clear(void); - -/***************************************************************************** - * Unlock the FLASH programming and initialized the DataBuf - ******************************************************************************/ -uint16_t EEPROM_Init(void) { - // unlock flash - FLASH_Unlock(); - - // initialize DataBuf - EEPROM_Backup(); - - // Clear Flags - // FLASH_ClearFlag(FLASH_SR_EOP|FLASH_SR_PGERR|FLASH_SR_WRPERR); - - return FEE_DENSITY_BYTES; -} -void eeprom_driver_init(void) { - EEPROM_Init(); -} - -/***************************************************************************** - * Erase the whole reserved Flash Space used for user Data - ******************************************************************************/ -void EEPROM_Erase(void) { - // erase all flash pages - EEPROM_Clear(); - - // reset the content of the buffer - memset(&DataBuf[0], FEE_EMPTY_BYTE, sizeof(DataBuf)); -} -void eeprom_driver_erase(void) { - EEPROM_Erase(); -} -/***************************************************************************** - * Write data with its eeprom address to flash if there has empty words, - * otherwise backup the current valid data, erase all flash pages, - * and finally restore the valid data. - *******************************************************************************/ -uint16_t EEPROM_WriteDataByte(uint16_t Address, uint8_t DataByte) { - FLASH_Status FlashStatus = FLASH_COMPLETE; - - uint32_t addr; - // exit if not a valid address - if (!IS_VALID_ADDRESS(Address)) { - return 0; - } - -// we are sure the address will not be out of bound -#pragma GCC diagnostic ignored "-Warray-bounds" - // same value, do not need program - if (DataBuf[Address] == DataByte) { - return FlashStatus; - } - - // find the address can be written - addr = EEPROM_FindValidAddress(); - DataBuf[Address] = DataByte; -#pragma GCC diagnostic pop - if (addr == FEE_EMPTY_VALUE) { - // EEPROM is full, need to erase and reprogramming - EEPROM_Clear(); - EEPROM_Restore(); - } else { - FLASH_ProgramHalfWord(FEE_ADDR_ADDRESS(addr), Address); - FLASH_ProgramHalfWord(FEE_DATA_ADDRESS(addr), DataByte); - } - - return FlashStatus; -} -/***************************************************************************** - * Read once data byte from a specified address. - *******************************************************************************/ -uint8_t EEPROM_ReadDataByte(uint16_t Address) { - if (!IS_VALID_ADDRESS(Address)) { - return FEE_EMPTY_BYTE; - } - - // Get Byte from caches - return DataBuf[Address]; -} - -/***************************************************************************** - * helper functions - *******************************************************************************/ -// backup the current data -void EEPROM_Backup(void) -{ - uint32_t begin = FEE_PAGE_BASE_ADDRESS; - uint32_t end = FEE_PAGE_END_ADDRESS; - memset(&DataBuf[0], FEE_EMPTY_BYTE, sizeof(DataBuf)); - while( begin < end) { - uint16_t addr = *(__IO uint16_t*)(FEE_ADDR_ADDRESS(begin)); - if (IS_VALID_ADDRESS(addr)) { - DataBuf[addr] = *(__IO uint16_t*)(FEE_DATA_ADDRESS(begin)); - } else if( addr == FEE_EMPTY_WORD) { - uint16_t data = *(__IO uint16_t*)(FEE_DATA_ADDRESS(begin)); - if (data == FEE_EMPTY_WORD) { - // we reached the end of valid data - break; - } - } - begin += 4; - } -} -// restore data from DataBuf -FLASH_Status EEPROM_Restore(void) { - uint32_t cur = FEE_PAGE_BASE_ADDRESS; - for (uint8_t i = 0; i < FEE_MAX_BYTES; i++) { - if (DataBuf[i] != FEE_EMPTY_BYTE) { - FLASH_ProgramHalfWord(FEE_ADDR_ADDRESS(cur), i); - FLASH_ProgramHalfWord(FEE_DATA_ADDRESS(cur), DataBuf[i]); - cur += 4; - } - } - return FLASH_COMPLETE; -} -// find an empty place for programming -uint32_t EEPROM_FindValidAddress(void) { - uint32_t begin = FEE_PAGE_BASE_ADDRESS; - uint32_t end = FEE_PAGE_END_ADDRESS; - while( begin < end) { - uint32_t data = *(__IO uint32_t*)(begin); - if (data == FEE_EMPTY_VALUE) { - return begin; - } - begin += 4; - } - return FEE_EMPTY_VALUE; -} - -void EEPROM_Clear(void) -{ -#if defined(EEPROM_EMU_STM32F401xC) - FLASH_ErasePage(FEE_SECTOR_ID); -#else - int page_num = 0; - - // delete all pages from specified start page to the last page - do { - FLASH_ErasePage(FEE_PAGE_BASE_ADDRESS + (page_num * FEE_PAGE_SIZE)); - page_num++; - } while (page_num < FEE_DENSITY_PAGES); -#endif -} -/***************************************************************************** - * Wrap library in AVR style functions. - *******************************************************************************/ -uint8_t eeprom_read_byte_f4(const uint8_t *Address) { - const uint16_t p = (const uint32_t)Address; - return EEPROM_ReadDataByte(p); -} - -void eeprom_write_byte_f4(uint8_t *Address, uint8_t Value) { - uint16_t p = (uint32_t)Address; - EEPROM_WriteDataByte(p, Value); -} - - -void eeprom_read_block(void *buf, const void *addr, size_t len) { - const uint8_t *p = (const uint8_t *)addr; - uint8_t * dest = (uint8_t *)buf; - while (len--) { - *dest++ = eeprom_read_byte_f4(p++); - } -} - -void eeprom_write_block(const void *buf, void *addr, size_t len) { - uint8_t * p = (uint8_t *)addr; - const uint8_t *src = (const uint8_t *)buf; - while (len--) { - eeprom_write_byte_f4(p++, *src++); - } -} - - diff --git a/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32_custom.h b/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32_custom.h deleted file mode 100644 index 096842aaaf16..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/eep/eeprom_stm32_custom.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * This software is experimental and a work in progress. - * Under no circumstances should these files be used in relation to any critical system(s). - * Use of these files is at your own risk. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * This files are free to use from http://engsta.com/stm32-flash-memory-eeprom-emulator/ by - * Artur F. - * - * Modifications for QMK and STM32F303 by Yiancar - * - * This library assumes 8-bit data locations. To add a new MCU, please provide the flash - * page size and the total flash size in Kb. The number of available pages must be a multiple - * of 2. Only half of the pages account for the total EEPROM size. - * This library also assumes that the pages are not used by the firmware. - * Adjust the file structure to custom EEPROM_DRIVER by jiaxin96 for support stm32f401cc - */ - -#pragma once - -#include -#include -#include "flash_stm32.h" - -// HACK ALERT. This definition may not match your processor -// To Do. Work out correct value for EEPROM_PAGE_SIZE on the STM32F103CT6 etc -#if defined(EEPROM_EMU_STM32F303xC) -# define MCU_STM32F303CC -#elif defined(EEPROM_EMU_STM32F103xB) -# define MCU_STM32F103RB -#elif defined(EEPROM_EMU_STM32F072xB) -# define MCU_STM32F072CB -#elif defined(EEPROM_EMU_STM32F042x6) -# define MCU_STM32F042K6 -#elif defined(EEPROM_EMU_STM32F401xC) -# define MCU_STM32F401xC -#else -# error "not implemented." -#endif - - - - - -#ifndef EEPROM_PAGE_SIZE -# if defined(MCU_STM32F103RB) || defined(MCU_STM32F042K6) -# define FEE_PAGE_SIZE (uint16_t)0x400 // Page size = 1KByte -# define FEE_DENSITY_PAGES 4 // How many pages are used -# elif defined(MCU_STM32F103ZE) || defined(MCU_STM32F103RE) || defined(MCU_STM32F103RD) || defined(MCU_STM32F303CC) || defined(MCU_STM32F072CB) -# define FEE_PAGE_SIZE (uint16_t)0x800 // Page size = 2KByte -# define FEE_DENSITY_PAGES 4 // How many pages are used -# elif defined(MCU_STM32F401xC) -# define FEE_PAGE_SIZE (uint32_t)0x20000 // Page size = 128KByte -# define FEE_DENSITY_PAGES 1 // How many pages are used -# define FEE_SECTOR_ID 5 // sector id of the flash -# else -# error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)." -# endif -#endif - -#ifndef EEPROM_START_ADDRESS -# if defined(MCU_STM32F103RB) || defined(MCU_STM32F072CB) -# define FEE_MCU_FLASH_SIZE 128 // Size in Kb -# elif defined(MCU_STM32F042K6) -# define FEE_MCU_FLASH_SIZE 32 // Size in Kb -# elif defined(MCU_STM32F103ZE) || defined(MCU_STM32F103RE) -# define FEE_MCU_FLASH_SIZE 512 // Size in Kb -# elif defined(MCU_STM32F103RD) -# define FEE_MCU_FLASH_SIZE 384 // Size in Kb -# elif defined(MCU_STM32F303CC) -# define FEE_MCU_FLASH_SIZE 256 // Size in Kb -# elif defined(MCU_STM32F401xC) -# define FEE_MCU_FLASH_SIZE 256 // Size in Kb -# else -# error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)." -# endif -#endif - -// DONT CHANGE -// Choose location for the first EEPROM Page address on the top of flash -// #define FEE_PAGE_BASE_ADDRESS ((uint32_t)(0x8000000 + FEE_MCU_FLASH_SIZE * 1024 - FEE_DENSITY_PAGES * FEE_PAGE_SIZE)) -// #define FEE_DENSITY_BYTES ((FEE_PAGE_SIZE / 2) * FEE_DENSITY_PAGES - 1) -// #define FEE_LAST_PAGE_ADDRESS (FEE_PAGE_BASE_ADDRESS + (FEE_PAGE_SIZE * FEE_DENSITY_PAGES)) -// #define FEE_EMPTY_WORD ((uint16_t)0xFFFF) -// #define FEE_ADDR_OFFSET(Address) (Address * 2) // 1Byte per Word will be saved to preserve Flash - -#define FEE_PAGE_END_ADDRESS ((uint32_t)(0x08000000 + FEE_MCU_FLASH_SIZE * 1024)) -#define FEE_PAGE_BASE_ADDRESS ((uint32_t)((FEE_PAGE_END_ADDRESS) - FEE_DENSITY_PAGES * FEE_PAGE_SIZE)) -#define FEE_DENSITY_BYTES ((FEE_PAGE_SIZE / 4) * FEE_DENSITY_PAGES - 1) // 4 Bytes for address, value pair -//#define FEE_LAST_PAGE_ADDRESS (FEE_PAGE_BASE_ADDRESS + (FEE_PAGE_SIZE * FEE_DENSITY_PAGES)) -#define FEE_EMPTY_BYTE ((uint8_t)0xFF) -#define FEE_EMPTY_WORD ((uint16_t)0xFFFF) -#define FEE_EMPTY_VALUE ((uint32_t)0xFFFFFFFF) -//#define FEE_ADDR_OFFSET(Address) (Address * 2) // 1 Byte per Word will be saved to preserve Flash -#define FEE_DATA_ADDRESS(Address) ((Address)+2) // flash address of the eeprom data -#define FEE_ADDR_ADDRESS(Address) (Address) // flash address of the eeprom address -#define FEE_MAX_BYTES ((FEE_DENSITY_BYTES+1) > 1024 ? 1024 : (FEE_DENSITY_BYTES+1)) // eeprom size - diff --git a/keyboards/yandrstudio/zhou65bak/f401/eep/flash_stm32.c b/keyboards/yandrstudio/zhou65bak/f401/eep/flash_stm32.c deleted file mode 100644 index c3f1937c5258..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/eep/flash_stm32.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * This software is experimental and a work in progress. - * Under no circumstances should these files be used in relation to any critical system(s). - * Use of these files is at your own risk. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and - * https://github.com/leaflabs/libmaple - * - * Modifications for QMK and STM32F303 by Yiancar - * Adjust the file structure to custom EEPROM_DRIVER by jiaxin96 for support stm32f401cc - */ - -#if defined(EEPROM_EMU_STM32F303xC) -# define STM32F303xC -# include "stm32f3xx.h" -#elif defined(EEPROM_EMU_STM32F103xB) -# define STM32F103xB -# include "stm32f1xx.h" -#elif defined(EEPROM_EMU_STM32F072xB) -# define STM32F072xB -# include "stm32f0xx.h" -#elif defined(EEPROM_EMU_STM32F042x6) -# define STM32F042x6 -# include "stm32f0xx.h" -#elif defined(EEPROM_EMU_STM32F401xC) -# define STM32F401xC -# include "stm32f4xx.h" -#else -# error "not implemented." -#endif - - -#include "flash_stm32.h" - -#if defined(EEPROM_EMU_STM32F103xB) -# define FLASH_SR_WRPERR FLASH_SR_WRPRTERR -#endif - -#if defined(EEPROM_EMU_STM32F401xC) -# define FLASH_PSIZE_HFWORD FLASH_CR_PSIZE_0 -# define FLASH_PSIZE_WORD FLASH_CR_PSIZE_1 -# define FLASH_CR_SNB_POS 3 -/* the flash key was not defined in the CMSIS used by current chibios */ -#define FLASH_KEY1 0x45670123U -#define FLASH_KEY2 0xCDEF89ABU -# define FLASH_SR_FLAGS (FLASH_SR_PGAERR|FLASH_SR_PGPERR|FLASH_SR_PGSERR|FLASH_SR_WRPERR) -#else -# define FLASH_SR_FLAGS (FLASH_SR_EOP | FLASH_SR_PGERR | FLASH_SR_WRPERR) -#endif - -/* Delay definition */ -#define EraseTimeout ((uint32_t)0x00000FFF) -#define ProgramTimeout ((uint32_t)0x0000001F) - -#define ASSERT(exp) (void)((0)) - -/** - * @brief Inserts a time delay. - * @param None - * @retval None - */ -static void delay(void) { - __IO uint32_t i = 0; - for (i = 0xFF; i != 0; i--) { - } -} - -/** - * @brief Returns the FLASH Status. - * @param None - * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG, - * FLASH_ERROR_WRP or FLASH_COMPLETE - */ -FLASH_Status FLASH_GetStatus(void) { - if ((FLASH->SR & FLASH_SR_BSY) == FLASH_SR_BSY) return FLASH_BUSY; - -#if defined(EEPROM_EMU_STM32F401xC) - if ((FLASH->SR & (FLASH_SR_PGSERR | FLASH_SR_PGPERR | FLASH_SR_PGAERR))) return FLASH_ERROR_PG; - if ((FLASH->SR & FLASH_SR_WRPERR)) return FLASH_ERROR_WRP; -#else - if ((FLASH->SR & FLASH_SR_PGERR) != 0) return FLASH_ERROR_PG; - if ((FLASH->SR & FLASH_SR_WRPERR) != 0) return FLASH_ERROR_WRP; - if ((FLASH->SR & FLASH_OBR_OPTERR) != 0) return FLASH_ERROR_OPT; -#endif - - return FLASH_COMPLETE; -} - -/** - * @brief Waits for a Flash operation to complete or a TIMEOUT to occur. - * @param Timeout: FLASH progamming Timeout - * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, - * FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. - */ -FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { - FLASH_Status status; - - /* Check for the Flash Status */ - status = FLASH_GetStatus(); - /* Wait for a Flash operation to complete or a TIMEOUT to occur */ - while ((status == FLASH_BUSY) && (Timeout != 0x00)) { - delay(); - status = FLASH_GetStatus(); - Timeout--; - } - if (Timeout == 0) status = FLASH_TIMEOUT; - /* Return the operation status */ - return status; -} - -/** - * @brief Erases a specified FLASH page. - * @param Page_Address: The page address or sector to be erased. - * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG, - * FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. - */ -FLASH_Status FLASH_ErasePage(uint32_t Page) { - FLASH_Status status = FLASH_COMPLETE; - /* Check the parameters */ - //ASSERT(IS_FLASH_ADDRESS(Page_Address)); - /* Wait for last operation to be completed */ - status = FLASH_WaitForLastOperation(EraseTimeout); - - if (status == FLASH_COMPLETE) { - /* if the previous operation is completed, proceed to erase the page */ -#if defined(EEPROM_EMU_STM32F401xC) - FLASH->CR &= ~FLASH_CR_SNB; - FLASH->CR |= FLASH_CR_SER | (Page << FLASH_CR_SNB_POS); -#else - FLASH->CR |= FLASH_CR_PER; - FLASH->AR = Page; -#endif - FLASH->CR |= FLASH_CR_STRT; - - /* Wait for last operation to be completed */ - status = FLASH_WaitForLastOperation(EraseTimeout); - /* clear the SER or PER Bit */ -#if defined(EEPROM_EMU_STM32F401xC) - FLASH->CR &= ~(FLASH_CR_SER | FLASH_CR_SNB); -#else - FLASH->CR &= ~FLASH_CR_PER; -#endif - FLASH_ClearFlag(FLASH_SR_FLAGS); - } - /* Return the Erase Status */ - return status; -} - -/** - * @brief Programs a half word at a specified address. - * @param Address: specifies the address to be programmed. - * @param Data: specifies the data to be programmed. - * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, - * FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. - */ -FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) { - FLASH_Status status = FLASH_BAD_ADDRESS; - if ((Address % sizeof(uint16_t) != 0 ) || !IS_FLASH_ADDRESS(Address)) { - return status; - } - - /* Wait for last operation to be completed */ - status = FLASH_WaitForLastOperation(ProgramTimeout); - if (status == FLASH_COMPLETE) { - /* if the previous operation is completed, proceed to program the new data */ -#if defined(EEPROM_EMU_STM32F401xC) - FLASH->CR &= ~FLASH_CR_PSIZE; - FLASH->CR |= FLASH_PSIZE_HFWORD; -#endif - FLASH->CR |= FLASH_CR_PG; - *(__IO uint16_t*)Address = Data; - /* Wait for last operation to be completed */ - status = FLASH_WaitForLastOperation(ProgramTimeout); - if (status != FLASH_TIMEOUT) { - /* if the program operation is completed, disable the PG Bit */ - FLASH->CR &= ~FLASH_CR_PG; - } - FLASH_ClearFlag(FLASH_SR_FLAGS); - } - return status; -} - -/** - * @brief Unlocks the FLASH Program Erase Controller. - * @param None - * @retval None - */ -void FLASH_Unlock(void) { - /* Authorize the FPEC Access */ - FLASH->KEYR = FLASH_KEY1; - FLASH->KEYR = FLASH_KEY2; -} - -/** - * @brief Locks the FLASH Program Erase Controller. - * @param None - * @retval None - */ -void FLASH_Lock(void) { - /* Set the Lock Bit to lock the FPEC and the FCR */ - FLASH->CR |= FLASH_CR_LOCK; -} - -/** - * @brief Clears the FLASH's pending flags. - * @param FLASH_FLAG: specifies the FLASH flags to clear. - * This parameter can be any combination of the following values: - * @arg FLASH_FLAG_PGERR: FLASH Programming error flag flag - * @arg FLASH_FLAG_WRPERR: FLASH Write protected error flag - * @arg FLASH_FLAG_EOP: FLASH End of Programming flag - * @retval None - */ -void FLASH_ClearFlag(uint32_t FLASH_FLAG) { - /* Clear the flags */ - FLASH->SR |= FLASH_FLAG; -} diff --git a/keyboards/yandrstudio/zhou65bak/f401/halconf.h b/keyboards/yandrstudio/zhou65bak/f401/halconf.h deleted file mode 100644 index cf7665e3f7b6..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/halconf.h +++ /dev/null @@ -1,33 +0,0 @@ -/* 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 . - */ - - -#pragma once -#include_next - - -#undef SERIAL_USB_BUFFERS_SIZE -#define SERIAL_USB_BUFFERS_SIZE 256 - -#undef SERIAL_BUFFERS_SIZE -#define SERIAL_BUFFERS_SIZE 128 - -#undef SPI_USE_WAIT -#define SPI_USE_WAIT TRUE - -#undef SPI_SELECT_MODE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD - diff --git a/keyboards/yandrstudio/zhou65bak/f401/matrix.c b/keyboards/yandrstudio/zhou65bak/f401/matrix.c deleted file mode 100644 index d7040e338fbe..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/matrix.c +++ /dev/null @@ -1,236 +0,0 @@ -/* 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 . - */ - -#include -#include -#include "util.h" -#include "matrix.h" -#include "debounce.h" -#include "quantum.h" - -#ifdef DIRECT_PINS -static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; -#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) -static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; -#endif - -/* matrix state(1:on, 0:off) */ -extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values -extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values - -static inline void setPinOutput_writeLow(pin_t pin) { - ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); - } -} - -static inline void setPinInputHigh_atomic(pin_t pin) { - ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } -} - -// matrix code - -#ifdef DIRECT_PINS - -static void init_pins(void) { - for (int row = 0; row < MATRIX_ROWS; row++) { - for (int col = 0; col < MATRIX_COLS; col++) { - pin_t pin = direct_pins[row][col]; - if (pin != NO_PIN) { - setPinInputHigh(pin); - } - } - } -} - -static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { - // Start with a clear matrix row - matrix_row_t current_row_value = 0; - - for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - pin_t pin = direct_pins[current_row][col_index]; - if (pin != NO_PIN) { - current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); - } - } - - // If the row has changed, store the row and return the changed flag. - if (current_matrix[current_row] != current_row_value) { - current_matrix[current_row] = current_row_value; - return true; - } - return false; -} - -#elif defined(DIODE_DIRECTION) -# if (DIODE_DIRECTION == COL2ROW) - -static void select_col(uint8_t col) { palSetLine(col_pins[col]); } - -static void unselect_col(uint8_t col) { palClearLine(col_pins[col]); } - -static void unselect_rows(void) { - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - palSetLineMode(row_pins[x], PAL_MODE_INPUT_PULLDOWN); - } -} - -static void init_pins(void) { - unselect_rows(); - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - palSetLineMode(col_pins[x], PAL_MODE_OUTPUT_PUSHPULL); - } - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - palClearLine(col_pins[x]); - } -} - -static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { - bool matrix_changed = false; - - // Select col - select_col(current_col); - matrix_output_select_delay(); - - // For each row... - for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { - // Store last value of row prior to reading - matrix_row_t last_row_value = current_matrix[row_index]; - matrix_row_t current_row_value = last_row_value; - - // Check row pin state - if (readPin(row_pins[row_index]) == 1) { - // Pin HI, set col bit - current_row_value |= (MATRIX_ROW_SHIFTER << current_col); - } else { - // Pin LO, clear col bit - current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col); - } - - // Determine if the matrix changed state - if ((last_row_value != current_row_value)) { - matrix_changed |= true; - current_matrix[row_index] = current_row_value; - } - } - - // Unselect col - unselect_col(current_col); - if (current_col + 1 < MATRIX_COLS) { - matrix_output_unselect_delay(); // wait for col signal to go HIGH - } - - return matrix_changed; -} - -# elif (DIODE_DIRECTION == ROW2COL) - -static void select_row(uint8_t row) { palSetLine(row_pins[row]); } - -static void unselect_row(uint8_t row) { palClearLine(row_pins[row]); } - -static void unselect_cols(void) { - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - palSetLineMode(col_pins[x], PAL_MODE_INPUT_PULLDOWN); - } -} - -static void init_pins(void) { - unselect_cols(); - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - palSetLineMode(row_pins[x], PAL_MODE_OUTPUT_PUSHPULL); - } - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - palClearLine(row_pins[x]); - } -} - - -static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { - // Start with a clear matrix row - matrix_row_t current_row_value = 0; - - // Select row - select_row(current_row); - matrix_output_select_delay(); - - // For each col... - for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); - - // Populate the matrix row with the state of the col pin - current_row_value |= pin_state ? (MATRIX_ROW_SHIFTER << col_index) : 0; - } - - // Unselect row - unselect_row(current_row); - if (current_row + 1 < MATRIX_ROWS) { - matrix_output_unselect_delay(); // wait for row signal to go HIGH - } - - // If the row has changed, store the row and return the changed flag. - if (current_matrix[current_row] != current_row_value) { - current_matrix[current_row] = current_row_value; - return true; - } - return false; -} - -# else -# error DIODE_DIRECTION must be one of COL2ROW or ROW2COL! -# endif -#else -# error DIODE_DIRECTION is not defined! -#endif - -void matrix_init(void) { - // initialize key pins - init_pins(); - - // initialize matrix state: all keys off - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - raw_matrix[i] = 0; - matrix[i] = 0; - } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); -} - -uint8_t matrix_scan(void) { - bool changed = false; - -#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) - // Set col, read rows - for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { - changed |= read_rows_on_col(raw_matrix, current_col); - } -#elif (DIODE_DIRECTION == ROW2COL) - // Set row, read cols - for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { - changed |= read_cols_on_row(raw_matrix, current_row); - } -#endif - - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); - return (uint8_t)changed; -} diff --git a/keyboards/yandrstudio/zhou65bak/f401/mcuconf.h b/keyboards/yandrstudio/zhou65bak/f401/mcuconf.h deleted file mode 100644 index 435455d3a9ee..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/mcuconf.h +++ /dev/null @@ -1,81 +0,0 @@ -/* 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 . - */ - -#pragma once - -#include_next - -#undef STM32_NO_INIT -#undef STM32_HSI_ENABLED -#undef STM32_LSI_ENABLED -#undef STM32_HSE_ENABLED -#undef STM32_LSE_ENABLED -#undef STM32_CLOCK48_REQUIRED -#undef STM32_SW -#undef STM32_PLLSRC -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_HPRE -#undef STM32_PPRE1 -#undef STM32_PPRE2 -#undef STM32_RTCSEL -#undef STM32_RTCPRE_VALUE -#undef STM32_MCO1SEL -#undef STM32_MCO1PRE -#undef STM32_MCO2SEL -#undef STM32_MCO2PRE -#undef STM32_I2SSRC -#undef STM32_PLLI2SN_VALUE -#undef STM32_PLLI2SR_VALUE -#undef STM32_PVD_ENABLE -#undef STM32_PLS -#undef STM32_BKPRAM_ENABLE - -#define STM32_NO_INIT FALSE -#define STM32_HSI_ENABLED TRUE -#define STM32_LSI_ENABLED TRUE -#define STM32_HSE_ENABLED TRUE -#define STM32_LSE_ENABLED FALSE -#define STM32_CLOCK48_REQUIRED TRUE -#define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSE -#define STM32_PLLM_VALUE 8 -#define STM32_PLLN_VALUE 192 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 4 -// AHB prescaler value. -#define STM32_HPRE STM32_HPRE_DIV1 -//APB1 prescaler value. -#define STM32_PPRE1 STM32_PPRE1_DIV4 -//APB2 prescaler value. -#define STM32_PPRE2 STM32_PPRE2_DIV2 -#define STM32_RTCSEL STM32_RTCSEL_LSI -#define STM32_RTCPRE_VALUE 8 -#define STM32_MCO1SEL STM32_MCO1SEL_HSI -#define STM32_MCO1PRE STM32_MCO1PRE_DIV1 -#define STM32_MCO2SEL STM32_MCO2SEL_SYSCLK -#define STM32_MCO2PRE STM32_MCO2PRE_DIV5 -#define STM32_I2SSRC STM32_I2SSRC_CKIN -#define STM32_PLLI2SN_VALUE 192 -#define STM32_PLLI2SR_VALUE 5 -#define STM32_PVD_ENABLE FALSE -#define STM32_PLS STM32_PLS_LEV0 -#define STM32_BKPRAM_ENABLE FALSE - - - diff --git a/keyboards/yandrstudio/zhou65bak/f401/rules.mk b/keyboards/yandrstudio/zhou65bak/f401/rules.mk deleted file mode 100644 index efda3defc176..000000000000 --- a/keyboards/yandrstudio/zhou65bak/f401/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# MCU name -MCU = STM32F401 - -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 - -# Bootloader selection -BOOTLOADER = stm32-dfu -# ENCODER_ENABLE = yes -# # project specific file -CUSTOM_MATRIX = lite # for using the A9 pin as matrix io -QUANTUM_SRC += matrix.c - -EEPROM_DRIVER = custom -SRC += eep/eeprom_stm32.c -SRC += eep/flash_stm32.c -OPT_DEFS += -DEEPROM_EMU_STM32F401xC diff --git a/keyboards/yandrstudio/zhou65bak/info.json b/keyboards/yandrstudio/zhou65bak/info.json deleted file mode 100644 index 88f99d0aee8f..000000000000 --- a/keyboards/yandrstudio/zhou65bak/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "keyboard_name": "zhou65", - "url": "https://github.com/Oh-My-Mechanical-Keyboard ", - "maintainer": "Jason Ren (biu)", - "width": 16, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,1", "x":2.25, "y":3}, {"label":"3,2", "x":3.25, "y":3}, {"label":"3,3", "x":4.25, "y":3}, {"label":"3,4", "x":5.25, "y":3}, {"label":"3,5", "x":6.25, "y":3}, {"label":"3,6", "x":7.25, "y":3}, {"label":"3,7", "x":8.25, "y":3}, {"label":"3,8", "x":9.25, "y":3}, {"label":"3,9", "x":10.25, "y":3}, {"label":"3,10", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,5", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}] - } - } -} \ No newline at end of file diff --git a/keyboards/yandrstudio/zhou65bak/keymaps/default/keymap.c b/keyboards/yandrstudio/zhou65bak/keymaps/default/keymap.c deleted file mode 100644 index d595aef93ce4..000000000000 --- a/keyboards/yandrstudio/zhou65bak/keymaps/default/keymap.c +++ /dev/null @@ -1,32 +0,0 @@ -/* 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - 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_HOME, - 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_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - - LAYOUT( - KC_TRNS, 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_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, RESET, 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), -}; diff --git a/keyboards/yandrstudio/zhou65bak/keymaps/via/keymap.c b/keyboards/yandrstudio/zhou65bak/keymaps/via/keymap.c deleted file mode 100644 index d595aef93ce4..000000000000 --- a/keyboards/yandrstudio/zhou65bak/keymaps/via/keymap.c +++ /dev/null @@ -1,32 +0,0 @@ -/* 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - 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_HOME, - 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_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - - LAYOUT( - KC_TRNS, 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_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, RESET, 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), -}; diff --git a/keyboards/yandrstudio/zhou65bak/keymaps/via/rules.mk b/keyboards/yandrstudio/zhou65bak/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/yandrstudio/zhou65bak/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/yandrstudio/zhou65bak/readme.md b/keyboards/yandrstudio/zhou65bak/readme.md deleted file mode 100644 index b7e628d825cf..000000000000 --- a/keyboards/yandrstudio/zhou65bak/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -zhou65 version 1.0 -=== - -A 65% keys keyboard with rgb (keys). -This keyboard use 8mhz HSE and STM32F401 as MCU. - -Keyboard Maintainer: https://github.com/jiaxin96 -Hardware Supported: zhou65 -Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard - -Make example for this keyboard (after setting up your build environment): - - make yandrstudio/zhou65/f401:default - -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. - diff --git a/keyboards/yandrstudio/zhou65bak/rules.mk b/keyboards/yandrstudio/zhou65bak/rules.mk deleted file mode 100644 index dfa3b4313ce4..000000000000 --- a/keyboards/yandrstudio/zhou65bak/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -KEYBOARD_SHARED_EP = no # 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 = 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 = yes # USB Nkey Rollover -NO_USB_STARTUP_CHECK = no diff --git a/keyboards/yandrstudio/zhou65bak/zhou65.c b/keyboards/yandrstudio/zhou65bak/zhou65.c deleted file mode 100644 index 77f7e4304610..000000000000 --- a/keyboards/yandrstudio/zhou65bak/zhou65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* 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 . - */ -#include QMK_KEYBOARD_H - diff --git a/keyboards/yandrstudio/zhou65bak/zhou65.h b/keyboards/yandrstudio/zhou65bak/zhou65.h deleted file mode 100644 index 276849908e75..000000000000 --- a/keyboards/yandrstudio/zhou65bak/zhou65.h +++ /dev/null @@ -1,32 +0,0 @@ -/* 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ - K400, K401, K402, K405, K409, K410, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \ -} diff --git a/keyboards/yandrstudio/zhou75/f401/matrix.c b/keyboards/yandrstudio/zhou75/f401/matrix.c index d7040e338fbe..778b51355f19 100644 --- a/keyboards/yandrstudio/zhou75/f401/matrix.c +++ b/keyboards/yandrstudio/zhou75/f401/matrix.c @@ -199,7 +199,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -214,7 +214,7 @@ void matrix_init(void) { matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) diff --git a/keyboards/yandrstudio/zhou75/hotswap/f401/matrix.c b/keyboards/yandrstudio/zhou75/hotswap/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/zhou75/hotswap/f401/matrix.c +++ b/keyboards/yandrstudio/zhou75/hotswap/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; } diff --git a/keyboards/yandrstudio/zhou75/solder/f401/matrix.c b/keyboards/yandrstudio/zhou75/solder/f401/matrix.c index d7040e338fbe..5c996b826061 100644 --- a/keyboards/yandrstudio/zhou75/solder/f401/matrix.c +++ b/keyboards/yandrstudio/zhou75/solder/f401/matrix.c @@ -18,7 +18,6 @@ #include #include "util.h" #include "matrix.h" -#include "debounce.h" #include "quantum.h" #ifdef DIRECT_PINS @@ -199,7 +198,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # error DIODE_DIRECTION is not defined! #endif -void matrix_init(void) { +void matrix_init_custom(void) { // initialize key pins init_pins(); @@ -208,13 +207,9 @@ void matrix_init(void) { raw_matrix[i] = 0; matrix[i] = 0; } - - debounce_init(MATRIX_ROWS); - - matrix_init_quantum(); } -uint8_t matrix_scan(void) { +uint8_t matrix_scan_custom(void) { bool changed = false; #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) { } #endif - debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - - matrix_scan_quantum(); return (uint8_t)changed; }