Skip to content

Commit

Permalink
update local file
Browse files Browse the repository at this point in the history
  • Loading branch information
jiaxin96 committed Aug 29, 2021
1 parent 6e09953 commit 2ce5192
Show file tree
Hide file tree
Showing 49 changed files with 73 additions and 1,391 deletions.
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/Eureka75/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
6 changes: 3 additions & 3 deletions keyboards/yandrstudio/Eureka75/readme.md
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 1 addition & 1 deletion keyboards/yandrstudio/M69/M69.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion keyboards/yandrstudio/M69/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/M69/hotswap/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
2 changes: 1 addition & 1 deletion keyboards/yandrstudio/M69/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion keyboards/yandrstudio/M69/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions keyboards/yandrstudio/M69/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion keyboards/yandrstudio/M69/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/M69/solder/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/boy40ble/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/boyPad/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/m60ble/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
12 changes: 6 additions & 6 deletions keyboards/yandrstudio/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ A creative coder.
| cool87 | 0xAA96 | 0xAA01 | 32u4 | &cross; |
| sb65p | 0xAA96 | 0xAA02 | 2.4G Single mode Split Keyboard | &cross; |
| r65ble | 0xAA96 | 0xAA03 | BLE 5.0 Dual mod version of rainbow65 | &cross; |
| whiteMouse28T | 0xAA96 | 0xAA04 | External EEPROM (95256), For Test | &cross; |
| whitemouse28t | 0xAA96 | 0xAA04 | External EEPROM (95256), For Test | &cross; |
| m60ble | 0xAA96 | 0xAA05 | BLE 5.0 Dual mode, RGB | &quest; |


Expand All @@ -27,15 +27,15 @@ A creative coder.
| tdcq68 | 0xAA96 | 0xAAA1 | F401, RGB | &cross; |
| tdcq64_2s | 0xAA96 | 0xAAA2 | F401, RGB | &cross; |
| yp980ble | 0xAA96 | 0xAAA3 | BLE 5.0 Dual mode | &quest; |
| whiteMouse69 | 0xAA96 | 0xAAA4 | F401, RGB | &check; |
| whitemouse69 | 0xAA96 | 0xAAA4 | F401, RGB | &check; |
| x | 0xAA96 | 0xAAA5 | x | x |
| M69 | 0xAA96 | 0xAAA6 | F401,80%, RGB, Hotswap | &check; |
| M69 | 0xAA96 | 0xAAB6 | F401,80%, RGB, Solder | &check; |
| m69 | 0xAA96 | 0xAAA6 | F401,80%, RGB, Hotswap | &check; |
| m69 | 0xAA96 | 0xAAB6 | F401,80%, RGB, Solder | &check; |
| zhou75 | 0xAA96 | 0xAAA7 | F401, ENCODER, Hotswap | &check; |
| zhou75 | 0xAA96 | 0xAAB7 | F401, ENCODER, Solder | &check; |
| yp87ble | 0xAA96 | 0xAAA8 | BLE 5.0 Dual mode | &quest; |
| hotdox76V2 | 0xAA96 | 0xAAA9 | 32u4, Split KB, OLED, RGB | &check; |
| Eureka75 | 0xAA96 | 0xAAAA | F401,ENCODER | &check; |
| hotdox76v2 | 0xAA96 | 0xAAA9 | 32u4, Split KB, OLED, RGB | &check; |
| eureka75 | 0xAA96 | 0xAAAA | F401,ENCODER | &check; |
| boy40ble | 0xAA96 | 0xAAAB | BLE 5.0 Dual mode | &cross; |
| boyPad | 0xAA96 | 0xAAAC | F401 | &cross; |
| zhou65 | 0xAA96 | 0xAAAD | F401 | &cross; |
Expand Down
12 changes: 2 additions & 10 deletions keyboards/yandrstudio/tdcq64_2s/f401/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"

#ifdef DIRECT_PINS
Expand Down Expand Up @@ -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();

Expand All @@ -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)
Expand All @@ -229,8 +224,5 @@ uint8_t matrix_scan(void) {
}
#endif

debounce(raw_matrix, matrix, MATRIX_ROWS, changed);

matrix_scan_quantum();
return (uint8_t)changed;
}
Loading

0 comments on commit 2ce5192

Please sign in to comment.