~ruther/qmk_firmware

ec7801e2cbfaae5208a147e85157f82ceb0f1dbe — QMK Bot 3 years ago ff9aca7 + 8a4ef2b
Merge remote-tracking branch 'origin/master' into develop
M keyboards/horrortroll/chinese_pcb/readme.md => keyboards/horrortroll/chinese_pcb/readme.md +0 -1
@@ 10,6 10,5 @@ This is a folder for collection code of Chinese PCB, where they only sold one-ti
  | ------------- | ------------- | ------------- | ------- | ------------------------ | ---- | ----- |
  | Black E6.5    | Atmega32U4    | 68 Keys (65%) | No      | Backlight & RGB Lighting | No   | No    |
  | Devil68 Pro   | Atmega32U4    | 68 Keys (65%) | Yes     | RGB Matrix               | No   | No    |
  | M63 RGB       | STM32F072CBU6 | 63 Keys (60%) | Yes     | RGB Matrix               | No   | No    |
  |               |               |               |         |                          |      |       |
</details>

R keyboards/horrortroll/chinese_pcb/m63_rgb/config.h => keyboards/mss_studio/m63_rgb/config.h +5 -7
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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


@@ 19,10 20,10 @@
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0x7516
#define PRODUCT_ID      0x6002
#define VENDOR_ID       0x4D4B
#define PRODUCT_ID      0x6063
#define DEVICE_VER      0x0001
#define MANUFACTURER    HorrorTroll
#define MANUFACTURER    Mss Studio
#define PRODUCT         M63 RGB

/* key matrix size */


@@ 33,9 34,6 @@
#define MATRIX_ROW_PINS { B3, B4, A0,  A2, A3 }
#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 }

#define BOOTMAGIC_LITE_ROW 3
#define BOOTMAGIC_LITE_COLUMN 5

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW


R keyboards/horrortroll/chinese_pcb/m63_rgb/info.json => keyboards/mss_studio/m63_rgb/info.json +0 -0
R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c => keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c +4 -3
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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


@@ 27,8 28,8 @@
// entirely and just use numbers.

enum layer_names {
    _BASE = 0,
    _FN = 1
    _BASE,
    _FN,
};

enum user_rgb_mode {

R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md => keyboards/mss_studio/m63_rgb/keymaps/default/readme.md +0 -0
R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h => keyboards/mss_studio/m63_rgb/keymaps/via/config.h +2 -1
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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

R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c => keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c +4 -3
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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


@@ 27,8 28,8 @@
// entirely and just use numbers.

enum layer_names {
    _BASE = 0,
    _FN = 1
    _BASE,
    _FN,
};

enum user_rgb_mode {

R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md => keyboards/mss_studio/m63_rgb/keymaps/via/readme.md +0 -0
R keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk => keyboards/mss_studio/m63_rgb/keymaps/via/rules.mk +0 -0
R keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c => keyboards/mss_studio/m63_rgb/m63_rgb.c +2 -1
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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

R keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h => keyboards/mss_studio/m63_rgb/m63_rgb.h +2 -1
@@ 1,4 1,5 @@
/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
/* Copyright 2021 Mss Studio
 * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
 *
 * 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

R keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md => keyboards/mss_studio/m63_rgb/readme.md +3 -3
@@ 7,11 7,11 @@ Support STM32F072CBU6 keyboard.

Make example for this keyboard (after setting up your build environment):

    make horrortroll/chinese_pcb/m63_rgb:default
    make mss_studio/m63_rgb:default

Flashing example for this keyboard:

    make horrortroll/chinese_pcb/m63_rgb:default:flash
    make mss_studio/m63_rgb:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).



@@ 19,6 19,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (3,5) in the matrix (B key) and plug in the keyboard
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
* **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
* **Keycode in layout**: Press the key mapped to `RESET` if it is available

R keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk => keyboards/mss_studio/m63_rgb/rules.mk +0 -0