Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move M63 RGB into maker folder #17061

Merged
merged 2 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion keyboards/horrortroll/chinese_pcb/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 */
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -27,8 +28,8 @@
// entirely and just use numbers.

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

enum user_rgb_mode {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -27,8 +28,8 @@
// entirely and just use numbers.

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

enum user_rgb_mode {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ 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).

## Bootloader

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