Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-09-27 12:37:28 +00:00
commit bb3627dae0
10 changed files with 702 additions and 0 deletions

View File

@ -0,0 +1,21 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next "board.h"
#undef STM32_HSECLK
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,433 @@
{
"keyboard_name": "wave75",
"processor": "STM32F103",
"bootloader": "stm32duino",
"usb": {
"pid": "0xAA8E",
"device_version": "1.0.0"
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"],
"rows": ["A9", "A10", "C15", "A8", "B1", "A1"]
},
"layouts": {
"LAYOUT": {
"layout": [
{
"label": "0,0",
"x": 0,
"y": 0
},
{
"label": "0,1",
"x": 1.25,
"y": 0
},
{
"label": "0,2",
"x": 2.25,
"y": 0
},
{
"label": "0,3",
"x": 3.25,
"y": 0
},
{
"label": "0,4",
"x": 4.25,
"y": 0
},
{
"label": "0,5",
"x": 5.5,
"y": 0
},
{
"label": "0,6",
"x": 6.5,
"y": 0
},
{
"label": "0,7",
"x": 7.5,
"y": 0
},
{
"label": "0,8",
"x": 8.5,
"y": 0
},
{
"label": "0,9",
"x": 9.75,
"y": 0
},
{
"label": "0,10",
"x": 10.75,
"y": 0
},
{
"label": "0,11",
"x": 11.75,
"y": 0
},
{
"label": "0,12",
"x": 12.75,
"y": 0
},
{
"label": "0,13",
"x": 14,
"y": 0
},
{
"label": "0,14",
"x": 15.25,
"y": 0
},
{
"label": "1,0",
"x": 0,
"y": 1.25
},
{
"label": "1,1",
"x": 1,
"y": 1.25
},
{
"label": "1,2",
"x": 2,
"y": 1.25
},
{
"label": "1,3",
"x": 3,
"y": 1.25
},
{
"label": "1,4",
"x": 4,
"y": 1.25
},
{
"label": "1,5",
"x": 5,
"y": 1.25
},
{
"label": "1,6",
"x": 6,
"y": 1.25
},
{
"label": "1,7",
"x": 7,
"y": 1.25
},
{
"label": "1,8",
"x": 8,
"y": 1.25
},
{
"label": "1,9",
"x": 9,
"y": 1.25
},
{
"label": "1,10",
"x": 10,
"y": 1.25
},
{
"label": "1,11",
"x": 11,
"y": 1.25
},
{
"label": "1,12",
"x": 12,
"y": 1.25
},
{
"label": "1,13",
"x": 13,
"y": 1.25,
"w": 2
},
{
"label": "1,14",
"x": 15.25,
"y": 1.25
},
{
"label": "2,0",
"x": 0,
"y": 2.25,
"w": 1.5
},
{
"label": "2,1",
"x": 1.5,
"y": 2.25
},
{
"label": "2,2",
"x": 2.5,
"y": 2.25
},
{
"label": "2,3",
"x": 3.5,
"y": 2.25
},
{
"label": "2,4",
"x": 4.5,
"y": 2.25
},
{
"label": "2,5",
"x": 5.5,
"y": 2.25
},
{
"label": "2,6",
"x": 6.5,
"y": 2.25
},
{
"label": "2,7",
"x": 7.5,
"y": 2.25
},
{
"label": "2,8",
"x": 8.5,
"y": 2.25
},
{
"label": "2,9",
"x": 9.5,
"y": 2.25
},
{
"label": "2,10",
"x": 10.5,
"y": 2.25
},
{
"label": "2,11",
"x": 11.5,
"y": 2.25
},
{
"label": "2,12",
"x": 12.5,
"y": 2.25
},
{
"label": "2,13",
"x": 13.5,
"y": 2.25,
"w": 1.5
},
{
"label": "2,14",
"x": 15.25,
"y": 2.25
},
{
"label": "3,0",
"x": 0,
"y": 3.25,
"w": 1.75
},
{
"label": "3,1",
"x": 1.75,
"y": 3.25
},
{
"label": "3,2",
"x": 2.75,
"y": 3.25
},
{
"label": "3,3",
"x": 3.75,
"y": 3.25
},
{
"label": "3,4",
"x": 4.75,
"y": 3.25
},
{
"label": "3,5",
"x": 5.75,
"y": 3.25
},
{
"label": "3,6",
"x": 6.75,
"y": 3.25
},
{
"label": "3,7",
"x": 7.75,
"y": 3.25
},
{
"label": "3,8",
"x": 8.75,
"y": 3.25
},
{
"label": "3,9",
"x": 9.75,
"y": 3.25
},
{
"label": "3,10",
"x": 10.75,
"y": 3.25
},
{
"label": "3,11",
"x": 11.75,
"y": 3.25
},
{
"label": "3,12",
"x": 12.75,
"y": 3.25,
"w": 2.25
},
{
"label": "4,0",
"x": 0,
"y": 4.25,
"w": 2.25
},
{
"label": "4,1",
"x": 2.25,
"y": 4.25
},
{
"label": "4,2",
"x": 3.25,
"y": 4.25
},
{
"label": "4,3",
"x": 4.25,
"y": 4.25
},
{
"label": "4,4",
"x": 5.25,
"y": 4.25
},
{
"label": "4,5",
"x": 6.25,
"y": 4.25
},
{
"label": "4,6",
"x": 7.25,
"y": 4.25
},
{
"label": "4,7",
"x": 8.25,
"y": 4.25
},
{
"label": "4,8",
"x": 9.25,
"y": 4.25
},
{
"label": "4,9",
"x": 10.25,
"y": 4.25
},
{
"label": "4,10",
"x": 11.25,
"y": 4.25
},
{
"label": "4,11",
"x": 12.25,
"y": 4.25,
"w": 1.75
},
{
"label": "4,13",
"x": 14.25,
"y": 4.5
},
{
"label": "5,0",
"x": 0,
"y": 5.25,
"w": 1.25
},
{
"label": "5,1",
"x": 1.25,
"y": 5.25,
"w": 1.25
},
{
"label": "5,2",
"x": 2.5,
"y": 5.25,
"w": 1.25
},
{
"label": "5,6",
"x": 3.75,
"y": 5.25,
"w": 6.25
},
{
"label": "5,9",
"x": 10,
"y": 5.25,
"w": 1.5
},
{
"label": "5,10",
"x": 11.5,
"y": 5.25,
"w": 1.5
},
{
"label": "5,12",
"x": 13.25,
"y": 5.5
},
{
"label": "5,13",
"x": 14.25,
"y": 5.5
},
{
"label": "5,14",
"x": 15.25,
"y": 5.5
}
]
}
}
}

View File

@ -0,0 +1,34 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLU,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

View File

@ -0,0 +1,48 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLU,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -0,0 +1,24 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next <mcuconf.h>
#undef STM32_PLLXTPRE
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2

View File

@ -0,0 +1,22 @@
# wave75
![wave75](https://i.imgur.com/Kh6VfN8h.png)
A 75% keyboard.
This keyboard use 16mhz HSE and APM32F103 as MCU.
- Keyboard Maintainer: https://github.com/jiaxin96
- Hardware Supported: wave75
- Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard
Make example for this keyboard (after setting up your build environment):
make yandrstudio/wave75: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.
## Bootloader
Enter the bootloader in 2 ways:
- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.

View File

@ -0,0 +1,15 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
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
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

View File

@ -0,0 +1,49 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "wave75.h"
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) { return false; }
switch(keycode) {
case KC_LG:
if (record->event.pressed) {
process_magic(GUI_TOG, record);
}
return false;
case KC_MACOS:
if (record->event.pressed) {
process_magic(CG_TOGG, record);
}
return false;
case KC_MCTL:
if (record->event.pressed) {
host_consumer_send(0x29F);
} else {
host_consumer_send(0);
}
return false;
case KC_LPAD:
if (record->event.pressed) {
host_consumer_send(0x2A0);
} else {
host_consumer_send(0);
}
return false;
default:
return true;
}
return true;
}

View File

@ -0,0 +1,55 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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, K212, K213, K214, \
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, \
K500, K501, K502, K506, K509, K510, K512, K513, K514 \
)\
{ \
{ 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, K212, K213, K214 }, \
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, KC_NO }, \
{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, KC_NO }, \
{ K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, K509, K510, KC_NO, K512, K513, K514 } \
}
enum keyboard_keycodes {
#ifdef VIA_ENABLE
LOCK_GUI = USER00,
TOG_MACOS_KEYMAP,
KC_MISSION_CONTROL,
KC_LAUNCHPAD,
NEW_SAFE_RANGE = SAFE_RANGE // Important!
#else
LOCK_GUI = SAFE_RANGE,
TOG_MACOS_KEYMAP,
KC_MISSION_CONTROL,
KC_LAUNCHPAD,
NEW_SAFE_RANGE // Important!
#endif
};
#define KC_LG LOCK_GUI
#define KC_MACOS TOG_MACOS_KEYMAP
#define KC_MCTL KC_MISSION_CONTROL
#define KC_LPAD KC_LAUNCHPAD